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

diff --git a/TestPatterns.pde b/TestPatterns.pde
index b566e33..6a662f2 100644
--- a/TestPatterns.pde
+++ b/TestPatterns.pde
@@ -1,3 +1,13 @@
+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);
@@ -10,13 +20,13 @@ 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) {
         float b = 100;
-        for (Point p : strip.points) {
-          colors[p.index] = color(h % 360, 100, b);
+        for (LXPoint p : strip.points) {
+          colors[p.index] = lx.hsb(h % 360, 100, b);
           b = max(0, b - 10);
         }
         h += 70;
@@ -31,13 +41,13 @@ 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) {
       float b = 100;
-      for (Point p : model.bassBox.strips.get(si).points) {
-        colors[p.index] = color(h % 360, 100, b);
+      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;
@@ -50,13 +60,13 @@ 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) {
       float b = 100;
-      for (Point p : model.bassBox.struts.get(si).points) {
-        colors[p.index] = color(h % 360, 100, b);
+      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;
@@ -65,8 +75,8 @@ class TestFloorMapping extends TestPattern {
     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);
+      for (LXPoint p : model.boothFloor.strips.get(fi).points) {
+        colors[p.index] = lx.hsb(h, 100, b);
         b = max(0, b - 3);
       }
       h += 90;
@@ -83,10 +93,10 @@ 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(
+      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))
@@ -105,11 +115,11 @@ 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) {
-      colors[i] = color(hv, 100, 100);
+      colors[i] = lx.hsb(hv, 100, 100);
     }
   } 
 }
@@ -123,15 +133,15 @@ 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) {
+    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);
     }
   }
 }
@@ -145,11 +155,11 @@ 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()));
-      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);
     }
   }
 }
@@ -163,11 +173,11 @@ 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()));
-      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);
     }
   }
 }
@@ -183,11 +193,11 @@ 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) {
-        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()))
@@ -219,25 +229,25 @@ 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);
+    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)
@@ -246,11 +256,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)
@@ -268,11 +278,11 @@ 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) {
-        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()))
@@ -354,8 +364,8 @@ class MappingTool extends TestPattern {
     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;