advanced keyboard mapping

Author: codingjoe

Derby_Effect.pde

@@ -20,7 +20,7 @@ class Derby_Effect extends Effect
   }
 
   char triggeredByKey() {
-    return 'd';
+    return '5';
   }
 
   Slider weightSlider, speedSlider, pointSlider, hueSlider;

Effect.pde

@@ -28,6 +28,8 @@ public abstract class Effect
   Toggle activeToggle, randomToggle, settingsToggle;
 
   Tab settingsTab;
+  
+  Boolean effect_manual_triggered = false;
 
   float rotationHistory = 0;
 
@@ -56,7 +58,7 @@ public abstract class Effect
     controlGroup.disableCollapse();
     controlGroup.getCaptionLabel().set(getName()+" Settings").align(ControlP5.CENTER, ControlP5.CENTER);
 
-    ctrl.activeEffect.addItem(getName(),i);
+    ctrl.activeEffect.addItem("("+triggeredByKey() + ")  " + getName(),i);
     ctrl.activeSetting.addItem("settings"+getName(),i);
 
     randomToggle = cp5.addToggle("random"+getName()).setSize(45, 45).setPosition(670, posy);
@@ -106,6 +108,7 @@ public abstract class Effect
 
   void activate() {
     activeEffect.activate(id);
+    activeSetting.activate(id);
   }
 
   float getLevel()
@@ -158,9 +161,15 @@ public abstract class Effect
   abstract char triggeredByKey();
 
   void keyPressed(char key, int keyCode)
-  {}
+  {
+    if (key == 't')
+      effect_manual_triggered = true;
+  }
 
   void keyReleased(char key, int keyCode)
-  {}
+  {
+    if (key == 't')
+      effect_manual_triggered = false;
+  }
 }
 

LaserBurst_Effect.pde

@@ -55,7 +55,7 @@ class LaserBurst_Effect extends Effect
   }
 
   char triggeredByKey() {
-    return 'b';
+    return '7';
   }
 
   Slider radiusSlider, speedSlider, hueSlider, rotationSpeedSlider;
@@ -71,7 +71,7 @@ class LaserBurst_Effect extends Effect
   void draw()
   {
     rotate(inverseToggle.getState()?rotation:-rotation);
-    if (isKick()) {
+    if (isKick() || effect_manual_triggered) {
       Float[] k = {
         0.0f, random(0, PI)
       };

Moonflower_Effect.pde

@@ -78,7 +78,7 @@ public class Moonflower_Effect extends Effect
   }
 
   char triggeredByKey() {
-    return 'm';
+    return '3';
   }
 
   void draw()
@@ -87,7 +87,7 @@ public class Moonflower_Effect extends Effect
 
     float speed = (1-speedSlider.getValue())*stg.frameRate;
 
-    if (timer<=0 && isKick()) {
+    if (timer<=0 && (isKick() || effect_manual_triggered)) {
       if (aHueToggle.getState())
         hueSlider.setValue((hueSlider.getValue()+120)%360);
       direction = -1*direction;

MusicBeam.pde

@@ -257,21 +257,21 @@ void initEffects()
 {
   initRandomControls();
 
-  effectArray = new Effect[8];
-  strobo = new Strobe_Effect(this, 0);
-  effectArray[0] = strobo;
-  effectArray[1] = new Scanner_Effect(this, 1);
-  effectArray[2] = new Moonflower_Effect(this, 2);
-  effectArray[3] = new RGBSpot_Effect(this, 3);
-  effectArray[4] = new Derby_Effect(this, 4);
-  effectArray[5] = new Snowstorm_Effect(this, 5);
-  effectArray[6] = new LaserBurst_Effect(this, 6);
-  effectArray[7] = new Polygon_Effect(this, 7);
+  effectArray = new Effect[9];
+  effectArray[0] = new Blackout_Effect(this, 0);
+  effectArray[1] = new Strobe_Effect(this, 1);
+  effectArray[2] = new Scanner_Effect(this, 2);
+  effectArray[3] = new Moonflower_Effect(this, 3);
+  effectArray[4] = new RGBSpot_Effect(this, 4);
+  effectArray[5] = new Derby_Effect(this, 5);
+  effectArray[6] = new Snowstorm_Effect(this, 6);
+  effectArray[7] = new LaserBurst_Effect(this, 7);
+  effectArray[8] = new Polygon_Effect(this, 8);
 
   activeSetting.activate(0);
 
   for (Toggle t:activeEffect.getItems())
-    t.getCaptionLabel().align(CENTER, CENTER);
+    t.getCaptionLabel().align(LEFT, CENTER);
 
   for (Toggle t:activeSetting.getItems())
     t.getCaptionLabel().set("EDIT").align(CENTER, CENTER);
@@ -302,21 +302,21 @@ void keyPressed()
 {
   if (effectArray!=null)
     for (int i = 0; i < effectArray.length; i++)
+    {
+      if (key == effectArray[i].triggeredByKey())
+        effectArray[i].activate();
       if (effectArray[i].isActive())
         effectArray[i].keyPressed(key, keyCode);
+    }
 }
 
 void keyReleased()
 {
 
   if (effectArray!=null)
     for (int i = 0; i < effectArray.length; i++)
-    {
-      if (key == effectArray[i].triggeredByKey())
-        effectArray[i].activate();
       if (effectArray[i].isActive())
         effectArray[i].keyReleased(key, keyCode);
-    }
 }
 
 boolean isHat()

Polygon_Effect.pde

@@ -21,7 +21,7 @@ class Polygon_Effect extends Effect
   }
 
   char triggeredByKey() {
-    return 'p';
+    return '8';
   }
 
   int winHeight = 200;
@@ -109,5 +109,16 @@ class Polygon_Effect extends Effect
       angle+=360.0/points;
     }
   }
+  
+ void keyPressed(char key, int keyCode)
+  {
+    super.keyPressed(key, keyCode);
+    if (key == CODED) {
+      if (keyCode == LEFT)
+        rotationSpeedSlider.setValue(rotationSpeedSlider.getValue()-0.05);
+      else if (keyCode == RIGHT)
+        rotationSpeedSlider.setValue(rotationSpeedSlider.getValue()+0.05);
+    }
+  }
 }
 

RGBSpot_Effect.pde

@@ -20,7 +20,7 @@ class RGBSpot_Effect extends Effect
   }
 
   char triggeredByKey() {
-    return 'r';
+    return '4';
   }
 
   RGBSpot_Effect(MusicBeam ctrl, int y)
