X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=TestPatterns.pde;h=6a662f248fb5dfe4f1152eff98f0f35e9a6a6ee0;hb=344908672b7cfe1efba03f739ef945601dae1b8e;hp=38ea2296200d31e7f13e370a7d1f3acc35a7df7d;hpb=54521a391e9fac72b19c35ed1f20e055c79f2bb1;p=SugarCubes.git

diff --git a/TestPatterns.pde b/TestPatterns.pde
index 38ea229..6a662f2 100644
--- a/TestPatterns.pde
+++ b/TestPatterns.pde
@@ -1,17 +1,125 @@
+class BlankPattern extends SCPattern {
+  BlankPattern(GLucose glucose) {
+    super(glucose);
+  }
+  
+  public void run(double deltaMs) {
+    setColors(#000000);
+  }
+}
+
+abstract class TestPattern extends SCPattern {
+  public TestPattern(GLucose glucose) {
+    super(glucose);
+    setEligible(false);
+  }
+}
+
+class TestSpeakerMapping extends TestPattern {
+  TestSpeakerMapping(GLucose glucose) {
+    super(glucose);
+  }
+  
+  public void run(double deltaMs) {
+    int h = 0;
+    for (Speaker speaker : model.speakers) {
+      for (Strip strip : speaker.strips) {
+        float b = 100;
+        for (LXPoint p : strip.points) {
+          colors[p.index] = lx.hsb(h % 360, 100, b);
+          b = max(0, b - 10);
+        }
+        h += 70;
+      }
+    }
+  }
+
+}
+
+class TestBassMapping extends TestPattern {
+  TestBassMapping(GLucose glucose) {
+    super(glucose);
+  }
+  
+  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) {
+      float b = 100;
+      for (LXPoint p : model.bassBox.strips.get(si).points) {
+        colors[p.index] = lx.hsb(h % 360, 100, b);
+        b = max(0, b - 10);
+      }
+      h += 70;
+    }
+  }
+}
+
+class TestFloorMapping extends TestPattern {
+  TestFloorMapping(GLucose glucose) {
+    super(glucose);
+  }
+
+  public void run(double deltaMs) {
+    int[] strutIndices = {6, 5, 4, 3, 2, 1, 0, 7};
+    int h = 0;
+    for (int si : strutIndices) {
+      float b = 100;
+      for (LXPoint p : model.bassBox.struts.get(si).points) {
+        colors[p.index] = lx.hsb(h % 360, 100, b);
+        b = max(0, b - 10);
+      }
+      h += 50;
+    }
+    int[] floorIndices = {0, 1, 2, 3};
+    h = 0;
+    for (int fi : floorIndices) {
+      float b = 100;
+      for (LXPoint p : model.boothFloor.strips.get(fi).points) {
+        colors[p.index] = lx.hsb(h, 100, b);
+        b = max(0, b - 3);
+      }
+      h += 90;
+    }
+  }
+}
+
+class TestStripPattern extends TestPattern {
+  
+  SinLFO d = new SinLFO(4, 40, 4000);
+  
+  public TestStripPattern(GLucose glucose) {
+    super(glucose);
+    addModulator(d).trigger();
+  }
+  
+  public void run(double deltaMs) {
+    for (Strip s : model.strips) {
+      for (LXPoint p : s.points) {
+        colors[p.index] = lx.hsb(
+          lx.getBaseHuef(),
+          100,
+          max(0, 100 - d.getValuef()*dist(p.x, p.y, s.cx, s.cy))
+        );
+      }
+    }
+  }
+}
+
 /**
  * Simplest demonstration of using the rotating master hue.
  * All pixels are full-on the same color.
  */
-class TestHuePattern extends SCPattern {
+class TestHuePattern extends TestPattern {
   public TestHuePattern(GLucose glucose) {
     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) {
-      colors[i] = color(hv, 100, 100);
+      colors[i] = lx.hsb(hv, 100, 100);
     }
   } 
 }
