Merge pull request #61 from Skinnytorus/new_shortcuts1

WZ4: removed double shortcuts and added some new ones
farbrausch · Jul 24, 2012 · 9efbbb1 · 9efbbb1
2 parents 49549db + 261cff9
commit 9efbbb1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/altona_wz4/wz4/wz4frlib/wz3_bitmap_ops.ops b/altona_wz4/wz4/wz4frlib/wz3_bitmap_ops.ops
@@ -283,6 +283,7 @@ operator GenBitmap Cell()
 operator GenBitmap Gradient()
 {
   column = 0;
+  shortcut = 'G';
   parameter 
   {
     flags Size(" 1| 2| 4| 8| 16| 32| 64| 128| 256| 512| 1024| 2048| 4096| 8192"
@@ -466,14 +467,14 @@ operator GenBitmap GlowRect(GenBitmap = GenBitmap Flat)
     pi.LineTex2D(helper->x1,helper->y2,helper->x2,helper->y2);
     pi.LineTex2D(helper->x2,helper->y1,helper->x2,helper->y2);
   }  
-  shortcut = 'g';
 }
 
 /****************************************************************************/
 
 operator GenBitmap Dots(GenBitmap = GenBitmap Flat)
 {
   column = 0;
+  shortcut = 'w';
   flags = passinput|passoutput;
   parameter
   {
@@ -722,6 +723,7 @@ operator GenBitmap PreMulAlpha(GenBitmap)
 operator GenBitmap Mask(GenBitmap,GenBitmap,GenBitmap)
 {
   column = 2;
+  shortcut = 'm';
   parameter
   {
     flags Mode("mix|add|sub|mul");
@@ -992,7 +994,6 @@ operator GenBitmap Twirl(GenBitmap)
     pi.LineTex2D(para->Center[0],helper->y1,helper->x1,helper->y1);
     pi.LineTex2D(helper->x1,para->Center[1],helper->x1,helper->y1);
   }  
-  shortcut = 'g';
 }
 
 /****************************************************************************/
@@ -1168,7 +1169,6 @@ operator GenBitmap Bump(GenBitmap,GenBitmap)
 operator GenBitmap Downsample(GenBitmap)
 {
   column = 3;
-  shortcut = 'r';
   parameter
   {
     flags Size("current| 1| 2| 4| 8| 16| 32| 64| 128| 256| 512| 1024| 2048| 4096| 8192"
@@ -1263,6 +1263,7 @@ operator GenBitmap Bulge(GenBitmap)
 
 operator GenBitmap Bricks()
 {
+  shortcut = 'q';
   parameter
   {
     flags Size(" 1| 2| 4| 8| 16| 32| 64| 128| 256| 512| 1024| 2048| 4096| 8192"

diff --git a/altona_wz4/wz4/wz4frlib/wz4_demo2_ops.ops b/altona_wz4/wz4/wz4frlib/wz4_demo2_ops.ops
@@ -160,6 +160,7 @@ operator Wz4Render Render "Add" (?*Wz4Render)
 
 operator Wz4Render Camera(?Rendertarget2D,?*Wz4Render) 
 {
+  shortcut = 'C';
   column = 0;
   parameter
   {