X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=blobdiff_plain;f=TestPatterns.pde;h=728683ec45dea70eec6ee5e03f4f4f3635449514;hp=4c7899591a88e50bf338d2cf5b827c02509ce5fc;hb=7d60f6f6ea82fd5c9794524ce11d40e7d6c00bf7;hpb=190d91c2948b274a2dbaf4ec07450b4ebf2feece

diff --git a/TestPatterns.pde b/TestPatterns.pde
index 4c78995..728683e 100644
--- a/TestPatterns.pde
+++ b/TestPatterns.pde
@@ -1,6 +1,6 @@
 class BlankPattern extends SCPattern {
-  BlankPattern(GLucose glucose) {
-    super(glucose);
+  BlankPattern(LX lx) {
+    super(lx);
   }
   
   public void run(double deltaMs) {
@@ -9,94 +9,25 @@ class BlankPattern extends SCPattern {
 }
 
 abstract class TestPattern extends SCPattern {
-  public TestPattern(GLucose glucose) {
-    super(glucose);
+  public TestPattern(LX lx) {
+    super(lx);
     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 (Point p : strip.points) {
-          colors[p.index] = color(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 (Point p : model.bassBox.strips.get(si).points) {
-        colors[p.index] = color(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 (Point p : model.bassBox.struts.get(si).points) {
-        colors[p.index] = color(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 (Point p : model.boothFloor.strips.get(fi).points) {
-        colors[p.index] = color(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);
+  public TestStripPattern(LX lx) {
+    super(lx);
     addModulator(d).trigger();
   }
   
   public void run(double deltaMs) {
     for (Strip s : model.strips) {
-      for (Point p : s.points) {
-        colors[p.index] = color(
+      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))
@@ -111,15 +42,15 @@ class TestStripPattern extends TestPattern {
  * All pixels are full-on the same color.
  */
 class TestHuePattern extends TestPattern {
-  public TestHuePattern(GLucose glucose) {
-    super(glucose);
+  public TestHuePattern(LX lx) {
+    super(lx);
   }
   
   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);
     }
   } 
 }
@@ -129,19 +60,19 @@ class TestHuePattern extends TestPattern {
  */
 class TestXPattern extends TestPattern {
   private final SinLFO xPos = new SinLFO(0, model.xMax, 4000);
-  public TestXPattern(GLucose glucose) {
-    super(glucose);
+  public TestXPattern(LX lx) {
+    super(lx);
     addModulator(xPos).trigger();
   }
   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.x - xPos.getValuef()));
-      colors[p.index] = color(hv, 100, bv);
+      colors[p.index] = lx.hsb(hv, 100, bv);
     }
   }
 }
@@ -151,15 +82,15 @@ class TestXPattern extends TestPattern {
  */
 class TestYPattern extends TestPattern {
   private final SinLFO yPos = new SinLFO(0, model.yMax, 4000);
-  public TestYPattern(GLucose glucose) {
-    super(glucose);
+  public TestYPattern(LX lx) {
+    super(lx);
     addModulator(yPos).trigger();
   }
   public void run(double deltaMs) {
     float hv = lx.getBaseHuef();
-    for (Point p : model.points) {
+    for (LXPoint p : model.points) {
       float bv = max(0, 100 - abs(p.y - yPos.getValuef()));
-      colors[p.index] = color(hv, 100, bv);
+      colors[p.index] = lx.hsb(hv, 100, bv);
     }
   }
 }
@@ -169,15 +100,15 @@ class TestYPattern extends TestPattern {
  */
 class TestZPattern extends TestPattern {
   private final SinLFO zPos = new SinLFO(0, model.zMax, 4000);
-  public TestZPattern(GLucose glucose) {
-    super(glucose);
+  public TestZPattern(LX lx) {
+    super(lx);
     addModulator(zPos).trigger();
   }
   public void run(double deltaMs) {
     float hv = lx.getBaseHuef();
-    for (Point p : model.points) {
+    for (LXPoint p : model.points) {
       float bv = max(0, 100 - abs(p.z - zPos.getValuef()));
-      colors[p.index] = color(hv, 100, bv);
+      colors[p.index] = lx.hsb(hv, 100, bv);
     }
   }
 }
@@ -188,16 +119,16 @@ class TestZPattern extends TestPattern {
 class TestTowerPattern extends TestPattern {
   private final SawLFO towerIndex = new SawLFO(0, model.towers.size(), 1000*model.towers.size());
   
-  public TestTowerPattern(GLucose glucose) {
-    super(glucose);
+  public TestTowerPattern(LX lx) {
+    super(lx);
     addModulator(towerIndex).trigger();
   }
 
   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()))
@@ -229,13 +160,13 @@ class TestTowerPattern extends TestPattern {
  */
 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);
+  public TestProjectionPattern(LX lx) {
+    super(lx);
+    projection = new LXProjection(model);
     addModulator(angle).trigger();
     addModulator(yPos).trigger();
   }
@@ -244,10 +175,10 @@ class TestProjectionPattern extends TestPattern {
     // 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)
@@ -256,11 +187,11 @@ class TestProjectionPattern extends TestPattern {
       .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 + .1*abs(c.z) + .02*abs(c.x)); // plane / spear thing
-      colors[c.index] = color(
+      colors[c.index] = lx.hsb(
         (hv + .6*abs(c.x) + abs(c.z)) % 360,
         100,
         constrain(140 - 40*d, 0, 100)
@@ -273,16 +204,16 @@ class TestCubePattern extends TestPattern {
   
   private SawLFO index = new SawLFO(0, Cube.POINTS_PER_CUBE, Cube.POINTS_PER_CUBE*60);
   
-  TestCubePattern(GLucose glucose) {
-    super(glucose);
+  TestCubePattern(LX lx) {
+    super(lx);
     addModulator(index).start();
   }
   
   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()))
@@ -314,15 +245,11 @@ class MappingTool extends TestPattern {
   public boolean channelModeBlue = false;
   
   private final int numChannels;
-  
-  private final PandaMapping[] pandaMappings;
-  private PandaMapping activePanda;
-  private ChannelMapping activeChannel;
-  
-  MappingTool(GLucose glucose, PandaMapping[] pandaMappings) {
-    super(glucose);
-    this.pandaMappings = pandaMappings;
-    numChannels = pandaMappings.length * PandaMapping.CHANNELS_PER_BOARD;
+    
+  MappingTool(LX lx) {
+    super(lx);
+    // TODO(mcslee): port channels to grizzly
+    numChannels = 1;
     setChannel();
   }
 
@@ -331,21 +258,12 @@ class MappingTool extends TestPattern {
   }
   
   private void setChannel() {
-    activePanda = pandaMappings[channelIndex / PandaMapping.CHANNELS_PER_BOARD];
-    activeChannel = activePanda.channelList[channelIndex % PandaMapping.CHANNELS_PER_BOARD];
+    // TODO(mcslee): port to grizzly
   }
   
   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;
-      }
-    }
-    return 0;
+    // TODO(mcslee): port to grizzly
+    return -1;
   }
   
   private void printInfo() {
@@ -365,7 +283,7 @@ class MappingTool extends TestPattern {
   }
   
   public void run(double deltaMs) {
-    color off = color(0, 0, 0);
+    color off = #000000;
     color c = off;
     color r = #FF0000;
     color g = #00FF00;
@@ -440,7 +358,9 @@ class MappingTool extends TestPattern {
   }
   
   public void setChannel(int index) {
-    channelIndex = index % numChannels;
+    if (numChannels > 0) {
+      channelIndex = index % numChannels;
+    }
     setChannel();
   }