sinesphere working with notes

[SugarCubes.git] / TimBavaro.pde

diff --git a/TimBavaro.pde b/TimBavaro.pde
index 4da4b6e9b114a7e9be93ccc8f8faf1ed4beb3bc0..a10e89ee01560db6104280148ac11a661bdc3250 100644 (file)
--- a/TimBavaro.pde
+++ b/TimBavaro.pde
@@ -56,13 +56,13 @@ class TimSpheres extends SCPattern {
     for (Point p : model.points) {
       float value = 0;
 
-      color c = color(0, 0, 0);      
+      color c = lx.hsb(0, 0, 0);      
       for (Sphere s : spheres) {
         float d = sqrt(pow(p.x - s.x, 2) + pow(p.y - s.y, 2) + pow(p.z - s.z, 2));
         float r = (s.radius); // * (sinLfoValue + 0.5));
         value = max(0, 1 - max(0, d - r) / 10);
         
-        c = blendColor(c, color(((s.hue + lfoValue) % 1) * 360, 100, min(1, value) * 100), ADD);
+        c = blendColor(c, lx.hsb(((s.hue + lfoValue) % 1) * 360, 100, min(1, value) * 100), ADD);
       }
       
       colors[p.index] = c;
@@ -125,7 +125,7 @@ class Vector3 {
   }
   
   float distanceTo(Point p) {
-    return distanceTo(p.fx, p.fy, p.fz);
+    return distanceTo(p.x, p.y, p.z);
   }
   
   void add(Vector3 other, float multiplier) {
@@ -249,16 +249,16 @@ class TimRaindrops extends SCPattern {
     for (Point p : model.points) {
       color c = 
         blendColor(
-          color(210, 20, (float)Math.max(0, 1 - Math.pow((model.yMax - p.fy) / 10, 2)) * 50),
-          color(220, 60, (float)Math.max(0, 1 - Math.pow((p.fy - model.yMin) / 10, 2)) * 100),
+          lx.hsb(210, 20, (float)Math.max(0, 1 - Math.pow((model.yMax - p.y) / 10, 2)) * 50),
+          lx.hsb(220, 60, (float)Math.max(0, 1 - Math.pow((p.y - model.yMin) / 10, 2)) * 100),
           ADD);
       for (Raindrop raindrop : raindrops) {
-        if (p.fx >= (raindrop.p.x - raindrop.radius) && p.fx <= (raindrop.p.x + raindrop.radius) &&
-            p.fy >= (raindrop.p.y - raindrop.radius) && p.fy <= (raindrop.p.y + raindrop.radius)) {
+        if (p.x >= (raindrop.p.x - raindrop.radius) && p.x <= (raindrop.p.x + raindrop.radius) &&
+            p.y >= (raindrop.p.y - raindrop.radius) && p.y <= (raindrop.p.y + raindrop.radius)) {
           float d = raindrop.p.distanceTo(p) / raindrop.radius;
   //      float value = (float)Math.max(0, 1 - Math.pow(Math.min(0, d - raindrop.radius) / 5, 2)); 
           if (d < 1) {
-            c = blendColor(c, color(raindrop.hue, 80, (float)Math.pow(1 - d, 0.01) * 100), ADD);
+            c = blendColor(c, lx.hsb(raindrop.hue, 80, (float)Math.pow(1 - d, 0.01) * 100), ADD);
           }
         }
       }
@@ -343,7 +343,7 @@ class TimCubes extends SCPattern {
     
     for (CubeFlash flash : flashes) {
       float hue = (hueParameter.getValuef() + (hueVarianceParameter.getValuef() * flash.hue)) % 1.0;
-      color c = color(hue * 360, saturationParameter.getValuef() * 100, (flash.value) * 100);
+      color c = lx.hsb(hue * 360, saturationParameter.getValuef() * 100, (flash.value) * 100);
       for (Point p : flash.c.points) {
         colors[p.index] = c;
       }
@@ -464,19 +464,19 @@ class TimPlanes extends SCPattern {
       color c = 0;
       
       for (Plane plane : planes) {
-        normalizedPoint.x = p.fx - plane.center.x;
-        normalizedPoint.y = p.fy - plane.center.y;
-        normalizedPoint.z = p.fz - plane.center.z;
+        normalizedPoint.x = p.x - plane.center.x;
+        normalizedPoint.y = p.y - plane.center.y;
+        normalizedPoint.z = p.z - plane.center.z;
         
         float v = plane.rotation.rotatedY(normalizedPoint);
         float d = abs(v);
         
         final color planeColor;
         if (d <= thickness) {
-          planeColor = color(plane.hue, saturation, 100);
+          planeColor = lx.hsb(plane.hue, saturation, 100);
         } else if (d <= thickness * 2) {    
           float value = 1 - ((d - thickness) / thickness);
-          planeColor = color(plane.hue, saturation, value * 100);
+          planeColor = lx.hsb(plane.hue, saturation, value * 100);
         } else {
           planeColor = 0;
         }
@@ -636,20 +636,20 @@ class TimPinwheels extends SCPattern {
       
       int value = 0;
       for (Pinwheel pw : pinwheels) {
-        value += (pw.isOnBlade(p.fx, p.fy - p.fz * zSlope) ? 1 : 0);
+        value += (pw.isOnBlade(p.x, p.y - p.z * zSlope) ? 1 : 0);
       }
       if (value == 1) {
         values[i] = 1;
-//        colors[p.index] = color(120, 0, 100);
+//        colors[p.index] = lx.hsb(120, 0, 100);
       } else {
         values[i] = max(0, values[i] - fadeAmount);
         //color c = colors[p.index];
-        //colors[p.index] = color(max(0, hue(c) - 10), min(100, saturation(c) + 10), brightness(c) - 5 );
+        //colors[p.index] = lx.hsb(max(0, lx.h(c) - 10), min(100, lx.s(c) + 10), lx.b(c) - 5 );
       }
       
       if (random(1.0) >= derez) {
         float v = values[i];
-        colors[p.index] = color((360 + hue + pow(v, 2) * hueSpread) % 360, 30 + pow(1 - v, 0.25) * 60, v * 100);
+        colors[p.index] = lx.hsb((360 + hue + pow(v, 2) * hueSpread) % 360, 30 + pow(1 - v, 0.25) * 60, v * 100);
       }      
     }
   }
@@ -746,7 +746,7 @@ class TimTrace extends SCPattern {
     for (Strip s : model.strips) {
       Vector3 v = new Vector3();
       for (Point p : s.points) {
-        v.add(p.fx, p.fy, p.fz);
+        v.add(p.x, p.y, p.z);
       }
       v.divide(s.points.size());
       stripToCenter.put(s, v);
@@ -778,7 +778,7 @@ class TimTrace extends SCPattern {
       List<Strip> nearbyStrips = stripToNearbyStrips.get(s);
       
       for (Point p : s.points) {
-        Vector3 v = new Vector3(p.fx, p.fy, p.fz);
+        Vector3 v = new Vector3(p.x, p.y, p.z);
         
         List<Point> neighbors = new ArrayList();
         
@@ -787,7 +787,7 @@ class TimTrace extends SCPattern {
           float closestPointDistance = 100000;
           
           for (Point nsp : nearbyStrip.points) {
-            float distance = v.distanceTo(nsp.fx, nsp.fy, nsp.fz);
+            float distance = v.distanceTo(nsp.x, nsp.y, nsp.z);
             if (closestPoint == null || distance < closestPointDistance) {
               closestPoint = nsp;
               closestPointDistance = distance;
@@ -819,12 +819,12 @@ class TimTrace extends SCPattern {
   public void run(double deltaMs) {
     for (Point p : model.points) {
       color c = colors[p.index];
-      colors[p.index] = color(hue(c), saturation(c), brightness(c) - 3);
+      colors[p.index] = lx.hsb(lx.h(c), lx.s(c), lx.b(c) - 3);
     }
     
     for (MovingPoint mp : movingPoints) {
       mp.step();
-      colors[mp.currentPoint.index] = blendColor(colors[mp.currentPoint.index], color(mp.hue, 10, 100), ADD);
+      colors[mp.currentPoint.index] = blendColor(colors[mp.currentPoint.index], lx.hsb(mp.hue, 10, 100), ADD);
     }
   }
 }