@@ -102,7 +102,7 @@ class RGBSpot_Effect extends Effect
 
   boolean isTriggered()
   {
-    if (manualButton.isPressed())
+    if (manualButton.isPressed() || effect_manual_triggered)
       return true;
     else if ((!onsetToggle.getState() && hatToggle.getState() && isHat()) || (onsetToggle.getState() && isOnset() && hatToggle.getState() && isHat()))
       return true;

Scanner_Effect.pde

@@ -43,7 +43,7 @@ class Scanner_Effect extends Effect
   }
 
   char triggeredByKey() {
-    return 'c';
+    return '2';
   }
 
   float rotation = 0.0f;

Snowstorm_Effect.pde

@@ -48,7 +48,7 @@ class Snowstorm_Effect extends Effect
   }
 
   char triggeredByKey() {
-    return 'o';
+    return '6';
   }
 
   Slider radiusSlider, speedSlider, hueSlider;

Strobe_Effect.pde

@@ -19,16 +19,16 @@ public class Strobe_Effect extends Effect
   {
     return "Strobe";
   }
-  
+
   char triggeredByKey() {
-    return 's';
+    return '1';
   }
 
   public Strobe_Effect(MusicBeam controller, int y)
   {
 
     super(controller, y);
-    
+
     randomToggle.setState(false);
 
 
@@ -77,7 +77,7 @@ public class Strobe_Effect extends Effect
 
   boolean isTriggered()
   {
-    if (manualButton.isOn())
+    if (manualButton.isOn() || effect_manual_triggered)
       return true;
     else if ((!onsetToggle.getState() && hatToggle.getState() && isHat()) || (onsetToggle.getState() && isOnset() && hatToggle.getState() && isHat()))
       return true;
@@ -111,5 +111,16 @@ public class Strobe_Effect extends Effect
     if (state)
       stg.rect(-stg.maxRadius/2, -stg.maxRadius/2, stg.maxRadius, stg.maxRadius);
   }
+
+  void keyPressed(char key, int keyCode)
+  {
+    super.keyPressed(key, keyCode);
+    if (key == CODED) {
+      if (keyCode == LEFT)
+        delaySlider.setValue(delaySlider.getValue()-1);
+      else if (keyCode == RIGHT)
+        delaySlider.setValue(delaySlider.getValue()+1);
+    }
+  }
 }