Ported over a couple more patterns

diff --git a/MarkSlee.pde b/MarkSlee.pde
index 95e8545698c16a0812dcfab133b6917552079188..0ed7e3700cc13ec7df3bfab2bb5bedfe0b1dda97 100644 (file)
--- a/MarkSlee.pde
+++ b/MarkSlee.pde
@@ -344,3 +344,114 @@ public class PianoKeyPattern extends SCPattern {
   }
 }
 
+class CrossSections extends SCPattern {
+  
+  final SinLFO y = new SinLFO(0, 255, 5000);
+  final SinLFO z = new SinLFO(0, 127, 6000);
+  final SinLFO x = new SinLFO(0, 127, 7000);
+  
+  final BasicParameter xw = new BasicParameter("XWID", 0.3);
+  final BasicParameter yw = new BasicParameter("YWID", 0.3);
+  final BasicParameter zw = new BasicParameter("ZWID", 0.3);  
+  final BasicParameter xr = new BasicParameter("XRAT", 0.5);
+  final BasicParameter yr = new BasicParameter("YRAT", 0.6);
+  final BasicParameter zr = new BasicParameter("ZRAT", 0.7);
+  final BasicParameter xl = new BasicParameter("XLEV", 0.5);
+  final BasicParameter yl = new BasicParameter("YLEV", 1);
+  final BasicParameter zl = new BasicParameter("ZLEV", 1);
+
+  
+  CrossSections(GLucose glucose) {
+    super(glucose);
+    addModulator(x).trigger();
+    addModulator(y).trigger();
+    addModulator(z).trigger();
+    addParameter(xr);
+    addParameter(yr);
+    addParameter(zr);    
+    addParameter(yw);
+    addParameter(xl);
+    addParameter(yl);
+    addParameter(zl);
+    addParameter(zw);    
+    addParameter(xw);
+  }
+  
+  void onParameterChanged(LXParameter p) {
+    if (p == xr) {
+      x.setDuration(10000 - 9000*p.getValuef());
+    } else if (p == yr) {
+      y.setDuration(10000 - 8800*p.getValuef());
+    } else if (p == zr) {
+      z.setDuration(10000 - 9000*p.getValuef());
+    }
+      
+  }
+
+  public void run(int deltaMs) {
+    float xv = x.getValuef();
+    float yv = y.getValuef();
+    float zv = z.getValuef();    
+    float xlv = 100*xl.getValuef();
+    float ylv = 100*yl.getValuef();
+    float zlv = 100*zl.getValuef();
+    
+    float xwv = 100. / (10 + 40*xw.getValuef());
+    float ywv = 100. / (10 + 40*yw.getValuef());
+    float zwv = 100. / (10 + 40*zw.getValuef());
+    
+    for (Point p : Point.list) {
+      color c = 0;
+      c = blendColor(c, color(
+      (lx.getBaseHuef() + p.fy/10 + p.fz/3) % 360, 
+      constrain(140 - 1.1*abs(p.fy - 127), 0, 100), 
+      max(0, ylv - ywv*abs(p.fy - yv))
+        ), ADD);
+      c = blendColor(c, color(
+      (lx.getBaseHuef() + 80 + p.fz/10) % 360, 
+      constrain(140 - 2.2*abs(p.fz - 64), 0, 100), 
+      max(0, zlv - zwv*abs(p.fz - zv))
+        ), ADD); 
+      c = blendColor(c, color(
+      (lx.getBaseHuef() + 160 + p.fx / 10 + p.fz/2) % 360, 
+      constrain(140 - 2.2*abs(p.fx - 64), 0, 100), 
+      max(0, xlv - xwv*abs(p.fx - xv))
+        ), ADD); 
+      colors[p.index] = c;
+    }
+  }
+}
+
+class Blinders extends SCPattern {
+    
+  final SinLFO m;
+  final TriangleLFO r;
+  final SinLFO s;
+  final TriangleLFO hs;
+
+  public Blinders(GLucose glucose) {
+    super(glucose);
+    addModulator(m = new SinLFO(0.5, 80, 9000)).trigger();
+    addModulator(r = new TriangleLFO(3000, 9000, 21000)).trigger();
+    addModulator(s = new SinLFO(-20, 275, 4000)).trigger();
+    addModulator(hs = new TriangleLFO(0.1, 0.5, 15000)).trigger();
+    m.modulateDurationBy(r);
+  }
+
+  public void run(int deltaMs) {
+    float hv = lx.getBaseHuef();
+    for (Strip strip : Strip.list) {
+      int i = 0;
+      for (Point p : strip.points) {
+        colors[p.index] = color(
+          (hv + p.fx + p.fz*hs.getValuef()) % 360, 
+          min(100, abs(p.fy - s.getValuef())/2.), 
+          max(0, 100 - m.getValuef() * abs(i - 7.5))
+        );
+        ++i;
+      }
+    }
+  }
+}
+
+

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 9ec4f079d86feb8b00cf919904004d8265bd3604..c6b8834c4acf2b95d6f0c5b9c74ec14d4ce9b722 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -25,8 +25,10 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-    new SpaceTime(glucose),
     new Swarm(glucose),
+    new SpaceTime(glucose),
+    new Blinders(glucose),
+    new CrossSections(glucose),
     new CubeEQ(glucose),
     new PianoKeyPattern(glucose),