X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=blobdiff_plain;f=JackStahl.pde;h=3b69815f92a4cbc6bb5472be00a134d8c3b92faf;hp=9cd6bf145dacb473d2b04d8ec84b517ca807eee5;hb=7d60f6f6ea82fd5c9794524ce11d40e7d6c00bf7;hpb=b6a79a671fa97d90d89d32f586fc9ee9766a15d2

diff --git a/JackStahl.pde b/JackStahl.pde
index 9cd6bf1..3b69815 100644
--- a/JackStahl.pde
+++ b/JackStahl.pde
@@ -9,62 +9,71 @@
 class Swim extends SCPattern {
 
   // Projection stuff
-  private final Projection projection;
-  SawLFO rotation = new SawLFO(0, TWO_PI, 19000);
-  SinLFO yPos = new SinLFO(-25, 25, 12323);
-  final BasicParameter xAngle = new BasicParameter("XANG", 0.9);
-  final BasicParameter yAngle = new BasicParameter("YANG", 0.3);
-  final BasicParameter zAngle = new BasicParameter("ZANG", 0.3);
+  private final LXProjection projection;
+  SinLFO rotationX = new SinLFO(-PI/16, PI/8, 9000);
+  SinLFO rotationY = new SinLFO(-PI/8, PI/8, 7000);
+  SinLFO rotationZ = new SinLFO(-PI/8, PI/16, 11000);
+  SinLFO yPos = new SinLFO(-1, 1, 13234);
+  SinLFO sineHeight = new SinLFO(1, 2.5, 13234);
+  SawLFO phaseLFO = new SawLFO(0, 2 * PI, 15000 - 13000 * 0.5);
+  final BasicParameter phaseParam = new BasicParameter("Spd", 0.5);
+  final BasicParameter crazyParam = new BasicParameter("Crzy", 0.5);
 
   final BasicParameter hueScale = new BasicParameter("HUE", 0.3);
 
-  public Swim(GLucose glucose) {
-    super(glucose);
-    projection = new Projection(model);
-
-    addParameter(xAngle);
-    addParameter(yAngle);
-    addParameter(zAngle);
+  public Swim(LX lx) {
+    super(lx);
+    projection = new LXProjection(model);
     addParameter(hueScale);
+    addParameter(crazyParam);
+    addParameter(phaseParam);
 
-    addModulator(rotation).trigger();
+    addModulator(rotationX).trigger();
+    addModulator(rotationY).trigger();
+    addModulator(rotationZ).trigger();
     addModulator(yPos).trigger();
+    addModulator(phaseLFO).trigger();
+  }
+  
+  public void onParameterChanged(LXParameter parameter) {
+    if (parameter == phaseParam) {
+      phaseLFO.setDuration(5000 - 4500 * parameter.getValuef());
+    }
   }
-
 
   int beat = 0;
   float prevRamp = 0;
-  void run(int deltaMs) {
+  void run(double deltaMs) {
 
-    // Sync to the beat
-    float ramp = (float)lx.tempo.ramp();
-    if (ramp < prevRamp) {
-      beat = (beat + 1) % 4;
-    }
-    prevRamp = ramp;
-    float phase = (beat+ramp) / 2.0 * 2 * PI;
+    float phase = phaseLFO.getValuef();
+    
+    float up_down_range = (model.yMax - model.yMin) / 4;
 
-    float denominator = max(xAngle.getValuef() + yAngle.getValuef() + zAngle.getValuef(), 1);
+    // Swim around the world
+    float crazy_factor = crazyParam.getValuef() / 0.2;
+    projection.reset()
+    .rotate(rotationZ.getValuef() * crazy_factor,  0, 1, 0)
+      .rotate(rotationX.getValuef() * crazy_factor, 0, 0, 1)
+        .rotate(rotationY.getValuef() * crazy_factor, 0, 1, 0)
+          .translate(0, up_down_range * yPos.getValuef(), 0);
 
-    projection.reset(model)
-      // Swim around the world
-      .rotate(rotation.getValuef(), xAngle.getValuef() / denominator, yAngle.getValuef() / denominator, zAngle.getValuef() / denominator)
-        .translateCenter(model, 0, 50 + yPos.getValuef(), 0);
 
     float model_height =  model.yMax - model.yMin;
     float model_width =  model.xMax - model.xMin;
-    for (Coord p : projection) {
+    for (LXVector p : projection) {
       float x_percentage = (p.x - model.xMin)/model_width;
 
-      // Multiply by 1.4 to shrink the size of the sin wave to be less than the height of the cubes.
-      float y_in_range = 1.4 * (2*p.y - model.yMax - model.yMin) / model_height;
+      // Multiply by sineHeight to shrink the size of the sin wave to be less than the height of the cubes.
+      float y_in_range = sineHeight.getValuef() * (2*p.y - model.yMax - model.yMin) / model_height;
       float sin_x =  sin(phase + 2 * PI * x_percentage);       
 
-      // Color fade near the top of the sin wave
-      float v1 = sin_x > y_in_range  ? (100 + 100*(y_in_range - sin_x)) : 0;     
+      float size_of_sin_wave = 0.4;
+      
+      float v1 = (abs(y_in_range - sin_x) > size_of_sin_wave) ? 0 : abs((y_in_range - sin_x + size_of_sin_wave) / size_of_sin_wave / 2 * 100);
+
 
       float hue_color = (lx.getBaseHuef() + hueScale.getValuef() * (abs(p.x-model.xMax/2.)*.3 + abs(p.y-model.yMax/2)*.9 + abs(p.z - model.zMax/2.))) % 360;
-      colors[p.index] = color(hue_color, 70, v1);
+      colors[p.index] = lx.hsb(hue_color, 100, v1);
     }
   }
 }
@@ -73,9 +82,9 @@ class Swim extends SCPattern {
  * The idea here is to do another sin wave pattern, but with less rotation and more of a breathing / heartbeat affect with spheres above / below the wave.
  * This is not done.
  */
-class Breathe extends SCPattern {
+class Balance extends SCPattern {
 
-  final BasicParameter hueScale = new BasicParameter("HUE", 0.3);
+  final BasicParameter hueScale = new BasicParameter("Hue", 0.4);
 
   class Sphere {
     float x, y, z;
@@ -83,24 +92,30 @@ class Breathe extends SCPattern {
 
 
   // Projection stuff
-  private final Projection projection;
+  private final LXProjection projection;
 
-  SinLFO sphere1Z = new SinLFO(0, 80, 15323);
-  SinLFO sphere2Z = new SinLFO(-80, 0, 8323);
-  SawLFO rotation = new SawLFO(- PI / 16, PI / 16, 7334);
+  SinLFO sphere1Z = new SinLFO(0, 0, 15323);
+  SinLFO sphere2Z = new SinLFO(0, 0, 8323);
+  SinLFO rotationX = new SinLFO(-PI/32, PI/32, 9000);
+  SinLFO rotationY = new SinLFO(-PI/16, PI/16, 7000);
+  SinLFO rotationZ = new SinLFO(-PI/16, PI/16, 11000);
+  SawLFO phaseLFO = new SawLFO(0, 2 * PI, 5000 - 4500 * 0.5);
+  final BasicParameter phaseParam = new BasicParameter("Spd", 0.5);
+  final BasicParameter crazyParam = new BasicParameter("Crzy", 0.2);
 
 
   private final Sphere[] spheres;
   private final float centerX, centerY, centerZ, modelHeight, modelWidth, modelDepth;
-  SinLFO heightMod = new SinLFO(0.6, 1.85, 17298);
+  SinLFO heightMod = new SinLFO(0.8, 1.9, 17298);
 
-  public Breathe(GLucose glucose) {
-    super(glucose);
+  public Balance(LX lx) {
+    super(lx);
 
-    // Unused for now
-    projection = new Projection(model);
+    projection = new LXProjection(model);
 
     addParameter(hueScale);
+    addParameter(phaseParam);
+    addParameter(crazyParam);
 
     spheres = new Sphere[2];
     centerX = (model.xMax + model.xMin) / 2;
@@ -111,25 +126,36 @@ class Breathe extends SCPattern {
     modelDepth = model.zMax - model.zMin;
 
     spheres[0] = new Sphere();
-    spheres[0].x = 3*modelWidth/8;
-    spheres[0].y = centerY + 10;
+    spheres[0].x = 1*modelWidth/2 + model.xMin;
+    spheres[0].y = centerY + 20;
     spheres[0].z = centerZ;
 
     spheres[1] = new Sphere();
-    spheres[1].x = 7*modelWidth/8;
+    spheres[1].x = model.xMin;
     spheres[1].y = centerY - 20;
     spheres[1].z = centerZ;
 
+    addModulator(rotationX).trigger();
+    addModulator(rotationY).trigger();
+    addModulator(rotationZ).trigger();
+
 
     addModulator(sphere1Z).trigger();
     addModulator(sphere2Z).trigger();
+    addModulator(phaseLFO).trigger();
 
     addModulator(heightMod).trigger();
   }
 
+  public void onParameterChanged(LXParameter parameter) {
+    if (parameter == phaseParam) {
+      phaseLFO.setDuration(5000 - 4500 * parameter.getValuef());
+    }
+  }
+
   int beat = 0;
   float prevRamp = 0;
-  void run(int deltaMs) {
+  void run(double deltaMs) {
 
     // Sync to the beat
     float ramp = (float)lx.tempo.ramp();
@@ -137,48 +163,52 @@ class Breathe extends SCPattern {
       beat = (beat + 1) % 4;
     }
     prevRamp = ramp;
-    float phase = (beat+ramp) * PI % (2 * PI);
+    float phase = phaseLFO.getValuef();
 
-    projection.reset(model)
-      .rotate(rotation.getValuef(), 0, 1, 0);
+    float crazy_factor = crazyParam.getValuef() / 0.2;
+    projection.reset()
+      .rotate(rotationZ.getValuef() * crazy_factor,  0, 1, 0)
+        .rotate(rotationX.getValuef() * crazy_factor, 0, 0, 1)
+          .rotate(rotationY.getValuef() * crazy_factor, 0, 1, 0);
 
-    for (Coord p : projection) {
+    for (LXVector p : projection) {
       float x_percentage = (p.x - model.xMin)/modelWidth;
 
       float y_in_range = heightMod.getValuef() * (2*p.y - model.yMax - model.yMin) / modelHeight;
       float sin_x =  sin(PI / 2 + phase + 2 * PI * x_percentage);       
 
       // Color fade near the top of the sin wave
-      float v1 = sin_x > y_in_range  ? (100 + 100*(y_in_range - sin_x)) : 0;     
+      float v1 = max(0, 100 * (1 - 4*abs(sin_x - y_in_range)));     
 
-      float hue_color = (lx.getBaseHuef() + hueScale.getValuef() * (abs(p.x-model.xMax/2.)*.6 + abs(p.y-model.yMax/2)*.9 + abs(p.z - model.zMax/2.))) % 360;
-      color c = color(hue_color, 60, v1);
+      float hue_color = (lx.getBaseHuef() + hueScale.getValuef() * (abs(p.x-model.xMax/2.) + abs(p.y-model.yMax/2)*.2 + abs(p.z - model.zMax/2.)*.5)) % 360;
+      color c = lx.hsb(hue_color, 80, v1);
 
       // Now draw the spheres
       for (Sphere s : spheres) {
-        float phase_x = (s.x - phase * modelWidth / ( 2 * PI)) % modelWidth;        
+        float phase_x = (s.x - phase / (2 * PI) * modelWidth) % modelWidth;    
         float x_dist = LXUtils.wrapdistf(p.x, phase_x, modelWidth);
 
         float sphere_z = (s == spheres[0]) ? (s.z + sphere1Z.getValuef()) : (s.z - sphere2Z.getValuef()); 
 
+
         float d = sqrt(pow(x_dist, 2) + pow(p.y - s.y, 2) + pow(p.z - sphere_z, 2));
-        float r = 25;
+
+        float distance_from_beat =  (beat % 2 == 1) ? 1 - ramp : ramp;
+
+        min(ramp, 1-ramp);
+
+        float r = 40 - pow(distance_from_beat, 0.75) * 20;
 
         float distance_value = max(0, 1 - max(0, d - r) / 10);
         float beat_value = 1.0;
-        if (s == spheres[0]) {
-          //          beat_value = .2 + ((beat % 4 >= 2) ? ((4 - (ramp + beat)) / 2) *.8 : 0);
-        } 
-        else {
-          //          beat_value = .2 + ((beat % 4 < 2) ? ((2 - (ramp + beat)) / 2) *.8 : 0);
-        } 
 
         float value = min(beat_value, distance_value);
 
-        c = blendColor(c, color((hue_color + 180) % 360, 100, min(1, value) * 100), ADD);
+        float sphere_color = (lx.getBaseHuef() - (1 - hueScale.getValuef()) * d/r * 45) % 360;
+
+        c = blendColor(c, lx.hsb((sphere_color + 270) % 360, 60, min(1, value) * 100), ADD);
       }
       colors[p.index] = c;
     }
   }
 }
-