@@ -19,21 +127,21 @@ class TestHuePattern extends SCPattern {
 /**
  * Test of a wave moving across the X axis.
  */
-class TestXPattern extends SCPattern {
+class TestXPattern extends TestPattern {
   private final SinLFO xPos = new SinLFO(0, model.xMax, 4000);
   public TestXPattern(GLucose glucose) {
     super(glucose);
     addModulator(xPos).trigger();
   }
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     float hv = lx.getBaseHuef();
-    for (Point p : model.points) {
+    for (LXPoint p : model.points) {
       // This is a common technique for modulating brightness.
       // You can use abs() to determine the distance between two
       // values. The further away this point is from an exact
       // point, the more we decrease its brightness
-      float bv = max(0, 100 - abs(p.fx - xPos.getValuef()));
-      colors[p.index] = color(hv, 100, bv);
+      float bv = max(0, 100 - abs(p.x - xPos.getValuef()));
+      colors[p.index] = lx.hsb(hv, 100, bv);
     }
   }
 }
@@ -41,17 +149,17 @@ class TestXPattern extends SCPattern {
 /**
  * Test of a wave on the Y axis.
  */
-class TestYPattern extends SCPattern {
+class TestYPattern extends TestPattern {
   private final SinLFO yPos = new SinLFO(0, model.yMax, 4000);
   public TestYPattern(GLucose glucose) {
     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()));
-      colors[p.index] = color(hv, 100, bv);
+    for (LXPoint p : model.points) {
+      float bv = max(0, 100 - abs(p.y - yPos.getValuef()));
+      colors[p.index] = lx.hsb(hv, 100, bv);
     }
   }
 }
@@ -59,17 +167,17 @@ class TestYPattern extends SCPattern {
 /**
  * Test of a wave on the Z axis.
  */
-class TestZPattern extends SCPattern {
+class TestZPattern extends TestPattern {
   private final SinLFO zPos = new SinLFO(0, model.zMax, 4000);
   public TestZPattern(GLucose glucose) {
     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()));
-      colors[p.index] = color(hv, 100, bv);
+    for (LXPoint p : model.points) {
+      float bv = max(0, 100 - abs(p.z - zPos.getValuef()));
+      colors[p.index] = lx.hsb(hv, 100, bv);
     }
   }
 }
@@ -77,7 +185,7 @@ class TestZPattern extends SCPattern {
 /**
  * This shows how to iterate over towers, enumerated in the model.
  */
-class TestTowerPattern extends SCPattern {
+class TestTowerPattern extends TestPattern {
   private final SawLFO towerIndex = new SawLFO(0, model.towers.size(), 1000*model.towers.size());
   
   public TestTowerPattern(GLucose glucose) {
@@ -85,11 +193,11 @@ class TestTowerPattern extends SCPattern {
     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) {
-        colors[p.index] = color(
+      for (LXPoint p : t.points) {
+        colors[p.index] = lx.hsb(
           lx.getBaseHuef(),
           100,
           max(0, 100 - 80*LXUtils.wrapdistf(ti, towerIndex.getValuef(), model.towers.size()))
@@ -119,27 +227,27 @@ class TestTowerPattern extends SCPattern {
  * of sparse, non-uniformly spaced pixels. Mutating the structure would move
  * things to a space where there are no pixels in 99% of the cases.
  */
-class TestProjectionPattern extends SCPattern {
+class TestProjectionPattern extends TestPattern {
   
-  private final Projection projection;
+  private final LXProjection projection;
   private final SawLFO angle = new SawLFO(0, TWO_PI, 9000);
   private final SinLFO yPos = new SinLFO(-20, 40, 5000);
   
   public TestProjectionPattern(GLucose glucose) {
     super(glucose);
-    projection = new Projection(model);
+    projection = new LXProjection(model);
     addModulator(angle).trigger();
     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
-    projection.reset(model)
+    projection.reset()
     
       // Translate so the center of the car is the origin, offset by yPos
-      .translateCenter(model, 0, yPos.getValuef(), 0)
+      .translateCenter(0, yPos.getValuef(), 0)
 
       // Rotate around the origin (now the center of the car) about an X-vector
       .rotate(angle.getValuef(), 1, 0, 0)
@@ -148,20 +256,20 @@ class TestProjectionPattern extends SCPattern {
       .scale(1, 1.5, 1);
 
     float hv = lx.getBaseHuef();
-    for (Coord c : projection) {
+    for (LXVector c : projection) {
       float d = sqrt(c.x*c.x + c.y*c.y + c.z*c.z); // distance from origin
       // d = abs(d-60) + max(0, abs(c.z) - 20); // life saver / ring thing
-      d = max(0, abs(c.y) - 10 + .3*abs(c.z) + .08*abs(c.x)); // plane / spear thing
-      colors[c.index] = color(
+      d = max(0, abs(c.y) - 10 + .1*abs(c.z) + .02*abs(c.x)); // plane / spear thing
+      colors[c.index] = lx.hsb(
         (hv + .6*abs(c.x) + abs(c.z)) % 360,
         100,
-        constrain(140 - 10*d, 0, 100)
+        constrain(140 - 40*d, 0, 100)
       );
     }
   } 
 }
 
-class TestCubePattern extends SCPattern {
+class TestCubePattern extends TestPattern {
   
   private SawLFO index = new SawLFO(0, Cube.POINTS_PER_CUBE, Cube.POINTS_PER_CUBE*60);
   
@@ -170,11 +278,11 @@ class TestCubePattern extends SCPattern {
     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) {
-        colors[p.index] = color(
+      for (LXPoint p : c.points) {
+        colors[p.index] = lx.hsb(
           lx.getBaseHuef(),
           100,
           max(0, 100 - 80.*abs(i - index.getValuef()))
@@ -185,7 +293,7 @@ class TestCubePattern extends SCPattern {
   }
 }
 
-class MappingTool extends SCPattern {
+class MappingTool extends TestPattern {
     
   private int cubeIndex = 0;
   private int stripIndex = 0;
@@ -208,8 +316,8 @@ class MappingTool extends SCPattern {
   private final int numChannels;
   
   private final PandaMapping[] pandaMappings;
-  private PandaMapping activeMapping;
-  private int mappingChannelIndex;
+  private PandaMapping activePanda;
+  private ChannelMapping activeChannel;
   
   MappingTool(GLucose glucose, PandaMapping[] pandaMappings) {
     super(glucose);
@@ -217,19 +325,25 @@ class MappingTool extends SCPattern {
     numChannels = pandaMappings.length * PandaMapping.CHANNELS_PER_BOARD;
     setChannel();
   }
+
+  public int numChannels() {
+    return numChannels;
+  }
   
   private void setChannel() {
-    mappingChannelIndex = channelIndex % PandaMapping.CHANNELS_PER_BOARD;
-    activeMapping = pandaMappings[channelIndex / PandaMapping.CHANNELS_PER_BOARD];
+    activePanda = pandaMappings[channelIndex / PandaMapping.CHANNELS_PER_BOARD];
+    activeChannel = activePanda.channelList[channelIndex % PandaMapping.CHANNELS_PER_BOARD];
   }
   
-  private int cubeInChannel(Cube c) {
-    int i = 1;
-    for (int index : activeMapping.channelList[mappingChannelIndex]) {
-      if (c == model.getCubeByRawIndex(index)) {
-        return i;
+  private int indexOfCubeInChannel(Cube c) {
+    if (activeChannel.mode == ChannelMapping.MODE_CUBES) {
+      int i = 1;
+      for (int index : activeChannel.objectIndices) {
+        if ((index >= 0) && (c == model.getCubeByRawIndex(index))) {
+          return i;
+        }
+        ++i;
       }
-      ++i;
     }
     return 0;
   }
@@ -250,8 +364,8 @@ class MappingTool extends SCPattern {
     printInfo();
   }
   
-  public void run(int deltaMs) {
-    color off = color(0, 0, 0);
+  public void run(double deltaMs) {
+    color off = #000000;
     color c = off;
     color r = #FF0000;
     color g = #00FF00;
@@ -263,16 +377,16 @@ class MappingTool extends SCPattern {
     int ci = 0;
     for (Cube cube : model.cubes) {
       boolean cubeOn = false;
-      int channelIndex = cubeInChannel(cube);
+      int indexOfCubeInChannel = indexOfCubeInChannel(cube);
       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) {
           color cc = off;
-          switch (channelIndex) {
+          switch (indexOfCubeInChannel) {
             case 1: cc = r; break;
             case 2: cc = r|g; break;
             case 3: cc = g; break;
@@ -308,7 +422,10 @@ class MappingTool extends SCPattern {
       }
       ++ci;
     }
-    
+  }
+  
+  public void setCube(int index) {
+    cubeIndex = index % model.cubes.size();
   }
   
   public void incCube() {
@@ -321,6 +438,11 @@ class MappingTool extends SCPattern {
       cubeIndex += model.cubes.size();
     }
   }
+  
+  public void setChannel(int index) {
+    channelIndex = index % numChannels;
+    setChannel();
+  }
 
   public void incChannel() {
     channelIndex = (channelIndex + 1) % numChannels;
@@ -328,27 +450,23 @@ class MappingTool extends SCPattern {
   }
   
   public void decChannel() {
-    --channelIndex;
-    if (channelIndex < 0) {
-      channelIndex += numChannels;
-    }
+    channelIndex = (channelIndex + numChannels - 1) % numChannels;
     setChannel();    
   }
   
+  public void setStrip(int index) {
+    stripIndex = index % Cube.STRIPS_PER_CUBE;
+  }
+  
   public void incStrip() {
-    int stripsPerCube = Cube.FACES_PER_CUBE * Face.STRIPS_PER_FACE;
-    stripIndex = (stripIndex + 1) % stripsPerCube;
+    stripIndex = (stripIndex + 1) % Cube.STRIPS_PER_CUBE;
   }
   
   public void decStrip() {
-    int stripsPerCube = Cube.FACES_PER_CUBE * Face.STRIPS_PER_FACE;
-    --stripIndex;
-    if (stripIndex < 0) {
-      stripIndex += stripsPerCube;
-    }
+    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;
@@ -360,5 +478,10 @@ class MappingTool extends SCPattern {
       case 'g': channelModeGreen = !channelModeGreen; break;
       case 'b': channelModeBlue = !channelModeBlue; break;
     }
+    uiMapping.setChannelID(channelIndex+1);
+    uiMapping.setCubeID(cubeIndex+1);
+    uiMapping.setStripID(stripIndex+1);
+    uiMapping.redraw();
   }
+
 }