X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=JR.pde;h=ba9498b57598321b9a4f3ddb843b4cf420228ca6;hb=8f4e6c99775f2724edf3cec488860eb68b06491c;hp=ec0923f5c86f433502a1a3685250d27a51d531c0;hpb=d33c2d1d64234dd5f54942a9b76afaec3833c206;p=SugarCubes.git

diff --git a/JR.pde b/JR.pde
old mode 100755
new mode 100644
index ec0923f..ba9498b
--- a/JR.pde
+++ b/JR.pde
@@ -1,4 +1,4 @@
-color BLACK = color(0, 0, 0);
+color BLACK = #000000;
 
 class Gimbal extends SCPattern {
 
@@ -6,7 +6,7 @@ class Gimbal extends SCPattern {
   private final int MAXIMUM_BEATS_PER_REVOLUTION = 100;
   
   private boolean first_run = true;
-  private final Projection projection;
+  private final LXProjection projection;
   private final BasicParameter beatsPerRevolutionParam = new BasicParameter("SLOW", 20./MAXIMUM_BEATS_PER_REVOLUTION);
   private final BasicParameter hueDeltaParam = new BasicParameter("HUED", 60./360);
   private final BasicParameter fadeFromCoreParam = new BasicParameter("FADE", 1);
@@ -21,7 +21,7 @@ class Gimbal extends SCPattern {
 
   Gimbal(GLucose glucose) {
     super(glucose);
-    projection = new Projection(model);
+    projection = new LXProjection(model);
     addParameter(beatsPerRevolutionParam);
     addParameter(hueDeltaParam);
     addParameter(fadeFromCoreParam);
@@ -39,7 +39,7 @@ class Gimbal extends SCPattern {
 
   float a = 0, b = 0, g = 0;
 
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
 
     if (DEBUG_MANUAL_ABG) {
       a = aP.getValuef() * (2 * PI); 
@@ -75,11 +75,11 @@ class Gimbal extends SCPattern {
     Ring ring2 = new Ring((hue + hue_delta * 1) % 360, radius2, girth);
     Ring ring3 = new Ring((hue + hue_delta * 2) % 360, radius3, girth);
 
-    projection.reset(model)
+    projection.reset()
       // Translate so the center of the car is the origin
-      .translateCenter(model, 0, 0, 0);
+      .center();
 
-    for (Coord c : projection) {
+    for (LXVector c : projection) {
       //if (first_run) println(c.x + "," + c.y + "," + c.z);
 
       rotate3d(c, a, 0, 0);
@@ -109,7 +109,7 @@ class Gimbal extends SCPattern {
       this.girth = girth;
     }
 
-    public color colorFor(Coord c) {
+    public color colorFor(LXVector c) {
       float theta = atan2(c.y, c.x);
       float nearest_circle_x = cos(theta) * radius;
       float nearest_circle_y = sin(theta) * radius;
@@ -121,7 +121,7 @@ class Gimbal extends SCPattern {
                + pow(nearest_circle_z - c.z * ringExtendParam.getValuef(), 2));
 
       float xy_distance = sqrt(c.x*c.x + c.y*c.y);
-      return color(this.hue, 100, (1 - distance_to_circle / girth * fadeFromCoreParam.getValuef()) * 100);
+      return lx.hsb(this.hue, 100, (1 - distance_to_circle / girth * fadeFromCoreParam.getValuef()) * 100);
     }
 
   }
@@ -135,7 +135,7 @@ class Gimbal extends SCPattern {
 
 class Zebra extends SCPattern {
 
-  private final Projection projection;
+  private final LXProjection projection;
   SinLFO angleM = new SinLFO(0, PI * 2, 30000);
 
 /*
@@ -146,12 +146,12 @@ class Zebra extends SCPattern {
 
   Zebra(GLucose glucose) {
     super(glucose);
-    projection = new Projection(model);
+    projection = new LXProjection(model);
 
     addModulator(angleM).trigger();
   }
 
-  color colorFor(Coord c) {
+  color colorFor(LXVector c) {
     float hue = lx.getBaseHuef();
 
 
@@ -166,18 +166,18 @@ class Zebra extends SCPattern {
     int stripe_count = 12;
     float stripe_width = model.xMax / (float)stripe_count;
     if (Math.floor((c.x) / stripe_width) % 2 == 0) {
-      return color(hue, 100, 100);
+      return lx.hsb(hue, 100, 100);
     } else {
-      return color((hue + 90) % 360, 100, 100);
+      return lx.hsb((hue + 90) % 360, 100, 100);
     }
 
 
     /* OCTANTS
 
     if ((isPositiveBit(c.x) + isPositiveBit(c.y) + isPositiveBit(c.z)) % 2 == 0) {
-      return color(lx.getBaseHuef(), 100, 100);
+      return lx.hsb(lx.getBaseHuef(), 100, 100);
     } else {
-      return color(0, 0, 0);
+      return lx.hsb(0, 0, 0);
     }
     */
   }
@@ -186,16 +186,16 @@ class Zebra extends SCPattern {
     return f > 0 ? 1 : 0;
   }
 
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     float a = (millis() / 1000.f) % (2 * PI);
     float b = (millis() / 1200.f) % (2 * PI);
     float g = (millis() / 1600.f) % (2 * PI);
 
-    projection.reset(model)
+    projection.reset()
       // Translate so the center of the car is the origin
-      .translateCenter(model, 0, 0, 0);
+      .center();
 
-    for (Coord c : projection) {
+    for (LXVector c : projection) {
 //      rotate3d(c, a, b, g);
       colors[c.index] = colorFor(c);
     }
@@ -215,7 +215,7 @@ class Zebra extends SCPattern {
 
 }
 
-void rotate3d(Coord c, float a /* roll */, float b /* pitch */, float g /* yaw */) {
+void rotate3d(LXVector c, float a /* roll */, float b /* pitch */, float g /* yaw */) {
   float cosa = cos(a);
   float cosb = cos(b);
   float cosg = cos(g);
@@ -271,7 +271,7 @@ color specialBlend(color c1, color c2, color c3) {
   float relative_b2 = b2 / (b1 + b2 + b3);
   float relative_b3 = b3 / (b1 + b2 + b3);
   
-  return color(
+  return lx.hsb(
     (h1 * relative_b1 + h2 * relative_b1 + h3 * relative_b3) % 360,
      s1 * relative_b1 + s2 * relative_b2 + s3 * relative_b3,
      max(max(b1, b2), b3)