X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=TestPatterns.pde;h=f8d59eecd9f9a65eafc98ba678af3f5e8fdb601c;hb=4404e6b81ef8713c47d8cc1e519be83bbbe5a87b;hp=b2e49f1d129bcacdfd81985825951828b0cd7fec;hpb=6702151ac6a806d916403b2a60e3dc1e52b712aa;p=SugarCubes.git

diff --git a/TestPatterns.pde b/TestPatterns.pde
index b2e49f1..f8d59ee 100644
--- a/TestPatterns.pde
+++ b/TestPatterns.pde
@@ -10,7 +10,7 @@ class TestSpeakerMapping extends TestPattern {
     super(glucose);
   }
   
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     int h = 0;
     for (Speaker speaker : model.speakers) {
       for (Strip strip : speaker.strips) {
@@ -31,7 +31,7 @@ class TestBassMapping extends TestPattern {
     super(glucose);
   }
   
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     int[] strips = { 2, 1, 0, 3, 13, 12, 15, 14, 9, 8, 11, 10, 5, 4, 7, 6 };
     int h = 0;
     for (int si : strips) {
@@ -50,7 +50,7 @@ class TestFloorMapping extends TestPattern {
     super(glucose);
   }
 
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     int[] strutIndices = {6, 5, 4, 3, 2, 1, 0, 7};
     int h = 0;
     for (int si : strutIndices) {
@@ -83,7 +83,7 @@ class TestStripPattern extends TestPattern {
     addModulator(d).trigger();
   }
   
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     for (Strip s : model.strips) {
       for (Point p : s.points) {
         colors[p.index] = color(
@@ -105,7 +105,7 @@ class TestHuePattern extends TestPattern {
     super(glucose);
   }
   
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     // Access the core master hue via this method call
     float hv = lx.getBaseHuef();
     for (int i = 0; i < colors.length; ++i) {
@@ -123,7 +123,7 @@ class TestXPattern extends TestPattern {
     super(glucose);
     addModulator(xPos).trigger();
   }
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     float hv = lx.getBaseHuef();
     for (Point p : model.points) {
       // This is a common technique for modulating brightness.
@@ -145,7 +145,7 @@ class TestYPattern extends TestPattern {
     super(glucose);
     addModulator(yPos).trigger();
   }
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     float hv = lx.getBaseHuef();
     for (Point p : model.points) {
       float bv = max(0, 100 - abs(p.fy - yPos.getValuef()));
@@ -163,7 +163,7 @@ class TestZPattern extends TestPattern {
     super(glucose);
     addModulator(zPos).trigger();
   }
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     float hv = lx.getBaseHuef();
     for (Point p : model.points) {
       float bv = max(0, 100 - abs(p.fz - zPos.getValuef()));
@@ -183,7 +183,7 @@ class TestTowerPattern extends TestPattern {
     addModulator(towerIndex).trigger();
   }
 
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     int ti = 0;
     for (Tower t : model.towers) {
       for (Point p : t.points) {
@@ -230,7 +230,7 @@ class TestProjectionPattern extends TestPattern {
     addModulator(yPos).trigger();
   }
   
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     // For the same reasons described above, it may logically feel to you that
     // some of these operations are in reverse order. Again, just keep in mind that
     // the car itself is what's moving, not the object
@@ -268,7 +268,7 @@ class TestCubePattern extends TestPattern {
     addModulator(index).start();
   }
   
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     for (Cube c : model.cubes) {
       int i = 0;
       for (Point p : c.points) {
@@ -315,6 +315,10 @@ class MappingTool extends TestPattern {
     numChannels = pandaMappings.length * PandaMapping.CHANNELS_PER_BOARD;
     setChannel();
   }
+
+  public int numChannels() {
+    return numChannels;
+  }
   
   private void setChannel() {
     activePanda = pandaMappings[channelIndex / PandaMapping.CHANNELS_PER_BOARD];
@@ -350,7 +354,7 @@ class MappingTool extends TestPattern {
     printInfo();
   }
   
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     color off = color(0, 0, 0);
     color c = off;
     color r = #FF0000;
@@ -367,7 +371,7 @@ class MappingTool extends TestPattern {
       switch (mappingMode) {
         case MAPPING_MODE_ALL: cubeOn = true; break;
         case MAPPING_MODE_SINGLE_CUBE: cubeOn = (cubeIndex == ci); break;
-        case MAPPING_MODE_CHANNEL: cubeOn = (channelIndex > 0); break;
+        case MAPPING_MODE_CHANNEL: cubeOn = (indexOfCubeInChannel > 0); break;
       }
       if (cubeOn) {
         if (mappingMode == MAPPING_MODE_CHANNEL) {
@@ -408,7 +412,10 @@ class MappingTool extends TestPattern {
       }
       ++ci;
     }
-    
+  }
+  
+  public void setCube(int index) {
+    cubeIndex = index % model.cubes.size();
   }
   
   public void incCube() {
@@ -421,6 +428,11 @@ class MappingTool extends TestPattern {
       cubeIndex += model.cubes.size();
     }
   }
+  
+  public void setChannel(int index) {
+    channelIndex = index % numChannels;
+    setChannel();
+  }
 
   public void incChannel() {
     channelIndex = (channelIndex + 1) % numChannels;
@@ -432,6 +444,10 @@ class MappingTool extends TestPattern {
     setChannel();    
   }
   
+  public void setStrip(int index) {
+    stripIndex = index % Cube.STRIPS_PER_CUBE;
+  }
+  
   public void incStrip() {
     stripIndex = (stripIndex + 1) % Cube.STRIPS_PER_CUBE;
   }
@@ -440,7 +456,7 @@ class MappingTool extends TestPattern {
     stripIndex = (stripIndex + Cube.STRIPS_PER_CUBE - 1) % Cube.STRIPS_PER_CUBE;
   }
   
-  public void keyPressed() {
+  public void keyPressed(UIMapping uiMapping) {
     switch (keyCode) {
       case UP: if (mappingMode == MAPPING_MODE_CHANNEL) incChannel(); else incCube(); break;
       case DOWN: if (mappingMode == MAPPING_MODE_CHANNEL) decChannel(); else decCube(); break;
@@ -452,5 +468,10 @@ class MappingTool extends TestPattern {
       case 'g': channelModeGreen = !channelModeGreen; break;
       case 'b': channelModeBlue = !channelModeBlue; break;
     }
+    uiMapping.setChannelID(channelIndex+1);
+    uiMapping.setCubeID(cubeIndex+1);
+    uiMapping.setStripID(stripIndex+1);
+    uiMapping.redraw();
   }
+
 }