X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=JR.pde;h=6692baaef5541e48215507a4fddbd3ef1b3080d3;hb=1c44211b1a15965afee7056a2f1d43a1306df61b;hp=ec0923f5c86f433502a1a3685250d27a51d531c0;hpb=e28f168cec8ae5a8c25cae159af94f5b0aa7b342;p=SugarCubes.git

diff --git a/JR.pde b/JR.pde
old mode 100755
new mode 100644
index ec0923f..6692baa
--- a/JR.pde
+++ b/JR.pde
@@ -1,4 +1,4 @@
-color BLACK = color(0, 0, 0);
+color BLACK = #000000;
 
 class Gimbal extends SCPattern {
 
@@ -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); 
@@ -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);
     }
 
   }
@@ -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,7 +186,7 @@ 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);
@@ -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)