Apat and added acos to spherycolor, not included in color yet but working

[SugarCubes.git] / TobySegaran.pde

diff --git a/TobySegaran.pde b/TobySegaran.pde
index 05231294dda9040f2d9cff6225679518f80e4e27..8aaacb175ef7e7e67e0eb9ba0dd285ac3f14a28d 100644 (file)
--- a/TobySegaran.pde
+++ b/TobySegaran.pde
@@ -24,13 +24,13 @@ class GlitchPlasma extends SCPattern {
   }
 
   public void run(double deltaMs) {
-    for (Point p : model.points) {
+    for (LXPoint p : model.points) {
       float hv = sin(dist(p.x + pos, p.y, 128.0, 128.0) / 8.0)
          + sin(dist(p.x, p.y, 64.0, 64.0) / 8.0)
          + sin(dist(p.x, p.y + pos / 7, 192.0, 64.0) / 7.0)
          + sin(dist(p.x, p.z + pos, 192.0, 100.0) / 8.0);
       float bv = 100;
-      colors[p.index] = color((hv+2)*50, satu, bv);
+      colors[p.index] = lx.hsb((hv+2)*50, satu, bv);
     }
     if (random(1.0)<glitch/20) {
       pos=pos-int(random(10,30));
@@ -63,9 +63,9 @@ class FireEffect extends SCPattern {
     }
   } 
   private color flameColor(float level) {
-    if (level<=0) return color(0,0,0);
+    if (level<=0) return lx.hsb(0,0,0);
     float br=min(100,sqrt(level)*15);
-    return color(level/1.7,100,br);
+    return lx.hsb(level/1.7,100,br);
   }
   public void run(double deltaMs) {
     for (int x=10;x<xm-10;x++) {
@@ -81,7 +81,7 @@ class FireEffect extends SCPattern {
       }
     }
     
-    for (Point p : model.points) {
+    for (LXPoint p : model.points) {
       int x = max(0,(int(p.x)+int(p.z))%xm);
       int y = constrain(ym-int(p.y),0,ym-1);
       colors[p.index] = flameColor(intensity[x][y]);
@@ -120,9 +120,9 @@ class StripBounce extends SCPattern {
         boolean on = avgdist<30;
         float hv = (lx.getBaseHuef()+colorOffset[i])%360;
         float br = max(0,100-avgdist*4);
-        for (Point p : strip.points) {
+        for (LXPoint p : strip.points) {
           if (on && br>bright[p.index]) {
-            colors[p.index] = color(hv,sat[i].getValuef(),br);
+            colors[p.index] = lx.hsb(hv,sat[i].getValuef(),br);
             bright[p.index] = br;
           }
         }
@@ -184,10 +184,10 @@ class SoundRain extends SCPattern {
       for (int j=0; j<c.strips.size(); j++) {
         Strip s = c.strips.get(j);
         if (j%4!=0 && j%4!=2) {
-          for (Point p : s.points) {
+          for (LXPoint p : s.points) {
             int seq = int(p.y*avgSize/model.yMax+pos.getValuef()+sin(p.x+p.z)*2)%avgSize;
             seq=min(abs(seq-(avgSize/2)),avgSize-1);
-            colors[p.index] = color(200,max(0,100-abs(p.x-col1.getValuef())/2),lightVals[seq]);
+            colors[p.index] = lx.hsb(200,max(0,100-abs(p.x-col1.getValuef())/2),lightVals[seq]);
           }
         }
       }
@@ -215,7 +215,7 @@ class FaceSync extends SCPattern {
     int i=0;
     for (Strip s : model.strips) {
       i++;
-      for (Point p : s.points) {
+      for (LXPoint p : s.points) {
         float dx, dz;
         if (i%32 < 16) {
           dx = p.x - (s.cx+xosc.getValuef());
@@ -229,7 +229,7 @@ class FaceSync extends SCPattern {
         float a2=max(0,100-abs(p.x-col2.getValuef()));        
         float sat = max(a1,a2);
         float h = (359*a1+200*a2) / (a1+a2);
-        colors[p.index] = color(h,sat,100-abs(dx*5)-abs(dz*5));
+        colors[p.index] = lx.hsb(h,sat,100-abs(dx*5)-abs(dz*5));
       }
     }
   }
@@ -286,13 +286,13 @@ class SoundSpikes extends SCPattern {
       for (int j=0; j<c.strips.size(); j++) {
         Strip s = c.strips.get(j);
         if (j%4!=0 && j%4!=2) {
-          for (Point p : s.points) {
+          for (LXPoint p : s.points) {
             float dis = (abs(p.x-model.xMax/2)+pos.getValuef())%model.xMax/2;
             int seq = int((dis*avgSize*2)/model.xMax);
             if (seq>avgSize) seq=avgSize-seq;
             seq=constrain(seq,0,avgSize-1);
             float br=max(0, lightVals[seq]-p.y);
-            colors[p.index] = color((dis*avgSize*65)/model.xMax,90,br);
+            colors[p.index] = lx.hsb((dis*avgSize*65)/model.xMax,90,br);
           }
         }
       }