X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=MarkSlee.pde;h=f955f97bd32474d7997ae50da122b729c73fa607;hb=bd33a0f155de19be679b13e02737b7a44956ed03;hp=76d2aef24be849aab540c215c3efa9a4ab1ca165;hpb=2b6688e8e11d5421ec83f1c03efb6eb05508cc7b;p=SugarCubes.git

diff --git a/MarkSlee.pde b/MarkSlee.pde
index 76d2aef..f955f97 100644
--- a/MarkSlee.pde
+++ b/MarkSlee.pde
@@ -28,14 +28,14 @@ class SpaceTime extends SCPattern {
 
   void run(int deltaMs) {    
     angle += deltaMs * 0.0007;
-    float sVal1 = Strip.list.size() * (0.5 + 0.5*sin(angle));
-    float sVal2 = Strip.list.size() * (0.5 + 0.5*cos(angle));
+    float sVal1 = model.strips.size() * (0.5 + 0.5*sin(angle));
+    float sVal2 = model.strips.size() * (0.5 + 0.5*cos(angle));
 
     float pVal = pos.getValuef();
     float fVal = falloff.getValuef();
 
     int s = 0;
-    for (Strip strip : Strip.list) {
+    for (Strip strip : model.strips) {
       int i = 0;
       for (Point p : strip.points) {
         colors[p.index] = color(
@@ -55,9 +55,9 @@ class Swarm extends SCPattern {
   SawLFO offset = new SawLFO(0, 16, 1000);
   SinLFO rate = new SinLFO(350, 1200, 63000);
   SinLFO falloff = new SinLFO(15, 50, 17000);
-  SinLFO fX = new SinLFO(0, 255, 19000);
-  SinLFO fY = new SinLFO(0, 127, 11000);
-  SinLFO hOffX = new SinLFO(0, 255, 13000);
+  SinLFO fX = new SinLFO(0, model.xMax, 19000);
+  SinLFO fY = new SinLFO(0, model.yMax, 11000);
+  SinLFO hOffX = new SinLFO(0, model.xMax, 13000);
 
   public Swarm(GLucose glucose) {
     super(glucose);
@@ -83,7 +83,7 @@ class Swarm extends SCPattern {
 
   void run(int deltaMs) {
     float s = 0;
-    for (Strip strip : Strip.list) {
+    for (Strip strip : model.strips) {
       int i = 0;
       for (Point p : strip.points) {
         float fV = max(-1, 1 - dist(p.fx/2., p.fy, fX.getValuef()/2., fY.getValuef()) / 64.);
@@ -111,8 +111,8 @@ class SwipeTransition extends SCTransition {
 
   void computeBlend(int[] c1, int[] c2, double progress) {
     float bleedf = 10 + bleed.getValuef() * 200.;
-    float xPos = (float) (-bleedf + progress * (255. + bleedf));
-    for (Point p : Point.list) {
+    float xPos = (float) (-bleedf + progress * (model.xMax + bleedf));
+    for (Point p : model.points) {
       float d = (p.fx - xPos) / bleedf;
       if (d < 0) {
         colors[p.index] = c2[p.index];
@@ -184,10 +184,10 @@ class CubeEQ extends SCPattern {
     float jConst = 300.*(1-range.getValuef());
     float clrConst = 1.1 + clr.getValuef();
 
-    for (Point p : Point.list) {
-      float avgIndex = constrain((p.fx / 256. * avgSize), 0, avgSize-2);
+    for (Point p : model.points) {
+      float avgIndex = constrain((p.fx / model.xMax * avgSize), 0, avgSize-2);
       int avgFloor = (int) avgIndex;
-      float j = jBase + jConst * (p.fy / 128.);
+      float j = jBase + jConst * (p.fy / model.yMax);
       float value = lerp(
       this.bandVals[avgFloor].getValuef(), 
       this.bandVals[avgFloor+1].getValuef(), 
@@ -210,7 +210,7 @@ class BoomEffect extends SCEffect {
   final BasicParameter bright = new BasicParameter("BRT", 1.0);
   final BasicParameter sat = new BasicParameter("SAT", 0.2);
   List<Layer> layers = new ArrayList<Layer>();
-  final float maxr = sqrt(127*127 + 127*127 + 255*255) + 10;
+  final float maxr = sqrt(model.xMax*model.xMax + model.yMax*model.yMax + model.zMax*model.zMax) + 10;
 
   class Layer {
     LinearEnvelope boom = new LinearEnvelope(-40, 500, 1300);
@@ -231,10 +231,10 @@ class BoomEffect extends SCEffect {
       float falloffv = falloffv();
       float satv = sat.getValuef() * 100;
       float huev = lx.getBaseHuef();
-      for (Point p : Point.list) {
+      for (Point p : model.points) {
         colors[p.index] = blendColor(
         colors[p.index], 
-        color(huev, satv, constrain(brightv - falloffv*abs(boom.getValuef() - dist(p.fx, 2*p.fy, 2*p.fz, 128, 128, 128)), 0, 100)), 
+        color(huev, satv, constrain(brightv - falloffv*abs(boom.getValuef() - dist(p.fx, 2*p.fy, 3*p.fz, model.xMax/2, model.yMax, model.zMax*1.5)), 0, 100)), 
         ADD);
       }
     }
@@ -293,11 +293,11 @@ public class PianoKeyPattern extends SCPattern {
     addParameter(attack);
     addParameter(release);
     addParameter(level);
-    cubeBrt = new LinearEnvelope[Cube.list.size() / 4];
+    cubeBrt = new LinearEnvelope[model.cubes.size() / 4];
     for (int i = 0; i < cubeBrt.length; ++i) {
       addModulator(cubeBrt[i] = new LinearEnvelope(0, 0, 100));
     }
-    base = new SinLFO[Cube.list.size() / 12];
+    base = new SinLFO[model.cubes.size() / 12];
     for (int i = 0; i < base.length; ++i) {
       addModulator(base[i] = new SinLFO(0, 1, 7000 + 1000*i)).trigger();
     }
@@ -332,10 +332,10 @@ public class PianoKeyPattern extends SCPattern {
     int i = 0;
     float huef = lx.getBaseHuef();
     float levelf = level.getValuef();
-    for (Cube c : Cube.list) {
+    for (Cube c : model.cubes) {
       float v = max(getBase(i).getValuef() * levelf/4., getEnvelope(i++).getValuef());
       setColor(c, color(
-        (huef + 20*v + abs(c.fx-128.)*.3 + c.fy) % 360,
+        (huef + 20*v + abs(c.cx-model.xMax/2.)*.3 + c.cy) % 360,
         min(100, 120*v),
         100*v
       ));
@@ -345,9 +345,9 @@ public class PianoKeyPattern extends SCPattern {
 
 class CrossSections extends SCPattern {
   
-  final SinLFO x = new SinLFO(0, 255, 5000);
-  final SinLFO y = new SinLFO(0, 127, 6000);
-  final SinLFO z = new SinLFO(0, 127, 7000);
+  final SinLFO x = new SinLFO(0, model.xMax, 5000);
+  final SinLFO y = new SinLFO(0, model.yMax, 6000);
+  final SinLFO z = new SinLFO(0, model.zMax, 7000);
   
   final BasicParameter xw = new BasicParameter("XWID", 0.3);
   final BasicParameter yw = new BasicParameter("YWID", 0.3);
@@ -365,6 +365,11 @@ class CrossSections extends SCPattern {
     addModulator(x).trigger();
     addModulator(y).trigger();
     addModulator(z).trigger();
+    addParams();
+  }
+  
+  public void addParams()
+  {
     addParameter(xr);
     addParameter(yr);
     addParameter(zr);    
@@ -375,8 +380,8 @@ class CrossSections extends SCPattern {
     addParameter(yw);    
     addParameter(zw);
   }
-  
-  void onParameterChanged(LXParameter p) {
+
+  public void onParameterChanged(LXParameter p) {
     if (p == xr) {
       x.setDuration(10000 - 8800*p.getValuef());
     } else if (p == yr) {
@@ -386,10 +391,19 @@ class CrossSections extends SCPattern {
     }
   }
 
+  float xv;
+  float yv;
+  float zv;  
+
+  public void updateXYZVals()
+  {
+    xv = x.getValuef();
+    yv = y.getValuef();
+    zv = z.getValuef(); 
+  }
+
   public void run(int deltaMs) {
-    float xv = x.getValuef();
-    float yv = y.getValuef();
-    float zv = z.getValuef();    
+    updateXYZVals();   
     float xlv = 100*xl.getValuef();
     float ylv = 100*yl.getValuef();
     float zlv = 100*zl.getValuef();
@@ -398,21 +412,21 @@ class CrossSections extends SCPattern {
     float ywv = 100. / (10 + 40*yw.getValuef());
     float zwv = 100. / (10 + 40*zw.getValuef());
     
-    for (Point p : Point.list) {
+    for (Point p : model.points) {
       color c = 0;
       c = blendColor(c, color(
       (lx.getBaseHuef() + p.fx/10 + p.fy/3) % 360, 
-      constrain(140 - 1.1*abs(p.fx - 127), 0, 100), 
+      constrain(140 - 1.1*abs(p.fx - model.xMax/2.), 0, 100), 
       max(0, xlv - xwv*abs(p.fx - xv))
         ), ADD);
       c = blendColor(c, color(
       (lx.getBaseHuef() + 80 + p.fy/10) % 360, 
-      constrain(140 - 2.2*abs(p.fy - 64), 0, 100), 
+      constrain(140 - 2.2*abs(p.fy - model.yMax/2.), 0, 100), 
       max(0, ylv - ywv*abs(p.fy - yv))
         ), ADD); 
       c = blendColor(c, color(
       (lx.getBaseHuef() + 160 + p.fz / 10 + p.fy/2) % 360, 
-      constrain(140 - 2.2*abs(p.fz - 64), 0, 100), 
+      constrain(140 - 2.2*abs(p.fz - model.zMax/2.), 0, 100), 
       max(0, zlv - zwv*abs(p.fz - zv))
         ), ADD); 
       colors[p.index] = c;
@@ -442,7 +456,7 @@ class Blinders extends SCPattern {
   public void run(int deltaMs) {
     float hv = lx.getBaseHuef();
     int si = 0;
-    for (Strip strip : Strip.list) {
+    for (Strip strip : model.strips) {
       int i = 0;
       float mv = m[si % m.length].getValuef();
       for (Point p : strip.points) {
@@ -458,4 +472,137 @@ class Blinders extends SCPattern {
   }
 }
 
+class Psychedelia extends SCPattern {
+  
+  final int NUM = 3;
+  SinLFO m = new SinLFO(-0.5, NUM-0.5, 9000);
+  SinLFO s = new SinLFO(-20, 147, 11000);
+  TriangleLFO h = new TriangleLFO(0, 240, 19000);
+  SinLFO c = new SinLFO(-.2, .8, 31000);
+
+  Psychedelia(GLucose glucose) {
+    super(glucose);
+    addModulator(m).trigger();
+    addModulator(s).trigger();
+    addModulator(h).trigger();
+    addModulator(c).trigger();
+  }
+
+  void run(int deltaMs) {
+    float huev = h.getValuef();
+    float cv = c.getValuef();
+    float sv = s.getValuef();
+    float mv = m.getValuef();
+    int i = 0;
+    for (Strip strip : model.strips) {
+      for (Point p : strip.points) {
+        colors[p.index] = color(
+          (huev + i*constrain(cv, 0, 2) + p.fz/2. + p.fx/4.) % 360, 
+          min(100, abs(p.fy-sv)), 
+          max(0, 100 - 50*abs((i%NUM) - mv))
+        );
+      }
+      ++i;
+    }
+  }
+}
+
+class AskewPlanes extends SCPattern {
+  
+  class Plane {
+    private final SinLFO a;
+    private final SinLFO b;
+    private final SinLFO c;
+    float av = 1;
+    float bv = 1;
+    float cv = 1;
+    float denom = 0.1;
+    
+    Plane(int i) {
+      addModulator(a = new SinLFO(-1, 1, 4000 + 1029*i)).trigger();
+      addModulator(b = new SinLFO(-1, 1, 11000 - 1104*i)).trigger();
+      addModulator(c = new SinLFO(-50, 50, 4000 + 1000*i * ((i % 2 == 0) ? 1 : -1))).trigger();      
+    }
+    
+    void run(int deltaMs) {
+      av = a.getValuef();
+      bv = b.getValuef();
+      cv = c.getValuef();
+      denom = sqrt(av*av + bv*bv);
+    }
+  }
+    
+  final Plane[] planes;
+  final int NUM_PLANES = 3;
+  
+  AskewPlanes(GLucose glucose) {
+    super(glucose);
+    planes = new Plane[NUM_PLANES];
+    for (int i = 0; i < planes.length; ++i) {
+      planes[i] = new Plane(i);
+    }
+  }
+  
+  public void run(int deltaMs) {
+    float huev = lx.getBaseHuef();
+    
+    // This is super fucking bizarre. But if this is a for loop, the framerate
+    // tanks to like 30FPS, instead of 60. Call them manually and it works fine.
+    // Doesn't make ANY sense... there must be some weird side effect going on
+    // with the Processing internals perhaps?
+//    for (Plane plane : planes) {
+//      plane.run(deltaMs);
+//    }
+    planes[0].run(deltaMs);
+    planes[1].run(deltaMs);
+    planes[2].run(deltaMs);    
+    
+    for (Point p : model.points) {
+      float d = MAX_FLOAT;
+      for (Plane plane : planes) {
+        if (plane.denom != 0) {
+          d = min(d, abs(plane.av*(p.fx-model.cx) + plane.bv*(p.fy-model.cy) + plane.cv) / plane.denom);
+        }
+      }
+      colors[p.index] = color(
+        (huev + abs(p.fx-model.cx)*.3 + p.fy*.8) % 360,
+        max(0, 100 - .8*abs(p.fx - model.cx)),
+        constrain(140 - 10.*d, 0, 100)
+      );
+    }
+  }
+}
+
+class ShiftingPlane extends SCPattern {
+
+  final SinLFO a = new SinLFO(-.2, .2, 5300);
+  final SinLFO b = new SinLFO(1, -1, 13300);
+  final SinLFO c = new SinLFO(-1.4, 1.4, 5700);
+  final SinLFO d = new SinLFO(-10, 10, 9500);
+
+  ShiftingPlane(GLucose glucose) {
+    super(glucose);
+    addModulator(a).trigger();
+    addModulator(b).trigger();
+    addModulator(c).trigger();
+    addModulator(d).trigger();    
+  }
+  
+  public void run(int deltaMs) {
+    float hv = lx.getBaseHuef();
+    float av = a.getValuef();
+    float bv = b.getValuef();
+    float cv = c.getValuef();
+    float dv = d.getValuef();    
+    float denom = sqrt(av*av + bv*bv + cv*cv);
+    for (Point p : model.points) {
+      float d = abs(av*(p.fx-model.cx) + bv*(p.fy-model.cy) + cv*(p.fz-model.cz) + dv) / denom;
+      colors[p.index] = color(
+        (hv + abs(p.fx-model.cx)*.6 + abs(p.fy-model.cy)*.9 + abs(p.fz - model.cz)) % 360,
+        constrain(110 - d*6, 0, 100),
+        constrain(130 - 7*d, 0, 100)
+      );
+    }
+  }
+}