order switching

[SugarCubes.git] / MarkSlee.pde

diff --git a/MarkSlee.pde b/MarkSlee.pde
index 0eb12acd943dc3c0b25d8a167fb1dfcd6b90368e..649d61cc4594c71e29e1960704854bb3241e3363 100644 (file)
--- a/MarkSlee.pde
+++ b/MarkSlee.pde
@@ -54,7 +54,7 @@ class MidiMusic extends SCPattern {
     }
   }
   
-  public synchronized boolean noteOnReceived(Note note) {
+  public synchronized boolean noteOn(Note note) {
     if (note.getChannel() == 0) {
       for (LightUp light : allLights) {
         if (light.isAvailable()) {
@@ -74,7 +74,7 @@ class MidiMusic extends SCPattern {
     return true;
   }
   
-  public synchronized boolean noteOffReceived(Note note) {
+  public synchronized boolean noteOff(Note note) {
     if (note.getChannel() == 0) {
       LightUp light = lightMap.get(note.getPitch());
       if (light != null) {
@@ -106,7 +106,7 @@ class Pulley extends SCPattern {
   private boolean isRising = false;
   
   private BasicParameter sz = new BasicParameter("SIZE", 0.5);
-  private BasicParameter beatAmount = new BasicParameter("BEAT", 0.1);
+  private BasicParameter beatAmount = new BasicParameter("BEAT", 0);
   
   Pulley(GLucose glucose) {
     super(glucose);
@@ -118,6 +118,7 @@ class Pulley extends SCPattern {
     addParameter(sz);
     addParameter(beatAmount);
     trigger();
+
   }
   
   private void trigger() {
@@ -125,7 +126,7 @@ class Pulley extends SCPattern {
     int i = 0;
     for (Accelerator g : gravity) {
       if (isRising) {
-        g.setSpeed(random(40, 50), 0).start();
+        g.setSpeed(random(20, 33), 0).start();
       } else {
         g.setVelocity(0).setAcceleration(-420);
         delays[i].setDuration(random(0, 500)).trigger();
@@ -138,33 +139,47 @@ class Pulley extends SCPattern {
     if (reset.click()) {
       trigger();
     }
-    int j = 0;
-    for (Click d : delays) {
-      if (d.click()) {
-        gravity[j].start();
-        d.stop();
-      }
-      ++j;
-    }   
-    
-    for (Accelerator g : gravity) {
-      if (isRising) {
-        if (g.getValuef() > model.yMax) {
-          g.stop();
-        } else if (g.getValuef() > model.yMax*.55) {
-          if (g.getVelocityf() > 10) {
-            g.setAcceleration(-16);
-          } else {
-            g.setAcceleration(0);
-          }
+        
+    if (isRising) {
+      // Fucking A, had to comment this all out because of that bizarre
+      // Processing bug where some simple loop takes an absurd amount of
+      // time, must be some pre-processor bug
+//      for (Accelerator g : gravity) {
+//        if (g.getValuef() > model.yMax) {
+//          g.stop();
+//        } else if (g.getValuef() > model.yMax*.55) {
+//          if (g.getVelocityf() > 10) {
+//            g.setAcceleration(-16);
+//          } else {
+//            g.setAcceleration(0);
+//          }
+//        }
+//      }
+    } else {
+      int j = 0;
+      for (Click d : delays) {
+        if (d.click()) {
+          gravity[j].start();
+          d.stop();
         }
-      } else {
+        ++j;
+      }
+      for (Accelerator g : gravity) {
         if (g.getValuef() < 0) {
           g.setValue(-g.getValuef());
           g.setVelocity(-g.getVelocityf() * random(0.74, 0.84));
         }
       }
     }
+
+    // A little silliness to test the grid API    
+    for (int i = 0; i < 7; ++i) {
+      for (int j = 0; j < 8; ++j) {
+        int gi = (int) constrain(j * NUM_DIVISIONS / 8, 0, NUM_DIVISIONS-1);
+        float b = 1 - 4.*abs((6-i)/7. - gravity[gi].getValuef() / model.yMax);
+        midiEngine.grid.setState(i, j, (b < 0) ? 0 : 1);
+      }
+    }
     
     float fPos = 1 - lx.tempo.rampf();
     if (fPos < .2) {
@@ -172,11 +187,11 @@ class Pulley extends SCPattern {
     }
     float falloff = 100. / (3 + sz.getValuef() * 36 + fPos * beatAmount.getValuef()*48);
     for (Point p : model.points) {
-      int g = (int) constrain((p.x - model.xMin) * NUM_DIVISIONS / (model.xMax - model.xMin), 0, NUM_DIVISIONS-1);
+      int gi = (int) constrain((p.x - model.xMin) * NUM_DIVISIONS / (model.xMax - model.xMin), 0, NUM_DIVISIONS-1);
       colors[p.index] = lx.hsb(
         (lx.getBaseHuef() + abs(p.x - model.cx)*.8 + p.y*.4) % 360,
         constrain(130 - p.y*.8, 0, 100),
-        max(0, 100 - abs(p.y - gravity[g].getValuef())*falloff)
+        max(0, 100 - abs(p.y - gravity[gi].getValuef())*falloff)
       );
     }
   }
@@ -387,7 +402,7 @@ class BouncyBalls extends SCPattern {
     }
   }
   
-  public boolean noteOnReceived(Note note) {
+  public boolean noteOn(Note note) {
     int pitch = (note.getPitch() + note.getChannel()) % NUM_BALLS;
     balls[pitch].bounce(note.getVelocity());
     return true;
@@ -817,13 +832,13 @@ public class PianoKeyPattern extends SCPattern {
     return base[index % base.length];
   }
     
-  public boolean noteOnReceived(Note note) {
+  public boolean noteOn(Note note) {
     LinearEnvelope env = getEnvelope(note.getPitch());
     env.setEndVal(min(1, env.getValuef() + (note.getVelocity() / 127.)), getAttackTime()).start();
     return true;
   }
   
-  public boolean noteOffReceived(Note note) {
+  public boolean noteOff(Note note) {
     getEnvelope(note.getPitch()).setEndVal(0, getReleaseTime()).start();
     return true;
   }