Change code to use new thread-safe lx color functions
authorMark Slee <mcslee@Mark-Slees-MacBook-Pro.local>
Mon, 14 Oct 2013 04:02:20 +0000 (21:02 -0700)
committerMark Slee <mcslee@Mark-Slees-MacBook-Pro.local>
Mon, 14 Oct 2013 04:02:20 +0000 (21:02 -0700)
17 files changed:
AlexGreen.pde [changed mode: 0755->0644]
ArjunBanker.pde
BenMorrow.pde
DanHorwitz.pde [changed mode: 0755->0644]
DanKaminsky.pde
DanUtil.pde
GranimPattern.pde
JR.pde
JackStahl.pde
MarkSlee.pde
SamMorrow.pde
ShaheenGandhi.pde
TimBavaro.pde
TobySegaran.pde
_Internals.pde
_UIFramework.pde
code/HeronLX.jar

old mode 100755 (executable)
new mode 100644 (file)
index 7403395..6ee9a39
@@ -72,14 +72,14 @@ float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, f
  color spheryvalue (float px, float py, float pz , float f1xc, float f1yc, float f1zc) 
  {
 //switch(sShpape.cur() ) {}  
-   return color(constrain(huespread.getValuef()*5*px, 0, 360) , dist(px, py, pz, f1xc, f1yc, f1zc) , 
+   return lx.hsb(constrain(huespread.getValuef()*5*px, 0, 360) , dist(px, py, pz, f1xc, f1yc, f1zc) , 
     max(0, 100 - 100*widthparameter.getValuef()*abs(dist(px, py, pz, f1xcenter, ybounce.getValuef(), f1zcenter)
       - vibration.getValuef() ) ) ); 
  }
  color ellipsevalue(float px, float py, float pz , float f1xc, float f1yc, float f1zc, float f2xc, float f2yc, float f2zc)
   {
 //switch(sShpape.cur() ) {}  
-   return color(huespread.getValuef()*5*px, dist(model.xMax-px, model.yMax-py, model.zMax-pz, f1xc, f1yc, f1zc) , 
+   return lx.hsb(huespread.getValuef()*5*px, dist(model.xMax-px, model.yMax-py, model.zMax-pz, f1xc, f1yc, f1zc) , 
     max(0, 100 - 100*widthparameter.getValuef() *
       abs( (dist(px, py, pz, f1xc, ybounce.getValuef(), f1zc) + 
         (dist(px, py , pz, f2xc, ybounce.getValuef(), f2zc) ) )/2  
@@ -159,10 +159,10 @@ final Sphery[] spherys;
       //   c = blendColor(c, spherys[3].ellipsevalue(Px.x, Px.y, Px.z, model.xMax/4, model.yMax/4, model.zMax/4, 3*model.xMax/4, 3*model.yMax/4, 3*model.zMax/4),ADD);
       //   return c; 
       // }
-      // return color(0,0,0);
+      // return lx.hsb(0,0,0);
       //  // else if(spheremode ==2)
        // { color c = 0;
-       //   return color(CalcCone( (xyz by = new xyz(0,spherys[2].ybounce.getValuef(),0) ), Px, mid) );
+       //   return lx.hsb(CalcCone( (xyz by = new xyz(0,spherys[2].ybounce.getValuef(),0) ), Px, mid) );
 
        // }
 
@@ -186,7 +186,7 @@ HueTestHSB(GLucose glucose) {
 
   for (Point p : model.points) {
     color c = 0;
-    c = blendColor(c, color(360*HueT.getValuef(), 100*SatT.getValuef(), 100*BriT.getValuef()), ADD);
+    c = blendColor(c, lx.hsb(360*HueT.getValuef(), 100*SatT.getValuef(), 100*BriT.getValuef()), ADD);
     colors[p.index]= c;
   }
    int now= millis();
@@ -196,4 +196,4 @@ HueTestHSB(GLucose glucose) {
    }
   }
 
- }
\ No newline at end of file
+ }
index 12ce5b6c8c48ab373618a370d533f8c60e72d81e..c8fe1a616b5c701d798231d13e4c9047b2836f11 100644 (file)
@@ -16,7 +16,7 @@ class TelevisionStatic extends SCPattern {
  void run(double deltaMs) {
     boolean d = direction.getValuef() > 5.0;
     for (Point p : model.points) {             
-      colors[p.index] = color((lx.getBaseHuef() + random(hueParameter.getValuef() * 360))%360, random(saturationParameter.getValuef() * 100), random(brightParameter.getValuef() * 100));
+      colors[p.index] = lx.hsb((lx.getBaseHuef() + random(hueParameter.getValuef() * 360))%360, random(saturationParameter.getValuef() * 100), random(brightParameter.getValuef() * 100));
     }
   }
 }
@@ -40,7 +40,7 @@ class AbstractPainting extends SCPattern {
   void run(double deltaMs) {    
     for (Point p : model.points) {
       color c = img.get((int)((p.x / model.xMax) * img.width), img.height - (int)((p.y / model.yMax) * img.height));
-      colors[p.index] = color(hue(c) + colorMod.getValuef()%360, saturation(c), brightness(c) - ((p.z - brightMod.getValuef())/p.z));
+      colors[p.index] = lx.hsb(hue(c) + colorMod.getValuef()%360, saturation(c), brightness(c) - ((p.z - brightMod.getValuef())/p.z));
     }    
   }       
 }
@@ -56,7 +56,7 @@ class Spirality extends SCPattern {
     super(glucose);   
     addParameter(r);
     for (Point p : model.points) {  
-      colors[p.index] = color(0, 0, 0);
+      colors[p.index] = lx.hsb(0, 0, 0);
     }
   }
     
@@ -70,12 +70,12 @@ class Spirality extends SCPattern {
       if (b < 90) {
         colors[p.index] = blendColor(
           colors[p.index],
-          color(lx.getBaseHuef() + 25, 10, map(b, 0, 10, 100, 0)),
+          lx.hsb(lx.getBaseHuef() + 25, 10, map(b, 0, 10, 100, 0)),
           ADD);        
         } else {
       colors[p.index] = blendColor(
         colors[p.index],
-        color(25, 10, map(b, 0, 10, 0, 15)),
+        lx.hsb(25, 10, map(b, 0, 10, 0, 15)),
         SUBTRACT); 
       }
     }
index 1eb8ae195e7244601ed00bc7c015551591c41d19..afd68072a47988a1aff6f7a2cdb3f5996b142b97 100644 (file)
@@ -64,7 +64,7 @@ class TowerParams extends SCPattern
                        {
                                if(p.y<towerParams.get(i).getValuef()*200)
                                {
-                                       colors[p.index]=color(255 * hueoff.getValuef()+colorSpan * hueSpan.getValuef() * i, 255, 255);
+                                       colors[p.index]=lx.hsb(255 * hueoff.getValuef()+colorSpan * hueSpan.getValuef() * i, 255, 255);
                                }
                        }
                }
@@ -108,7 +108,7 @@ class Sandbox extends SCPattern
                {
                        doDraw(c,0);
                        c = (c + 1) % towerrange;
-                       long col = color(Math.round(Math.random()*255),255,255) ;
+                       long col = lx.hsb(Math.round(Math.random()*255),255,255) ;
                        doDraw(c,col);
                }
                counter++;
old mode 100755 (executable)
new mode 100644 (file)
index d084609..ca829ee
-//----------------------------------------------------------------------------------------------------------------------------------\r
-public class Pong extends DPat {\r
-       SinLFO x,y,z,dx,dy,dz; \r
-       float cRad;     DParam pSize;\r
-       Pick    pChoose;\r
-       xyz     v = new xyz(), vMir =  new xyz();\r
-\r
-       Pong(GLucose glucose) {\r
-               super(glucose);\r
-               cRad = mMax.x/10;\r
-               addModulator(dx = new SinLFO(6000,  500, 30000  )).trigger();\r
-               addModulator(dy = new SinLFO(3000,  500, 22472  )).trigger();\r
-               addModulator(dz = new SinLFO(1000,  500, 18420  )).trigger();\r
-               addModulator(x  = new SinLFO(cRad, mMax.x - cRad, 0)).trigger();        x.modulateDurationBy(dx);\r
-               addModulator(y  = new SinLFO(cRad, mMax.y - cRad, 0)).trigger();        y.modulateDurationBy(dy);\r
-               addModulator(z  = new SinLFO(cRad, mMax.z - cRad, 0)).trigger();        z.modulateDurationBy(dz);\r
-           pSize       = addParam      ("Size"                 , 0.4   );\r
-           pChoose = addPick   ("Animiation"   , 0, 2, new String[] {"Pong", "Ball", "Cone"}   );\r
-       }\r
-\r
-       void    StartRun(double deltaMs)        { cRad = mMax.x*pSize.Val()/6; }\r
-       color   CalcPoint(xyz p)                {\r
-               v.set(x.getValuef(), y.getValuef(), z.getValuef());\r
-               v.z=0;p.z=0;// ignore z dimension\r
-               switch(pChoose.Cur()) {\r
-               case 0: vMir.set(mMax); vMir.subtract(p);\r
-                               return color(0,0,c1c(1 - min(v.distance(p), v.distance(vMir))*.5/cRad));        // balls\r
-               case 1: return color(0,0,c1c(1 - v.distance(p)*.5/cRad));                                                       // ball\r
-               case 2: vMir.set(mMax.x/2,0,mMax.z/2);\r
-                               return color(0,0,c1c(1 - CalcCone(p,v,vMir) * max(.02,.45-pSize.Val())));       // spot\r
-               }\r
-               return color(0,0,0);\r
-       }\r
-}\r
-//----------------------------------------------------------------------------------------------------------------------------------\r
-public class NDat {\r
-       float   xz, yz, zz, hue, sat, speed, angle, den;\r
-       float   xoff,yoff,zoff;\r
-       float   sinAngle, cosAngle;\r
-       boolean isActive;\r
-       NDat              () { isActive=false; }\r
-       boolean Active() { return isActive; }\r
-       void    set     (float _hue, float _sat, float _xz, float _yz, float _zz, float _den, float _speed, float _angle) {\r
-               isActive = true;\r
-               hue=_hue; sat=_sat; xz=_xz; yz=_yz; zz =_zz; den=_den; speed=_speed; angle=_angle;\r
-               xoff = random(100e3); yoff = random(100e3); zoff = random(100e3);\r
-       }\r
-}\r
-\r
-public class Noise extends DPat\r
-{\r
-       int                     CurAnim, iSymm;\r
-       int             XSym=1,YSym=2,RadSym=3;\r
-       float           zTime , zTheta=0, zSin, zCos, rtime, ttime, transAdd;\r
-       DParam          pSpeed , pDensity;\r
-       Pick            pChoose, pSymm;\r
-       int                     _ND = 4;\r
-       NDat            N[] = new NDat[_ND];\r
-\r
-       Noise(GLucose glucose) {\r
-               super(glucose);\r
-               pSpeed          = addParam("Fast"       , .55);\r
-               pDensity        = addParam("Dens"        , .5);\r
-               pSymm           = addPick("Symmetry" , 0, 3, new String[] {"None", "X", "Y", "Radial"}  );\r
-               pChoose         = addPick("Animation", 6, 7, new String[] {"Drip", "Cloud", "Rain", "Fire", "Machine", "Spark","VWave", "Wave"} );\r
-               for (int i=0; i<_ND; i++) N[i] = new NDat();\r
-       }\r
-\r
-       void StartPattern() { zTime = random(500); zTheta=0; rtime = 0; ttime = 0; transAdd=0; }\r
-       void StartRun(double deltaMs) {\r
-               zTime   += deltaMs*(pSpeed.Val()-.5)*.002       ;\r
-               zTheta  += deltaMs*(pSpin .Val()-.5)*.01        ;\r
-               rtime   += deltaMs;\r
-               iSymm    = pSymm.Cur();\r
-               transAdd = 1*(1 - constrain(rtime - ttime,0,1000)/1000);\r
-               zSin    = sin(zTheta);\r
-               zCos    = cos(zTheta);\r
-\r
-               if (pChoose.Cur() != CurAnim) {\r
-                       CurAnim = pChoose.Cur(); ttime = rtime;\r
-                       pSpin           .reset();       zTheta          = 0;\r
-                       pDensity        .reset();       pSpeed          .reset();\r
-                       for (int i=0; i<_ND; i++) { N[i].isActive = false; }\r
-                       \r
-                       switch(CurAnim) {\r
-                       //                          hue sat xz  yz  zz  den mph angle\r
-                       case 0: N[0].set(0  ,0  ,75 ,75 ,150,45 ,3  ,0  ); pSharp.set(1 ); break;       // drip\r
-                       case 1: N[0].set(0  ,0  ,100,100,200,45 ,3  ,180); pSharp.set(0 ); break;       // clouds\r
-                       case 2: N[0].set(0  ,0  ,2  ,400,2  ,20 ,3  ,0  ); pSharp.set(.5); break;       // rain\r
-                       case 3: N[0].set(40 ,1  ,100,100,200,10 ,1  ,180); \r
-                                       N[1].set(0  ,1  ,100,100,200,10 ,5  ,180); pSharp.set(0 ); break;       // fire 1\r
-                       case 4: N[0].set(0  ,1  ,40 ,40 ,40 ,15 ,2.5,180);\r
-                                       N[1].set(20 ,1  ,40 ,40 ,40 ,15 ,4  ,0  );\r
-                                       N[2].set(40 ,1  ,40 ,40 ,40 ,15 ,2  ,90 );\r
-                                       N[3].set(60 ,1  ,40 ,40 ,40 ,15 ,3  ,-90); pSharp.set(.5); break; // machine\r
-                       case 5: N[0].set(0  ,1  ,400,100,2  ,15 ,3  ,90 );\r
-                                       N[1].set(20 ,1  ,400,100,2  ,15 ,2.5,0  );\r
-                                       N[2].set(40 ,1  ,100,100,2  ,15 ,2  ,180);\r
-                                       N[3].set(60 ,1  ,100,100,2  ,15 ,1.5,270); pSharp.set(.5); break; // spark\r
-                       }\r
-\r
-                       DG.UpdateLights();\r
-               }\r
-               \r
-               for (int i=0; i<_ND; i++) if (N[i].Active()) {\r
-                       N[i].sinAngle = sin(radians(N[i].angle));\r
-                       N[i].cosAngle = cos(radians(N[i].angle));\r
-               }\r
-       }\r
-\r
-       color CalcPoint(xyz P) {\r
-               color c = 0;\r
-               P.RotateZ(mCtr, zSin, zCos);\r
-               \r
-               if (CurAnim == 6 || CurAnim == 7) {\r
-                       P.setNorm();\r
-                       return color(0,0, 100 * (\r
-                                                       constrain(1-50*(1-pDensity.Val())*abs(P.y-sin(zTime*10  + P.x*(300))*.5 - .5),0,1) + \r
-                       (CurAnim == 7 ? constrain(1-50*(1-pDensity.Val())*abs(P.x-sin(zTime*10  + P.y*(300))*.5 - .5),0,1) : 0))\r
-                       );\r
-               }                       \r
-                       \r
-               if (iSymm == XSym && P.x > mMax.x/2) P.x = mMax.x-P.x;\r
-               if (iSymm == YSym && P.y > mMax.y/2) P.y = mMax.y-P.y;\r
-\r
-               for (int i=0;i<_ND; i++) if (N[i].Active()) {\r
-                       NDat  n     = N[i];\r
-                       float zx    = zTime * n.speed * n.sinAngle,\r
-                                 zy    = zTime * n.speed * n.cosAngle;\r
-                       \r
-                       float b     = (iSymm==RadSym ? noise(zTime*n.speed+n.xoff-Dist(P,mCtr)/n.xz)\r
-                                                                                : noise(P.x/n.xz+zx+n.xoff,P.y/n.yz+zy+n.yoff,P.z/n.zz+n.zoff))\r
-                                                       *1.8;\r
-\r
-                       b +=    n.den/100 -.4 + pDensity.Val() -1;\r
-                       b +=    transAdd;\r
-                       c =     blendColor(c,color(n.hue,100*n.sat,c1c(b)),ADD);\r
-               }\r
-               return c;\r
-       }\r
-}\r
-//----------------------------------------------------------------------------------------------------------------------------------\r
-public class Play extends DPat\r
-{\r
-       public class rAngle {\r
-               float   prvA, dstA, c;\r
-               float   prvR, dstR, r;          \r
-               float   _cos, _sin, x, y;\r
-               float   fixAngle        (float a, float b) { return a<b ?\r
-                                                                               (abs(a-b) > abs(a+2*PI-b) ? a : a+2*PI) :\r
-                                                                               (abs(a-b) > abs(a-2*PI-b) ? a : a-2*PI) ; }\r
-               float   getX(float r)   {       return mCtr.x + _cos*r; }\r
-               float   getY(float r)   {       return mCtr.y + _sin*r; }\r
-               void    move()                  {       c               = interp(t,prvA,dstA); \r
-                                                                       r               = interp(t,prvR,dstR);\r
-                                                                       _cos    = cos(c);       _sin    = sin(c);\r
-                                      x                = getX(r);      y               = getY(r);              }               \r
-               void    set()                   {       prvA    = dstA;         dstA    = random(2*PI);         prvA = fixAngle(prvA, dstA);\r
-                                                                       prvR    = dstR;         dstR    = random(mCtr.y);                                                                       }\r
-       }\r
-\r
-       int             nBeats  =       0;\r
-       DParam  pAmp, pRadius, pBounce;\r
-\r
-       float   t,amp,rad,bnc;\r
-       float   zTheta=0;\r
-       ArrayList<rWave> waves = new ArrayList<rWave>(10);\r
-\r
-       rAngle  a1 = new rAngle(), a2 = new rAngle(),\r
-                       a3 = new rAngle(), a4 = new rAngle();\r
-       xyz             cPrev   = new xyz(), cRand      = new xyz(),\r
-                       cMid    = new xyz(), V          = new xyz(),\r
-                       Theta   = new xyz(), TSin       = new xyz(),\r
-                       TCos    = new xyz(), cMidNorm = new xyz(),\r
-                       Pn              = new xyz();\r
-       float   LastBeat=3, LastMeasure=3;\r
-       int             CurRandTempo = 1, CurRandTPat = 1;\r
-\r
-       Pick    pTimePattern, pTempoMult, pShape;\r
-       int             RandCube;\r
-\r
-       Play(GLucose glucose) {\r
-               super(glucose);\r
-           pRadius             = addParam("Rad"        , .1    );\r
-               pBounce         = addParam("Bnc"        , .2    );\r
-           pAmp                = addParam("Amp"        , .2    );\r
-               pTempoMult      = addPick ("TMult"      , 0 , 5         , new String[] {"1x", "2x", "4x", "8x", "16x", "Rand"   }       );\r
-               pTimePattern= addPick ("TPat"   , 6 , 7         , new String[] {"Bounce", "Sin", "Roll", "Quant", "Accel", "Deccel", "Slide", "Rand"}   );\r
-               pShape          = addPick ("Shape"      , 3 , 15        , new String[] {"Line", "Tap", "V", "RandV",\r
-                                                                                                                                       "Pyramid", "Wings", "W2", "Clock",\r
-                                                                                                                                       "Triangle", "Quad", "Sphere", "Cone",\r
-                                                                                                                                       "Noise", "Wave", "?", "?"}                                              );\r
-       }\r
-\r
-       public class rWave {\r
-               float v0, a0, x0, t,damp,a;\r
-               boolean bDone=false;\r
-               final float len=8;\r
-               rWave(float _x0, float _a0, float _v0, float _damp) { x0=_x0*len; a0=_a0; v0=_v0; t=0; damp = _damp; }\r
-               void move(double deltaMs) {\r
-                       t += deltaMs*.001;\r
-                       if (t>4) bDone=true;\r
-               }\r
-               float val(float _x) {\r
-                       _x*=len;\r
-                       float dist = t*v0 - abs(_x-x0);\r
-                       if (dist<0) { a=1; return 0; }\r
-                       a  = a0*exp(-dist*damp) * exp(-abs(_x-x0)/(.2*len)); // * max(0,1-t/dur)\r
-                       return  -a*sin(dist);\r
-               }\r
-       }\r
-\r
-       void StartPattern() { zTheta=0; }\r
-       void StartRun(double deltaMs) {\r
-               t       = lx.tempo.rampf();\r
-               amp = pAmp.Val();\r
-               rad     = pRadius.getValuef();\r
-               bnc     = pBounce.getValuef();          \r
-               zTheta  += deltaMs*(pSpin .Val()-.5)*.01;\r
-\r
-               Theta   .set(pRotX.Val()*PI*2, pRotY.Val()*PI*2, pRotZ.Val()*PI*2 + zTheta);\r
-               TSin    .set(sin(Theta.x), sin(Theta.y), sin(Theta.z));\r
-               TCos    .set(cos(Theta.x), cos(Theta.y), cos(Theta.z));\r
-\r
-               if (t<LastMeasure) {\r
-                       if (random(3) < 1) { CurRandTempo = int(random(4)); if (CurRandTempo == 3) CurRandTempo = int(random(4));       }\r
-                       if (random(3) < 1) { CurRandTPat  = pShape.Cur() > 6 ? 2+int(random(5)) : int(random(7));                                       }\r
-               } LastMeasure = t;\r
-                       \r
-               int nTempo = pTempoMult  .Cur(); if (nTempo == 5) nTempo = CurRandTempo;\r
-               int nTPat  = pTimePattern.Cur(); if (nTPat  == 7) nTPat  = CurRandTPat ;\r
-\r
-               switch (nTempo) {\r
-                       case 0:         t = t;                                                          break;\r
-                       case 1:         t = (t*2. )%1.;                                         break;\r
-                       case 2:         t = (t*4. )%1.;                                         break;\r
-                       case 3:         t = (t*8. )%1.;                                         break;\r
-                       case 4:         t = (t*16.)%1.;                                         break;\r
-               }\r
-\r
-               int i=0; while (i< waves.size()) {\r
-                       rWave w = waves.get(i);\r
-                       w.move(deltaMs); if (w.bDone) waves.remove(i); else i++;\r
-               }\r
-\r
-               if ((t<LastBeat && !pKey.b) || DG.KeyPressed>-1) {\r
-                       waves.add(new rWave(\r
-                                               pKey.b ? map(DG.KeyPressed,0,7,0,1) : random(1),                // location\r
-                                               bnc*10,                 // bounciness\r
-                                               7,                              // velocity\r
-                                               2*(1-amp)));    // dampiness\r
-                       DG.KeyPressed=-1;\r
-                       if (waves.size() > 5) waves.remove(0);\r
-               }\r
-               \r
-               if (t<LastBeat) {\r
-                       cPrev.set(cRand); cRand.setRand();\r
-                       a1.set(); a2.set(); a3.set(); a4.set();\r
-               } LastBeat = t;\r
-\r
-               switch (nTPat) {\r
-                       case 0:         t = sin(PI*t);                                                  break;  // bounce\r
-                       case 1:         t = norm(sin(2*PI*(t+PI/2)),-1,1);              break;  // sin\r
-                       case 2:         t = t;                                                                  break;  // roll\r
-                       case 3:         t = constrain(int(t*8)/7.,0,1);                 break;  // quant\r
-                       case 4:         t = t*t*t;                                                              break;  // accel\r
-                       case 5:         t = sin(PI*t*.5);                                               break;  // deccel\r
-                       case 6:         t = .5*(1-cos(PI*t));                                   break;  // slide\r
-               }\r
-               \r
-               cMid.set                (cPrev);        cMid.interpolate        (t,cRand);\r
-               cMidNorm.set    (cMid);         cMidNorm.setNorm();\r
-               a1.move(); a2.move(); a3.move(); a4.move();\r
-       }\r
-\r
-       color CalcPoint(xyz Px) {\r
-               if (Theta.x != 0) Px.RotateX(mCtr, TSin.x, TCos.x);\r
-               if (Theta.y != 0) Px.RotateY(mCtr, TSin.y, TCos.y);\r
-               if (Theta.z != 0) Px.RotateZ(mCtr, TSin.z, TCos.z);\r
-               \r
-               Pn.set(Px); Pn.setNorm();\r
-\r
-               float mp        = min(Pn.x, Pn.z);\r
-               float yt        = map(t,0,1,.5-bnc/2,.5+bnc/2);\r
-               float r,d;\r
-\r
-               switch (pShape.Cur()) {\r
-               case 0:         V.set(Pn.x, yt                                                          , Pn.z);                                                        break;  // bouncing line\r
-               case 1:         V.set(Pn.x, map(cos(PI*t * Pn.x),-1,1,0,1)  , Pn.z);                                                    break;  // top tap\r
-               case 2:         V.set(Pn.x, bnc*map(Pn.x<.5?Pn.x:1-Pn.x,0,.5 ,0,t-.5)+.5, Pn.z);                                break;  // V shape\r
-               case 3:         V.set(Pn.x, Pn.x < cMidNorm.x ? map(Pn.x,0,cMidNorm.x, .5,yt) :\r
-                                                                                               map(Pn.x,cMidNorm.x,1, yt,.5), Pn.z);                           break;  //  Random V shape\r
-\r
-               case 4:         V.set(Pn.x,     .5*(Pn.x < cMidNorm.x ?         map(Pn.x,0,cMidNorm.x, .5,yt) :\r
-                                                                                                               map(Pn.x,cMidNorm.x,1, yt,.5)) +\r
-                                                       .5*(Pn.z < cMidNorm.z ?         map(Pn.z,0,cMidNorm.z, .5,yt) :\r
-                                                                                                               map(Pn.z,cMidNorm.z,1, yt,.5)), Pn.z);          break;  //  Random Pyramid shape\r
-                                                                                                       \r
-               case 5:         V.set(Pn.x, bnc*map((Pn.x-.5)*(Pn.x-.5),0,.25,0,t-.5)+.5, Pn.z);                                break;  // wings\r
-               case 6:         V.set(Pn.x, bnc*map((mp  -.5)*(mp  -.5),0,.25,0,t-.5)+.5, Pn.z);                                break;  // wings\r
-\r
-               case 7:         d = min(\r
-                                               distToSeg(Px.x, Px.y, a1.getX(70),a1.getY(70), mCtr.x, mCtr.y),\r
-                                               distToSeg(Px.x, Px.y, a2.getX(40),a2.getY(40), mCtr.x, mCtr.y));\r
-                                       d = constrain(30*(rad*40-d),0,100);\r
-                                       return color(0,max(0,150-d), d); // clock\r
-\r
-               case 8:         r = amp*200 * map(bnc,0,1,1,sin(PI*t));\r
-                                       d = min(\r
-                                               distToSeg(Px.x, Px.y, a1.getX(r),a1.getY(r), a2.getX(r),a2.getY(r)),\r
-                                               distToSeg(Px.x, Px.y, a2.getX(r),a2.getY(r), a3.getX(r),a3.getY(r)),\r
-                                               distToSeg(Px.x, Px.y, a3.getX(r),a3.getY(r), a1.getX(r),a1.getY(r))                             // triangle\r
-                                               );\r
-                                       d = constrain(30*(rad*40-d),0,100);\r
-                                       return color(0,max(0,150-d), d); // clock\r
-\r
-               case 9:         r = amp*200 * map(bnc,0,1,1,sin(PI*t));\r
-                                       d = min(\r
-                                               distToSeg(Px.x, Px.y, a1.getX(r),a1.getY(r), a2.getX(r),a2.getY(r)),\r
-                                               distToSeg(Px.x, Px.y, a2.getX(r),a2.getY(r), a3.getX(r),a3.getY(r)),\r
-                                               distToSeg(Px.x, Px.y, a3.getX(r),a3.getY(r), a4.getX(r),a4.getY(r)),\r
-                                               distToSeg(Px.x, Px.y, a4.getX(r),a4.getY(r), a1.getX(r),a1.getY(r))                             // quad\r
-                                       );\r
-                                       d = constrain(30*(rad*40-d),0,100);\r
-                                       return color(0,max(0,150-d), d); // clock\r
-\r
-               case 10:\r
-                                       r = map(bnc,0,1,a1.r,amp*200*sin(PI*t));\r
-                                       return color(0,0,c1c(.9+2*rad - dist(Px.x,Px.y,a1.getX(r),a1.getY(r))*.03) );           // sphere\r
-\r
-               case 11:\r
-                                       Px.z=mCtr.z; cMid.z=mCtr.z;\r
-                                       return color(0,0,c1c(1 - CalcCone(Px,cMid,mCtr) * 0.02 > .5?1:0));                              // cone\r
-\r
-               case 12:        return color(100 + noise(Pn.x,Pn.y,Pn.z + (NoiseMove+50000)/1000.)*200,\r
-                                               85,c1c(Pn.y < noise(Pn.x + NoiseMove/2000.,Pn.z)*(1+amp)-amp/2.-.1 ? 1 : 0));   // noise\r
-\r
-               case 13:        float y=0; for (rWave w : waves) y += .5*w.val(Pn.x);\r
-                                       V.set(Pn.x, .7+y, Pn.z);\r
-                                       break;\r
-\r
-               default:        return color(0,0,0);\r
-               }\r
-\r
-               return color(0,\r
-                               150-c1c(1 - V.distance(Pn)/rad),\r
-                               c1c(1 - V.distance(Pn)/rad));\r
-       }\r
-}\r
-//----------------------------------------------------------------------------------------------------------------------------------\r
-// 0 - TLB, L (b), BLB, B (l)          // Fwd , Down, Back, Up\r
-// 4 - TLF, F (l), BLF, L (f)          // Fwd , Down, Back, Up\r
-// 8 - TRF, R (f), BRF, F (r)          // Back, Down, Fwd , Up\r
-// 12- TRB, B (r), BRB, R (b)          // Back, Down, Fwd , Up\r
-// 1->7, 15->9\r
-\r
-class dBolt {\r
-       dStrip v, h;\r
-       int    vpos, hpos;\r
-       dBolt(dStrip _v, dStrip _h, int _vpos, int _hpos) {\r
-               v=_v; h=_h; vpos=_vpos; hpos=_hpos;\r
-               if (v.b0 == null) { v.b0=this; h.b0=this; } \r
-               else                      { v.b1=this; h.b1=this; }\r
-       }\r
-}\r
-\r
-class dVertex {\r
-       dStrip  s1      , s2    ;\r
-       int     dir1, dir2      ;\r
-       dVertex(dStrip s, int d) {\r
-               int _a = (s.iS%4==1)? (d==1? 5: 3) :\r
-                                (s.iS%4==3)? (d==1? 9:11) :\r
-                                (d==1)         ? (s.Top()?4:12)   : (s.Top()?12:4);\r
-               dir1 = d * (s.isVert() ? -1 : 1);\r
-               dir2 = d;\r
-               s1       = DL_.DS[s.iCube() + ((s.iS+_a) % 16)];\r
-               s2       = DL_.DS[d == 1 ?      (s.idx == s.iFace()+3 ? s.idx-3 : s.idx+1):\r
-                                                               (s.idx == s.iFace()   ? s.idx+3 : s.idx-1)];\r
-               swapout(1 , 6);\r
-               swapout(15,-6);\r
-       }\r
-       void swapout(int a, int b) {\r
-               if (s1.iS == a) { s1 = DL_.DS[s1.idx + b]; dir1 = -dir1; }\r
-               if (s2.iS == a) { s2 = DL_.DS[s2.idx + b]; dir2 = -dir2; }\r
-       }\r
-\r
-}\r
-\r
-class dStrip  { // THIS WAS SUCH A PAIN!\r
-       int row, col, ci, idx, iS, axis;        // 1-y, 2-left, 3-right\r
-       Strip s; \r
-       boolean bTop;   // direction: top ccw, bottom cw.\r
-\r
-       boolean Top   (){       return axis!=1 &&  bTop ;               }\r
-       boolean Bottom(){       return axis!=1 && !bTop;                }\r
-       boolean isVert(){       return axis==1;                                 }\r
-       boolean isHorz(){       return axis!=1;                                 }\r
-       int     iCube (){       return 16*floor(idx/16);                }\r
-       int     iFace (){       return iCube() + 4*floor(iS/4); }\r
-\r
-       void    init(Strip _s, int _i, int _row, int _col)  {\r
-               idx = _i; row = _row; col = _col; s = _s;\r
-               iS      = idx%16; bTop = (iS%4==0);\r
-               ci  = s.points.get(0).index;\r
-               DL_.DQ[col][row] = iCube();\r
-               switch (iS) {\r
-                       case 4: case 6 : case 12: case 14:      axis=2; break;\r
-                       case 0: case 2 : case 8 : case 10:      axis=3; break;\r
-                       default:                                                        axis=1; break;\r
-               }\r
-       }\r
-\r
-       void addBolts() {\r
-               v0 = new dVertex(this, 1);\r
-               v1 = new dVertex(this,-1);\r
-\r
-\r
-               if (iS == 7 && col != 0 && row != 0)                                                                    // left bottom\r
-                       new dBolt(this, DL_.GetStrip(row-1,col-1,(col % 2 == 1) ? 8 : 12),  \r
-                                                       4, (col % 2 == 1) ? 6 : 9);     \r
-\r
-               if (iS == 7 && col != 0 && row < MaxCubeHeight*2-2)                                     // left top\r
-                       new dBolt(this, DL_.GetStrip(row+1,col-1,(col % 2 == 1) ? 10 : 14), \r
-                                                       11, (col % 2 == 1) ? 9 : 6);\r
-\r
-               if (iS == 9 && col < NumBackTowers-1 && row < MaxCubeHeight*2-2)                // right top\r
-                       new dBolt(this, DL_.GetStrip(row+1,col+1,(col % 2 == 1) ? 6 : 2), \r
-                                                       4, (col % 2 == 1) ? 6 : 9);\r
-\r
-               if (iS == 9 && col < NumBackTowers-1 && row != 0)                                               // right bottom\r
-                       new dBolt(this, DL_.GetStrip(row-1,col+1,(col % 2 == 1) ? 4 : 0), \r
-                                                       11, (col % 2 == 1) ? 9 : 6);\r
-       }\r
-\r
-       dBolt   b0, b1;\r
-       dVertex v0, v1;\r
-}\r
-\r
-class dCursor {\r
-       dStrip  s, sNext;\r
-       int     nLast,pos,posNext,end;  // 0 - 65535\r
-       int     dir;                    // 1 or -1\r
-       color   clr;\r
-       \r
-       dCursor(color _c) { clr=_c;}\r
-\r
-       boolean isDone()                                        { return pos==end; }\r
-       void    set(dStrip _s, int _dir)        { \r
-                       s=_s; dir=_dir; pos = 0; end=65536; nLast=-1; sNext=null;\r
-       }\r
-\r
-       boolean MakeTurn(dBolt b) {\r
-               int nEnd=       (s.isVert() ? b.vpos : b.hpos) <<12;\r
-                       nEnd=   (dir==1 ? nEnd : 65536-nEnd);\r
-               if (nEnd < pos) return false;\r
-               if (s.isVert()) { sNext = b.h; posNext = b.hpos<<12; end = nEnd; }\r
-               else                    { sNext = b.v; posNext = b.vpos<<12; end = nEnd; }\r
-               return true;\r
-       }\r
-\r
-       void    PickNext()      {\r
-               if (sNext != null) {\r
-                       if (end == 65536) exit();\r
-                       end                     = 65536;        \r
-                       pos                     = posNext;\r
-                       dir                     = randDir(); \r
-                       if (dir<0) pos = end-pos;\r
-                       s                       = sNext; sNext = null;\r
-                       nLast           = -1;\r
-                       return;// could switch again!!\r
-               } else {\r
-                       dVertex v = (dir == 1 ? s.v0 : s.v1);\r
-                       int r = floor(random(2));\r
-                       set(r==0 ? v.s1 : v.s2,r==0 ? v.dir1 : v.dir2);\r
-               }\r
-\r
-               // plan to turn the corner\r
-               if (random(6)<1 && s.b0 != null && MakeTurn(s.b0)) return;\r
-               if (random(6)<1 && s.b1 != null && MakeTurn(s.b1)) return;\r
-       }\r
-}\r
-\r
-int randDir() { return round(random(1))*2-1; }\r
-\r
-class dLattice {\r
-       int             iTowerStrips=-1;\r
-       dStrip[]        DS = new dStrip[glucose.model.strips.size()];\r
-       int[][]         DQ = new int[NumBackTowers][MaxCubeHeight*2];\r
-\r
-       int             nStrips() { return iTowerStrips; }\r
-       dStrip GetStrip (int row, int col, int off) { return DS[DQ[col][row]+off]; }\r
-       dLattice() {\r
-               DL_=this;\r
-               int   col = 0, row = -2, i=-1;\r
-               for (Strip strip : glucose.model.strips  ) { i++; \r
-                       if (i % 16 == 0) row+=2;\r
-                       if (row >= MaxCubeHeight*2-1) { col++; row = (col%2==1)?1:0; }\r
-                       if (col >= NumBackTowers) continue;\r
-                       iTowerStrips++  ;\r
-                       dStrip s = DS[iTowerStrips] = new dStrip();\r
-                       s.init(strip, iTowerStrips, row, col);\r
-               }\r
-\r
-               for (int j=0; j<iTowerStrips; j++) DS[j].addBolts();\r
-       }\r
-       dStrip  rand()                          { return DS[floor(random(iTowerStrips))];               }\r
-       void    setRand(dCursor c)      { c.set(rand(),randDir());                      }\r
-}\r
-\r
-dLattice DL_;\r
-//----------------------------------------------------------------------------------------------------------------------------------\r
-class Worms extends SCPattern {\r
-\r
-       int draw(dCursor c, int nAmount) {\r
-               int nFrom       = max(c.nLast+1,c.pos >> 12);\r
-               int     nTo     = min(15,(c.pos+nAmount) >> 12); c.nLast=nTo;\r
-               int     nMv     = min(nAmount, c.end-c.pos);\r
-                       c.pos   += nMv;\r
-               for (int i = nFrom; i <= nTo; i++) {\r
-                       int n = c.s.ci + (c.dir>0 ? i : 15-i);\r
-                       colors[n] = c.clr;\r
-               }\r
-               return nAmount - nMv;\r
-       }\r
-\r
-       float   StripsPerSec    = 6;\r
-       float   TrailTime               = 1500;\r
-       int     Cursors                 = 40;\r
-       dCursor cur[] = new dCursor[Cursors];\r
-\r
-       Worms(GLucose glucose) { \r
-               super(glucose); \r
-               if (DL_ == null) DL_ = new dLattice();\r
-               for (int i=0; i<Cursors; i++) { cur[i] = new dCursor(color(random(360),50+random(50),50+random(50))); DL_.setRand(cur[i]); }\r
-       }\r
-\r
-       void run(double deltaMs) {\r
-                       //Test Joints\r
-               if (false) {\r
-                       for (int j=0; j<DL_.nStrips(); j++) {\r
-                                               dStrip s =DL_.DS[j]; dBolt d = s.b0;\r
-                                               if (d != null) {for (int i=0;i<16;i++) {\r
-                                                       if (s == d.v && i <= d.vpos) colors[d.v.ci+i]   = color(0,0,30);\r
-                                                       if (s == d.h && i <= d.hpos) colors[d.h.ci+i]   = color(0,0,30);\r
-                                               }}\r
-\r
-                                               d = s.b1; \r
-                                               if (d != null) {for (int i=0;i<16;i++) {\r
-                                                       if (s == d.v && i >= d.vpos) colors[d.v.ci+i]   = color(0,0,30);\r
-                                                       if (s == d.h && i >= d.hpos) colors[d.h.ci+i]   = color(0,0,30);\r
-                                               }}\r
-                       }\r
-               } else {\r
-                       for (int i=0; i<Cursors; i++) {\r
-                               int nLeft = floor((float)deltaMs*.001*StripsPerSec * 65536);\r
-                               while(nLeft > 0) {      \r
-                                       nLeft = draw(cur[i], nLeft);\r
-                                       if (cur[i].isDone()) cur[i].PickNext(); \r
-                               }\r
-                       }\r
-\r
-                       for (int i=0,s=model.points.size(); i<s; i++) {\r
-                               float b = brightness(colors[i]); \r
-                               color c = colors[i];\r
-                               if (b>0) colors[i] = color(hue(c), saturation(c), \r
-                                               (float)(b-100*deltaMs/TrailTime));\r
-                       }\r
-               }\r
-       }\r
-}\r
-//----------------------------------------------------------------------------------------------------------------------------------\r
+//----------------------------------------------------------------------------------------------------------------------------------
+public class Pong extends DPat {
+       SinLFO x,y,z,dx,dy,dz; 
+       float cRad;     DParam pSize;
+       Pick    pChoose;
+       xyz     v = new xyz(), vMir =  new xyz();
+
+       Pong(GLucose glucose) {
+               super(glucose);
+               cRad = mMax.x/10;
+               addModulator(dx = new SinLFO(6000,  500, 30000  )).trigger();
+               addModulator(dy = new SinLFO(3000,  500, 22472  )).trigger();
+               addModulator(dz = new SinLFO(1000,  500, 18420  )).trigger();
+               addModulator(x  = new SinLFO(cRad, mMax.x - cRad, 0)).trigger();        x.modulateDurationBy(dx);
+               addModulator(y  = new SinLFO(cRad, mMax.y - cRad, 0)).trigger();        y.modulateDurationBy(dy);
+               addModulator(z  = new SinLFO(cRad, mMax.z - cRad, 0)).trigger();        z.modulateDurationBy(dz);
+           pSize       = addParam      ("Size"                 , 0.4   );
+           pChoose = addPick   ("Animiation"   , 0, 2, new String[] {"Pong", "Ball", "Cone"}   );
+       }
+
+       void    StartRun(double deltaMs)        { cRad = mMax.x*pSize.Val()/6; }
+       color   CalcPoint(xyz p)                {
+               v.set(x.getValuef(), y.getValuef(), z.getValuef());
+               v.z=0;p.z=0;// ignore z dimension
+               switch(pChoose.Cur()) {
+               case 0: vMir.set(mMax); vMir.subtract(p);
+                               return lx.hsb(0,0,c1c(1 - min(v.distance(p), v.distance(vMir))*.5/cRad));       // balls
+               case 1: return lx.hsb(0,0,c1c(1 - v.distance(p)*.5/cRad));                                                      // ball
+               case 2: vMir.set(mMax.x/2,0,mMax.z/2);
+                               return lx.hsb(0,0,c1c(1 - CalcCone(p,v,vMir) * max(.02,.45-pSize.Val())));      // spot
+               }
+               return lx.hsb(0,0,0);
+       }
+}
+//----------------------------------------------------------------------------------------------------------------------------------
+public class NDat {
+       float   xz, yz, zz, hue, sat, speed, angle, den;
+       float   xoff,yoff,zoff;
+       float   sinAngle, cosAngle;
+       boolean isActive;
+       NDat              () { isActive=false; }
+       boolean Active() { return isActive; }
+       void    set     (float _hue, float _sat, float _xz, float _yz, float _zz, float _den, float _speed, float _angle) {
+               isActive = true;
+               hue=_hue; sat=_sat; xz=_xz; yz=_yz; zz =_zz; den=_den; speed=_speed; angle=_angle;
+               xoff = random(100e3); yoff = random(100e3); zoff = random(100e3);
+       }
+}
+
+public class Noise extends DPat
+{
+       int                     CurAnim, iSymm;
+       int             XSym=1,YSym=2,RadSym=3;
+       float           zTime , zTheta=0, zSin, zCos, rtime, ttime, transAdd;
+       DParam          pSpeed , pDensity;
+       Pick            pChoose, pSymm;
+       int                     _ND = 4;
+       NDat            N[] = new NDat[_ND];
+
+       Noise(GLucose glucose) {
+               super(glucose);
+               pSpeed          = addParam("Fast"       , .55);
+               pDensity        = addParam("Dens"        , .5);
+               pSymm           = addPick("Symmetry" , 0, 3, new String[] {"None", "X", "Y", "Radial"}  );
+               pChoose         = addPick("Animation", 6, 7, new String[] {"Drip", "Cloud", "Rain", "Fire", "Machine", "Spark","VWave", "Wave"} );
+               for (int i=0; i<_ND; i++) N[i] = new NDat();
+       }
+
+       void StartPattern() { zTime = random(500); zTheta=0; rtime = 0; ttime = 0; transAdd=0; }
+       void StartRun(double deltaMs) {
+               zTime   += deltaMs*(pSpeed.Val()-.5)*.002       ;
+               zTheta  += deltaMs*(pSpin .Val()-.5)*.01        ;
+               rtime   += deltaMs;
+               iSymm    = pSymm.Cur();
+               transAdd = 1*(1 - constrain(rtime - ttime,0,1000)/1000);
+               zSin    = sin(zTheta);
+               zCos    = cos(zTheta);
+
+               if (pChoose.Cur() != CurAnim) {
+                       CurAnim = pChoose.Cur(); ttime = rtime;
+                       pSpin           .reset();       zTheta          = 0;
+                       pDensity        .reset();       pSpeed          .reset();
+                       for (int i=0; i<_ND; i++) { N[i].isActive = false; }
+                       
+                       switch(CurAnim) {
+                       //                          hue sat xz  yz  zz  den mph angle
+                       case 0: N[0].set(0  ,0  ,75 ,75 ,150,45 ,3  ,0  ); pSharp.set(1 ); break;       // drip
+                       case 1: N[0].set(0  ,0  ,100,100,200,45 ,3  ,180); pSharp.set(0 ); break;       // clouds
+                       case 2: N[0].set(0  ,0  ,2  ,400,2  ,20 ,3  ,0  ); pSharp.set(.5); break;       // rain
+                       case 3: N[0].set(40 ,1  ,100,100,200,10 ,1  ,180); 
+                                       N[1].set(0  ,1  ,100,100,200,10 ,5  ,180); pSharp.set(0 ); break;       // fire 1
+                       case 4: N[0].set(0  ,1  ,40 ,40 ,40 ,15 ,2.5,180);
+                                       N[1].set(20 ,1  ,40 ,40 ,40 ,15 ,4  ,0  );
+                                       N[2].set(40 ,1  ,40 ,40 ,40 ,15 ,2  ,90 );
+                                       N[3].set(60 ,1  ,40 ,40 ,40 ,15 ,3  ,-90); pSharp.set(.5); break; // machine
+                       case 5: N[0].set(0  ,1  ,400,100,2  ,15 ,3  ,90 );
+                                       N[1].set(20 ,1  ,400,100,2  ,15 ,2.5,0  );
+                                       N[2].set(40 ,1  ,100,100,2  ,15 ,2  ,180);
+                                       N[3].set(60 ,1  ,100,100,2  ,15 ,1.5,270); pSharp.set(.5); break; // spark
+                       }
+
+                       DG.UpdateLights();
+               }
+               
+               for (int i=0; i<_ND; i++) if (N[i].Active()) {
+                       N[i].sinAngle = sin(radians(N[i].angle));
+                       N[i].cosAngle = cos(radians(N[i].angle));
+               }
+       }
+
+       color CalcPoint(xyz P) {
+               color c = 0;
+               P.RotateZ(mCtr, zSin, zCos);
+               
+               if (CurAnim == 6 || CurAnim == 7) {
+                       P.setNorm();
+                       return lx.hsb(0,0, 100 * (
+                                                       constrain(1-50*(1-pDensity.Val())*abs(P.y-sin(zTime*10  + P.x*(300))*.5 - .5),0,1) + 
+                       (CurAnim == 7 ? constrain(1-50*(1-pDensity.Val())*abs(P.x-sin(zTime*10  + P.y*(300))*.5 - .5),0,1) : 0))
+                       );
+               }                       
+                       
+               if (iSymm == XSym && P.x > mMax.x/2) P.x = mMax.x-P.x;
+               if (iSymm == YSym && P.y > mMax.y/2) P.y = mMax.y-P.y;
+
+               for (int i=0;i<_ND; i++) if (N[i].Active()) {
+                       NDat  n     = N[i];
+                       float zx    = zTime * n.speed * n.sinAngle,
+                                 zy    = zTime * n.speed * n.cosAngle;
+                       
+                       float b     = (iSymm==RadSym ? noise(zTime*n.speed+n.xoff-Dist(P,mCtr)/n.xz)
+                                                                                : noise(P.x/n.xz+zx+n.xoff,P.y/n.yz+zy+n.yoff,P.z/n.zz+n.zoff))
+                                                       *1.8;
+
+                       b +=    n.den/100 -.4 + pDensity.Val() -1;
+                       b +=    transAdd;
+                       c =     blendColor(c,lx.hsb(n.hue,100*n.sat,c1c(b)),ADD);
+               }
+               return c;
+       }
+}
+//----------------------------------------------------------------------------------------------------------------------------------
+public class Play extends DPat
+{
+       public class rAngle {
+               float   prvA, dstA, c;
+               float   prvR, dstR, r;          
+               float   _cos, _sin, x, y;
+               float   fixAngle        (float a, float b) { return a<b ?
+                                                                               (abs(a-b) > abs(a+2*PI-b) ? a : a+2*PI) :
+                                                                               (abs(a-b) > abs(a-2*PI-b) ? a : a-2*PI) ; }
+               float   getX(float r)   {       return mCtr.x + _cos*r; }
+               float   getY(float r)   {       return mCtr.y + _sin*r; }
+               void    move()                  {       c               = interp(t,prvA,dstA); 
+                                                                       r               = interp(t,prvR,dstR);
+                                                                       _cos    = cos(c);       _sin    = sin(c);
+                                      x                = getX(r);      y               = getY(r);              }               
+               void    set()                   {       prvA    = dstA;         dstA    = random(2*PI);         prvA = fixAngle(prvA, dstA);
+                                                                       prvR    = dstR;         dstR    = random(mCtr.y);                                                                       }
+       }
+
+       int             nBeats  =       0;
+       DParam  pAmp, pRadius, pBounce;
+
+       float   t,amp,rad,bnc;
+       float   zTheta=0;
+       ArrayList<rWave> waves = new ArrayList<rWave>(10);
+
+       rAngle  a1 = new rAngle(), a2 = new rAngle(),
+                       a3 = new rAngle(), a4 = new rAngle();
+       xyz             cPrev   = new xyz(), cRand      = new xyz(),
+                       cMid    = new xyz(), V          = new xyz(),
+                       Theta   = new xyz(), TSin       = new xyz(),
+                       TCos    = new xyz(), cMidNorm = new xyz(),
+                       Pn              = new xyz();
+       float   LastBeat=3, LastMeasure=3;
+       int             CurRandTempo = 1, CurRandTPat = 1;
+
+       Pick    pTimePattern, pTempoMult, pShape;
+       int             RandCube;
+
+       Play(GLucose glucose) {
+               super(glucose);
+           pRadius             = addParam("Rad"        , .1    );
+               pBounce         = addParam("Bnc"        , .2    );
+           pAmp                = addParam("Amp"        , .2    );
+               pTempoMult      = addPick ("TMult"      , 0 , 5         , new String[] {"1x", "2x", "4x", "8x", "16x", "Rand"   }       );
+               pTimePattern= addPick ("TPat"   , 6 , 7         , new String[] {"Bounce", "Sin", "Roll", "Quant", "Accel", "Deccel", "Slide", "Rand"}   );
+               pShape          = addPick ("Shape"      , 3 , 15        , new String[] {"Line", "Tap", "V", "RandV",
+                                                                                                                                       "Pyramid", "Wings", "W2", "Clock",
+                                                                                                                                       "Triangle", "Quad", "Sphere", "Cone",
+                                                                                                                                       "Noise", "Wave", "?", "?"}                                              );
+       }
+
+       public class rWave {
+               float v0, a0, x0, t,damp,a;
+               boolean bDone=false;
+               final float len=8;
+               rWave(float _x0, float _a0, float _v0, float _damp) { x0=_x0*len; a0=_a0; v0=_v0; t=0; damp = _damp; }
+               void move(double deltaMs) {
+                       t += deltaMs*.001;
+                       if (t>4) bDone=true;
+               }
+               float val(float _x) {
+                       _x*=len;
+                       float dist = t*v0 - abs(_x-x0);
+                       if (dist<0) { a=1; return 0; }
+                       a  = a0*exp(-dist*damp) * exp(-abs(_x-x0)/(.2*len)); // * max(0,1-t/dur)
+                       return  -a*sin(dist);
+               }
+       }
+
+       void StartPattern() { zTheta=0; }
+       void StartRun(double deltaMs) {
+               t       = lx.tempo.rampf();
+               amp = pAmp.Val();
+               rad     = pRadius.getValuef();
+               bnc     = pBounce.getValuef();          
+               zTheta  += deltaMs*(pSpin .Val()-.5)*.01;
+
+               Theta   .set(pRotX.Val()*PI*2, pRotY.Val()*PI*2, pRotZ.Val()*PI*2 + zTheta);
+               TSin    .set(sin(Theta.x), sin(Theta.y), sin(Theta.z));
+               TCos    .set(cos(Theta.x), cos(Theta.y), cos(Theta.z));
+
+               if (t<LastMeasure) {
+                       if (random(3) < 1) { CurRandTempo = int(random(4)); if (CurRandTempo == 3) CurRandTempo = int(random(4));       }
+                       if (random(3) < 1) { CurRandTPat  = pShape.Cur() > 6 ? 2+int(random(5)) : int(random(7));                                       }
+               } LastMeasure = t;
+                       
+               int nTempo = pTempoMult  .Cur(); if (nTempo == 5) nTempo = CurRandTempo;
+               int nTPat  = pTimePattern.Cur(); if (nTPat  == 7) nTPat  = CurRandTPat ;
+
+               switch (nTempo) {
+                       case 0:         t = t;                                                          break;
+                       case 1:         t = (t*2. )%1.;                                         break;
+                       case 2:         t = (t*4. )%1.;                                         break;
+                       case 3:         t = (t*8. )%1.;                                         break;
+                       case 4:         t = (t*16.)%1.;                                         break;
+               }
+
+               int i=0; while (i< waves.size()) {
+                       rWave w = waves.get(i);
+                       w.move(deltaMs); if (w.bDone) waves.remove(i); else i++;
+               }
+
+               if ((t<LastBeat && !pKey.b) || DG.KeyPressed>-1) {
+                       waves.add(new rWave(
+                                               pKey.b ? map(DG.KeyPressed,0,7,0,1) : random(1),                // location
+                                               bnc*10,                 // bounciness
+                                               7,                              // velocity
+                                               2*(1-amp)));    // dampiness
+                       DG.KeyPressed=-1;
+                       if (waves.size() > 5) waves.remove(0);
+               }
+               
+               if (t<LastBeat) {
+                       cPrev.set(cRand); cRand.setRand();
+                       a1.set(); a2.set(); a3.set(); a4.set();
+               } LastBeat = t;
+
+               switch (nTPat) {
+                       case 0:         t = sin(PI*t);                                                  break;  // bounce
+                       case 1:         t = norm(sin(2*PI*(t+PI/2)),-1,1);              break;  // sin
+                       case 2:         t = t;                                                                  break;  // roll
+                       case 3:         t = constrain(int(t*8)/7.,0,1);                 break;  // quant
+                       case 4:         t = t*t*t;                                                              break;  // accel
+                       case 5:         t = sin(PI*t*.5);                                               break;  // deccel
+                       case 6:         t = .5*(1-cos(PI*t));                                   break;  // slide
+               }
+               
+               cMid.set                (cPrev);        cMid.interpolate        (t,cRand);
+               cMidNorm.set    (cMid);         cMidNorm.setNorm();
+               a1.move(); a2.move(); a3.move(); a4.move();
+       }
+
+       color CalcPoint(xyz Px) {
+               if (Theta.x != 0) Px.RotateX(mCtr, TSin.x, TCos.x);
+               if (Theta.y != 0) Px.RotateY(mCtr, TSin.y, TCos.y);
+               if (Theta.z != 0) Px.RotateZ(mCtr, TSin.z, TCos.z);
+               
+               Pn.set(Px); Pn.setNorm();
+
+               float mp        = min(Pn.x, Pn.z);
+               float yt        = map(t,0,1,.5-bnc/2,.5+bnc/2);
+               float r,d;
+
+               switch (pShape.Cur()) {
+               case 0:         V.set(Pn.x, yt                                                          , Pn.z);                                                        break;  // bouncing line
+               case 1:         V.set(Pn.x, map(cos(PI*t * Pn.x),-1,1,0,1)  , Pn.z);                                                    break;  // top tap
+               case 2:         V.set(Pn.x, bnc*map(Pn.x<.5?Pn.x:1-Pn.x,0,.5 ,0,t-.5)+.5, Pn.z);                                break;  // V shape
+               case 3:         V.set(Pn.x, Pn.x < cMidNorm.x ? map(Pn.x,0,cMidNorm.x, .5,yt) :
+                                                                                               map(Pn.x,cMidNorm.x,1, yt,.5), Pn.z);                           break;  //  Random V shape
+
+               case 4:         V.set(Pn.x,     .5*(Pn.x < cMidNorm.x ?         map(Pn.x,0,cMidNorm.x, .5,yt) :
+                                                                                                               map(Pn.x,cMidNorm.x,1, yt,.5)) +
+                                                       .5*(Pn.z < cMidNorm.z ?         map(Pn.z,0,cMidNorm.z, .5,yt) :
+                                                                                                               map(Pn.z,cMidNorm.z,1, yt,.5)), Pn.z);          break;  //  Random Pyramid shape
+                                                                                                       
+               case 5:         V.set(Pn.x, bnc*map((Pn.x-.5)*(Pn.x-.5),0,.25,0,t-.5)+.5, Pn.z);                                break;  // wings
+               case 6:         V.set(Pn.x, bnc*map((mp  -.5)*(mp  -.5),0,.25,0,t-.5)+.5, Pn.z);                                break;  // wings
+
+               case 7:         d = min(
+                                               distToSeg(Px.x, Px.y, a1.getX(70),a1.getY(70), mCtr.x, mCtr.y),
+                                               distToSeg(Px.x, Px.y, a2.getX(40),a2.getY(40), mCtr.x, mCtr.y));
+                                       d = constrain(30*(rad*40-d),0,100);
+                                       return lx.hsb(0,max(0,150-d), d); // clock
+
+               case 8:         r = amp*200 * map(bnc,0,1,1,sin(PI*t));
+                                       d = min(
+                                               distToSeg(Px.x, Px.y, a1.getX(r),a1.getY(r), a2.getX(r),a2.getY(r)),
+                                               distToSeg(Px.x, Px.y, a2.getX(r),a2.getY(r), a3.getX(r),a3.getY(r)),
+                                               distToSeg(Px.x, Px.y, a3.getX(r),a3.getY(r), a1.getX(r),a1.getY(r))                             // triangle
+                                               );
+                                       d = constrain(30*(rad*40-d),0,100);
+                                       return lx.hsb(0,max(0,150-d), d); // clock
+
+               case 9:         r = amp*200 * map(bnc,0,1,1,sin(PI*t));
+                                       d = min(
+                                               distToSeg(Px.x, Px.y, a1.getX(r),a1.getY(r), a2.getX(r),a2.getY(r)),
+                                               distToSeg(Px.x, Px.y, a2.getX(r),a2.getY(r), a3.getX(r),a3.getY(r)),
+                                               distToSeg(Px.x, Px.y, a3.getX(r),a3.getY(r), a4.getX(r),a4.getY(r)),
+                                               distToSeg(Px.x, Px.y, a4.getX(r),a4.getY(r), a1.getX(r),a1.getY(r))                             // quad
+                                       );
+                                       d = constrain(30*(rad*40-d),0,100);
+                                       return lx.hsb(0,max(0,150-d), d); // clock
+
+               case 10:
+                                       r = map(bnc,0,1,a1.r,amp*200*sin(PI*t));
+                                       return lx.hsb(0,0,c1c(.9+2*rad - dist(Px.x,Px.y,a1.getX(r),a1.getY(r))*.03) );          // sphere
+
+               case 11:
+                                       Px.z=mCtr.z; cMid.z=mCtr.z;
+                                       return lx.hsb(0,0,c1c(1 - CalcCone(Px,cMid,mCtr) * 0.02 > .5?1:0));                             // cone
+
+               case 12:        return lx.hsb(100 + noise(Pn.x,Pn.y,Pn.z + (NoiseMove+50000)/1000.)*200,
+                                               85,c1c(Pn.y < noise(Pn.x + NoiseMove/2000.,Pn.z)*(1+amp)-amp/2.-.1 ? 1 : 0));   // noise
+
+               case 13:        float y=0; for (rWave w : waves) y += .5*w.val(Pn.x);
+                                       V.set(Pn.x, .7+y, Pn.z);
+                                       break;
+
+               default:        return lx.hsb(0,0,0);
+               }
+
+               return lx.hsb(0,
+                               150-c1c(1 - V.distance(Pn)/rad),
+                               c1c(1 - V.distance(Pn)/rad));
+       }
+}
+//----------------------------------------------------------------------------------------------------------------------------------
+// 0 - TLB, L (b), BLB, B (l)          // Fwd , Down, Back, Up
+// 4 - TLF, F (l), BLF, L (f)          // Fwd , Down, Back, Up
+// 8 - TRF, R (f), BRF, F (r)          // Back, Down, Fwd , Up
+// 12- TRB, B (r), BRB, R (b)          // Back, Down, Fwd , Up
+// 1->7, 15->9
+
+class dBolt {
+       dStrip v, h;
+       int    vpos, hpos;
+       dBolt(dStrip _v, dStrip _h, int _vpos, int _hpos) {
+               v=_v; h=_h; vpos=_vpos; hpos=_hpos;
+               if (v.b0 == null) { v.b0=this; h.b0=this; } 
+               else                      { v.b1=this; h.b1=this; }
+       }
+}
+
+class dVertex {
+       dStrip  s1      , s2    ;
+       int     dir1, dir2      ;
+       dVertex(dStrip s, int d) {
+               int _a = (s.iS%4==1)? (d==1? 5: 3) :
+                                (s.iS%4==3)? (d==1? 9:11) :
+                                (d==1)         ? (s.Top()?4:12)   : (s.Top()?12:4);
+               dir1 = d * (s.isVert() ? -1 : 1);
+               dir2 = d;
+               s1       = DL_.DS[s.iCube() + ((s.iS+_a) % 16)];
+               s2       = DL_.DS[d == 1 ?      (s.idx == s.iFace()+3 ? s.idx-3 : s.idx+1):
+                                                               (s.idx == s.iFace()   ? s.idx+3 : s.idx-1)];
+               swapout(1 , 6);
+               swapout(15,-6);
+       }
+       void swapout(int a, int b) {
+               if (s1.iS == a) { s1 = DL_.DS[s1.idx + b]; dir1 = -dir1; }
+               if (s2.iS == a) { s2 = DL_.DS[s2.idx + b]; dir2 = -dir2; }
+       }
+
+}
+
+class dStrip  { // THIS WAS SUCH A PAIN!
+       int row, col, ci, idx, iS, axis;        // 1-y, 2-left, 3-right
+       Strip s; 
+       boolean bTop;   // direction: top ccw, bottom cw.
+
+       boolean Top   (){       return axis!=1 &&  bTop ;               }
+       boolean Bottom(){       return axis!=1 && !bTop;                }
+       boolean isVert(){       return axis==1;                                 }
+       boolean isHorz(){       return axis!=1;                                 }
+       int     iCube (){       return 16*floor(idx/16);                }
+       int     iFace (){       return iCube() + 4*floor(iS/4); }
+
+       void    init(Strip _s, int _i, int _row, int _col)  {
+               idx = _i; row = _row; col = _col; s = _s;
+               iS      = idx%16; bTop = (iS%4==0);
+               ci  = s.points.get(0).index;
+               DL_.DQ[col][row] = iCube();
+               switch (iS) {
+                       case 4: case 6 : case 12: case 14:      axis=2; break;
+                       case 0: case 2 : case 8 : case 10:      axis=3; break;
+                       default:                                                        axis=1; break;
+               }
+       }
+
+       void addBolts() {
+               v0 = new dVertex(this, 1);
+               v1 = new dVertex(this,-1);
+
+
+               if (iS == 7 && col != 0 && row != 0)                                                                    // left bottom
+                       new dBolt(this, DL_.GetStrip(row-1,col-1,(col % 2 == 1) ? 8 : 12),  
+                                                       4, (col % 2 == 1) ? 6 : 9);     
+
+               if (iS == 7 && col != 0 && row < MaxCubeHeight*2-2)                                     // left top
+                       new dBolt(this, DL_.GetStrip(row+1,col-1,(col % 2 == 1) ? 10 : 14), 
+                                                       11, (col % 2 == 1) ? 9 : 6);
+
+               if (iS == 9 && col < NumBackTowers-1 && row < MaxCubeHeight*2-2)                // right top
+                       new dBolt(this, DL_.GetStrip(row+1,col+1,(col % 2 == 1) ? 6 : 2), 
+                                                       4, (col % 2 == 1) ? 6 : 9);
+
+               if (iS == 9 && col < NumBackTowers-1 && row != 0)                                               // right bottom
+                       new dBolt(this, DL_.GetStrip(row-1,col+1,(col % 2 == 1) ? 4 : 0), 
+                                                       11, (col % 2 == 1) ? 9 : 6);
+       }
+
+       dBolt   b0, b1;
+       dVertex v0, v1;
+}
+
+class dCursor {
+       dStrip  s, sNext;
+       int     nLast,pos,posNext,end;  // 0 - 65535
+       int     dir;                    // 1 or -1
+       color   clr;
+       
+       dCursor(color _c) { clr=_c;}
+
+       boolean isDone()                                        { return pos==end; }
+       void    set(dStrip _s, int _dir)        { 
+                       s=_s; dir=_dir; pos = 0; end=65536; nLast=-1; sNext=null;
+       }
+
+       boolean MakeTurn(dBolt b) {
+               int nEnd=       (s.isVert() ? b.vpos : b.hpos) <<12;
+                       nEnd=   (dir==1 ? nEnd : 65536-nEnd);
+               if (nEnd < pos) return false;
+               if (s.isVert()) { sNext = b.h; posNext = b.hpos<<12; end = nEnd; }
+               else                    { sNext = b.v; posNext = b.vpos<<12; end = nEnd; }
+               return true;
+       }
+
+       void    PickNext()      {
+               if (sNext != null) {
+                       if (end == 65536) exit();
+                       end                     = 65536;        
+                       pos                     = posNext;
+                       dir                     = randDir(); 
+                       if (dir<0) pos = end-pos;
+                       s                       = sNext; sNext = null;
+                       nLast           = -1;
+                       return;// could switch again!!
+               } else {
+                       dVertex v = (dir == 1 ? s.v0 : s.v1);
+                       int r = floor(random(2));
+                       set(r==0 ? v.s1 : v.s2,r==0 ? v.dir1 : v.dir2);
+               }
+
+               // plan to turn the corner
+               if (random(6)<1 && s.b0 != null && MakeTurn(s.b0)) return;
+               if (random(6)<1 && s.b1 != null && MakeTurn(s.b1)) return;
+       }
+}
+
+int randDir() { return round(random(1))*2-1; }
+
+class dLattice {
+       int             iTowerStrips=-1;
+       dStrip[]        DS = new dStrip[glucose.model.strips.size()];
+       int[][]         DQ = new int[NumBackTowers][MaxCubeHeight*2];
+
+       int             nStrips() { return iTowerStrips; }
+       dStrip GetStrip (int row, int col, int off) { return DS[DQ[col][row]+off]; }
+       dLattice() {
+               DL_=this;
+               int   col = 0, row = -2, i=-1;
+               for (Strip strip : glucose.model.strips  ) { i++; 
+                       if (i % 16 == 0) row+=2;
+                       if (row >= MaxCubeHeight*2-1) { col++; row = (col%2==1)?1:0; }
+                       if (col >= NumBackTowers) continue;
+                       iTowerStrips++  ;
+                       dStrip s = DS[iTowerStrips] = new dStrip();
+                       s.init(strip, iTowerStrips, row, col);
+               }
+
+               for (int j=0; j<iTowerStrips; j++) DS[j].addBolts();
+       }
+       dStrip  rand()                          { return DS[floor(random(iTowerStrips))];               }
+       void    setRand(dCursor c)      { c.set(rand(),randDir());                      }
+}
+
+dLattice DL_;
+//----------------------------------------------------------------------------------------------------------------------------------
+class Worms extends SCPattern {
+
+       int draw(dCursor c, int nAmount) {
+               int nFrom       = max(c.nLast+1,c.pos >> 12);
+               int     nTo     = min(15,(c.pos+nAmount) >> 12); c.nLast=nTo;
+               int     nMv     = min(nAmount, c.end-c.pos);
+                       c.pos   += nMv;
+               for (int i = nFrom; i <= nTo; i++) {
+                       int n = c.s.ci + (c.dir>0 ? i : 15-i);
+                       colors[n] = c.clr;
+               }
+               return nAmount - nMv;
+       }
+
+       float   StripsPerSec    = 6;
+       float   TrailTime               = 1500;
+       int     Cursors                 = 40;
+       dCursor cur[] = new dCursor[Cursors];
+
+       Worms(GLucose glucose) { 
+               super(glucose); 
+               if (DL_ == null) DL_ = new dLattice();
+               for (int i=0; i<Cursors; i++) { cur[i] = new dCursor(lx.hsb(random(360),50+random(50),50+random(50))); DL_.setRand(cur[i]); }
+       }
+
+       void run(double deltaMs) {
+                       //Test Joints
+               if (false) {
+                       for (int j=0; j<DL_.nStrips(); j++) {
+                                               dStrip s =DL_.DS[j]; dBolt d = s.b0;
+                                               if (d != null) {for (int i=0;i<16;i++) {
+                                                       if (s == d.v && i <= d.vpos) colors[d.v.ci+i]   = lx.hsb(0,0,30);
+                                                       if (s == d.h && i <= d.hpos) colors[d.h.ci+i]   = lx.hsb(0,0,30);
+                                               }}
+
+                                               d = s.b1; 
+                                               if (d != null) {for (int i=0;i<16;i++) {
+                                                       if (s == d.v && i >= d.vpos) colors[d.v.ci+i]   = lx.hsb(0,0,30);
+                                                       if (s == d.h && i >= d.hpos) colors[d.h.ci+i]   = lx.hsb(0,0,30);
+                                               }}
+                       }
+               } else {
+                       for (int i=0; i<Cursors; i++) {
+                               int nLeft = floor((float)deltaMs*.001*StripsPerSec * 65536);
+                               while(nLeft > 0) {      
+                                       nLeft = draw(cur[i], nLeft);
+                                       if (cur[i].isDone()) cur[i].PickNext(); 
+                               }
+                       }
+
+                       for (int i=0,s=model.points.size(); i<s; i++) {
+                               color c = colors[i];
+                               float b = lx.b(c);
+                               if (b>0) colors[i] = lx.hsb(lx.h(c), lx.s(c), 
+                                               max(0, (float)(b-100*deltaMs/TrailTime)));
+                       }
+               }
+       }
+}
+//----------------------------------------------------------------------------------------------------------------------------------
index 3dd9d1407e68f419003846f5b91bdb0978971755..53646695561cd879cea81a84cbff0170dddbc5d2 100644 (file)
@@ -84,7 +84,7 @@ class ObjectMuckerEffect extends SCEffect {
       for(int i=0; i<s.points.size(); i++){
          int index = s.points.get(i).index;
          color c = colors[index];
-         colors[index] = color((i*22.5), saturation(c), brightness(c));
+         colors[index] = lx.hsb((i*22.5), saturation(c), brightness(c));
       }
     }*/
   }
index 7eca742f3933413336926f3aa12418b1e07dcb25..395ba44adef5b95bc9ad4cfb80b204f181dd402e 100644 (file)
@@ -225,7 +225,7 @@ public class DPat extends SCPattern
 
        void            StartPattern()                                          {                                                               }
        void            StartRun(double deltaMs)                        {                                                               }
-       color           CalcPoint(xyz p)                                        { return color(0,0,0);                  }
+       color           CalcPoint(xyz p)                                        { return lx.hsb(0,0,0);                         }
        boolean         IsActive()                                                      { return this == DG.CurPat;                                                                                             }
        boolean         IsFocused()                                                     { return this == midiEngine.getFocusedDeck().getActivePattern();                }
        void            onInactive()                                            { UpdateState(); }
@@ -330,21 +330,21 @@ public class DPat extends SCPattern
                        if (pRsym.b)    { tP.set(mMax.x-P.x,mMax.y-P.y,mMax.z-P.z);             cNew = blendColor(cNew, CalcPoint(tP), ADD);    }
                        if (pXdup.b)    { tP.set((P.x+mMax.x*.5)%mMax.x,P.y,P.z);               cNew = blendColor(cNew, CalcPoint(tP), ADD);    }
 
-                       float                                                           s =     saturation(cNew) + 100*(fSaturate*2-1);
-                       float                                                           b = brightness(cNew)/100.;
+                       float                                                           s =     lx.s(cNew) + 100*(fSaturate*2-1);
+                       float                                                           b = lx.b(cNew)/100.;
                        if (pSharp.Val()>0)                             b = b < .5 ? pow(b,fSharp) : 1-pow(1-b,fSharp);
-                       if (DG._Trails()>0 && fQuant == 0)      b = max(b, (float) (brightness(cOld)/100. - (1-DG._Trails()) * deltaMs/200.));
-                       if (DG.bSustain == true)                        b = max(b, (float) (brightness(cOld)/100.));
+                       if (DG._Trails()>0 && fQuant == 0)      b = max(b, (float) (lx.b(cOld)/100. - (1-DG._Trails()) * deltaMs/200.));
+                       if (DG.bSustain == true)                        b = max(b, (float) (lx.b(cOld)/100.));
 
                        if (pInvert.b)  { b = 1-b; s = 1-s; }
 
-                       colors[p.index] = color(
-                               (hue(cNew) + zSpinHue) % 360,
+                       colors[p.index] = lx.hsb(
+                               (lx.h(cNew) + zSpinHue) % 360,
                                s,
                                100 *  b * DG._Level()
                        );
 
-//                     colors[p.index] = color(0,0, p.x >= modmin.x && p.y >= modmin.y && p.z >= modmin.z &&
+//                     colors[p.index] = lx.hsb(0,0, p.x >= modmin.x && p.y >= modmin.y && p.z >= modmin.z &&
 //                             p.x <= modmin.x+mMax.x && p.y <= modmin.y+mMax.y && p.z <= modmin.z+mMax.z ? 100 : 0); 
                }
        }
index abe2237d3b295bf7b7e881dc44756e20237f84d6..450c17efb47fbd788f6d738c7b071a72d2221907 100644 (file)
@@ -27,7 +27,7 @@ class Granim extends Graphic
        {
                while(width()< g.position+1)
                {
-                               graphicBuffer.add(color(0,0,0));
+                               graphicBuffer.add(lx.hsb(0,0,0));
                }
                drawAll();
                displayList.put(name , g);
@@ -55,7 +55,7 @@ class Granim extends Graphic
                        {
                                while(width()< g.position + g.width())
                                {
-                                       graphicBuffer.add(color(0,0,0));
+                                       graphicBuffer.add(lx.hsb(0,0,0));
                                }
                                if(g.changed)
                                {
@@ -141,7 +141,7 @@ class RedsGraphic extends Graphic
        {
                for(int i = 0; i < len ;i++)
                {
-                       graphicBuffer.add(color(0,255,255));
+                       graphicBuffer.add(lx.hsb(0,255,255));
                }
        }
 };
@@ -229,7 +229,7 @@ class ColorDotsGraphic extends Graphic
                super();
                for (int colorVal : colorSequence)
                {
-                       graphicBuffer.add(color(colorVal, 255, 255));
+                       graphicBuffer.add(lx.hsb(colorVal, 255, 255));
                }
                changed = true;
        }
diff --git a/JR.pde b/JR.pde
index cd494fa02b84a000f452c462ecf209595a720f8c..6692baaef5541e48215507a4fddbd3ef1b3080d3 100644 (file)
--- a/JR.pde
+++ b/JR.pde
@@ -1,4 +1,4 @@
-color BLACK = color(0, 0, 0);
+color BLACK = #000000;
 
 class Gimbal extends SCPattern {
 
@@ -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);
     }
     */
   }
@@ -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)
index a840882f26be1bfc28403da8e721ea491513062f..081ea40424c797e04594d75885808e17dba382a8 100644 (file)
@@ -64,7 +64,7 @@ class Swim extends SCPattern {
       float v1 = sin_x > y_in_range  ? (100 + 100*(y_in_range - sin_x)) : 0;     
 
       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, 70, v1);
     }
   }
 }
@@ -172,7 +172,7 @@ class Balance extends SCPattern {
       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.) + abs(p.y-model.yMax/2)*.2 + abs(p.z - model.zMax/2.)*.5)) % 360;
-      color c = color(hue_color, 80, v1);
+      color c = lx.hsb(hue_color, 80, v1);
 
       // Now draw the spheres
       for (Sphere s : spheres) {
@@ -197,7 +197,7 @@ class Balance extends SCPattern {
 
         float sphere_color = (lx.getBaseHuef() - (1 - hueScale.getValuef()) * d/r * 45) % 360;
 
-        c = blendColor(c, color((sphere_color + 270) % 360, 60, min(1, value) * 100), ADD);
+        c = blendColor(c, lx.hsb((sphere_color + 270) % 360, 60, min(1, value) * 100), ADD);
       }
       colors[p.index] = c;
     }
index 0eb12acd943dc3c0b25d8a167fb1dfcd6b90368e..b90a822b701809038463308727de8990a506eae7 100644 (file)
@@ -106,7 +106,7 @@ class Pulley extends SCPattern {
   private boolean isRising = false;
   
   private BasicParameter sz = new BasicParameter("SIZE", 0.5);
-  private BasicParameter beatAmount = new BasicParameter("BEAT", 0.1);
+  private BasicParameter beatAmount = new BasicParameter("BEAT", 0);
   
   Pulley(GLucose glucose) {
     super(glucose);
@@ -125,7 +125,7 @@ class Pulley extends SCPattern {
     int i = 0;
     for (Accelerator g : gravity) {
       if (isRising) {
-        g.setSpeed(random(40, 50), 0).start();
+        g.setSpeed(random(20, 33), 0).start();
       } else {
         g.setVelocity(0).setAcceleration(-420);
         delays[i].setDuration(random(0, 500)).trigger();
@@ -138,27 +138,31 @@ class Pulley extends SCPattern {
     if (reset.click()) {
       trigger();
     }
-    int j = 0;
-    for (Click d : delays) {
-      if (d.click()) {
-        gravity[j].start();
-        d.stop();
-      }
-      ++j;
-    }   
-    
-    for (Accelerator g : gravity) {
-      if (isRising) {
-        if (g.getValuef() > model.yMax) {
-          g.stop();
-        } else if (g.getValuef() > model.yMax*.55) {
-          if (g.getVelocityf() > 10) {
-            g.setAcceleration(-16);
-          } else {
-            g.setAcceleration(0);
-          }
+    if (isRising) {
+      // Fucking A, had to comment this all out because of that bizarre
+      // Processing bug where some simple loop takes an absurd amount of
+      // time, must be some pre-processor bug
+//      for (Accelerator g : gravity) {
+//        if (g.getValuef() > model.yMax) {
+//          g.stop();
+//        } else if (g.getValuef() > model.yMax*.55) {
+//          if (g.getVelocityf() > 10) {
+//            g.setAcceleration(-16);
+//          } else {
+//            g.setAcceleration(0);
+//          }
+//        }
+//      }
+    } else {
+      int j = 0;
+      for (Click d : delays) {
+        if (d.click()) {
+          gravity[j].start();
+          d.stop();
         }
-      } else {
+        ++j;
+      }
+      for (Accelerator g : gravity) {
         if (g.getValuef() < 0) {
           g.setValue(-g.getValuef());
           g.setVelocity(-g.getVelocityf() * random(0.74, 0.84));
@@ -172,11 +176,11 @@ class Pulley extends SCPattern {
     }
     float falloff = 100. / (3 + sz.getValuef() * 36 + fPos * beatAmount.getValuef()*48);
     for (Point p : model.points) {
-      int g = (int) constrain((p.x - model.xMin) * NUM_DIVISIONS / (model.xMax - model.xMin), 0, NUM_DIVISIONS-1);
+      int gi = (int) constrain((p.x - model.xMin) * NUM_DIVISIONS / (model.xMax - model.xMin), 0, NUM_DIVISIONS-1);
       colors[p.index] = lx.hsb(
         (lx.getBaseHuef() + abs(p.x - model.cx)*.8 + p.y*.4) % 360,
         constrain(130 - p.y*.8, 0, 100),
-        max(0, 100 - abs(p.y - gravity[g].getValuef())*falloff)
+        max(0, 100 - abs(p.y - gravity[gi].getValuef())*falloff)
       );
     }
   }
index 0b70698fcfb285eb36c6b2237736f1f5d05d55c7..350615dbdbb614016f99dfda9ba7b9619a54f2da 100644 (file)
@@ -18,7 +18,7 @@ class JazzRainbow extends SamPattern {
       float a = hv%250;
       if (i%2 == 0) {
         for (int b = 0; b < 70; b++) {
-         colors[(i+b)%colors.length] = color(a+i%250, 100, b*a%100);
+         colors[(i+b)%colors.length] = lx.hsb(a+i%250, 100, b*a%100);
         }
       }
     }
index a9428aa2fa793e647850e91c9ee359bce02be230..d718e3670f418bce183ef493308a25061716cd85 100644 (file)
@@ -130,7 +130,7 @@ class HelixPattern extends SCPattern {
       // For performance reasons, cut out points that are outside of
       // the tube where the toroidal coil lives.
       if (abs(myDist(p, axisPoint) - radius) > girth*.5f) {
-        return color(0,0,0);
+        return lx.hsb(0,0,0);
       }
 
       // Find the appropriate point for the current rotation
@@ -146,7 +146,7 @@ class HelixPattern extends SCPattern {
 
       // Soften edges by fading brightness.
       float b = constrain(100*(1 - ((d-.5*girth)/(girth*.5))), 0, 100);
-      return color((lx.getBaseHuef() + (360*(phase / TWO_PI)))%360, 80, b);
+      return lx.hsb((lx.getBaseHuef() + (360*(phase / TWO_PI)))%360, 80, b);
     }
   }
   
@@ -232,7 +232,7 @@ class HelixPattern extends SCPattern {
     float t = axis.getTValue(pt) + spokePhase;
     int spokeIndex = (int)floor((t - tMin + spokePeriod/2) / spokePeriod);
     if (spokeIndex < 0 || spokeIndex >= basePairs.length) {
-      return color(0,0,0);
+      return lx.hsb(0,0,0);
     }
     BasePairInfo basePair = basePairs[spokeIndex];
     Line spokeLine = basePair.line;
@@ -240,7 +240,7 @@ class HelixPattern extends SCPattern {
     float d = PVector.dist(pt, pointOnSpoke);
     float b = (PVector.dist(pointOnSpoke, spokeLine.getPoint()) < spokeRadius) ? constrain(100*(1 - ((d-.5*spokeGirth)/(spokeGirth*.5))), 0, 100) : 0.f;
     float phase = spokeLine.getTValue(pointOnSpoke) < 0 ? basePair.colorPhase1 : basePair.colorPhase2;
-    return color((lx.getBaseHuef() + (360*(phase / TWO_PI)))%360, 80.f, b);
+    return lx.hsb((lx.getBaseHuef() + (360*(phase / TWO_PI)))%360, 80.f, b);
   }
 
   void run(double deltaMs) {
@@ -259,15 +259,15 @@ class HelixPattern extends SCPattern {
       color spokeColor = calculateSpokeColor(pt);
 
       if (!h1on) {
-        h1c = color(0,0,0);
+        h1c = lx.hsb(0,0,0);
       }
 
       if (!h2on) {
-        h2c = color(0,0,0);
+        h2c = lx.hsb(0,0,0);
       }
 
       if (!spokesOn) {
-        spokeColor = color(0,0,0);
+        spokeColor = lx.hsb(0,0,0);
       }
 
       // The helices are positioned to not overlap.  If that changes,
index bbbaac3a34062faa38cd156207ad625385d9a7c9..a10e89ee01560db6104280148ac11a661bdc3250 100644 (file)
@@ -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;
@@ -249,8 +249,8 @@ 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.y) / 10, 2)) * 50),
-          color(220, 60, (float)Math.max(0, 1 - Math.pow((p.y - 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.x >= (raindrop.p.x - raindrop.radius) && p.x <= (raindrop.p.x + raindrop.radius) &&
@@ -258,7 +258,7 @@ class TimRaindrops extends SCPattern {
           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;
       }
@@ -473,10 +473,10 @@ class TimPlanes extends SCPattern {
         
         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;
         }
@@ -640,16 +640,16 @@ class TimPinwheels extends SCPattern {
       }
       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);
       }      
     }
   }
@@ -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);
     }
   }
 }
index 05231294dda9040f2d9cff6225679518f80e4e27..82ad4d27c0d1ee337602e1e9a38df62a8f4b8349 100644 (file)
@@ -30,7 +30,7 @@ class GlitchPlasma extends SCPattern {
          + 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++) {
@@ -122,7 +122,7 @@ class StripBounce extends SCPattern {
         float br = max(0,100-avgdist*4);
         for (Point 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;
           }
         }
@@ -187,7 +187,7 @@ class SoundRain extends SCPattern {
           for (Point 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]);
           }
         }
       }
@@ -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));
       }
     }
   }
@@ -292,7 +292,7 @@ class SoundSpikes extends SCPattern {
             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);
           }
         }
       }
index d616264b7bbb73f62f0677a8875b09f8356ef0e2..e568c4ea8eadea0cde0ae11615cfb86dc3813a23 100644 (file)
@@ -52,7 +52,6 @@ LXPattern[] patterns;
 MappingTool mappingTool;
 PandaDriver[] pandaBoards;
 MidiEngine midiEngine;
-color[] threadColors;
 
 // Display configuration mode
 boolean mappingMode = false;
@@ -61,6 +60,7 @@ DebugUI debugUI;
 boolean uiOn = true;
 LXPattern restoreToPattern = null;
 PImage logo;
+float[] hsb = new float[3];
 
 // Handles to UI objects
 UIContext[] overlays;
@@ -121,7 +121,6 @@ void setup() {
   glucose = new GLucose(this, buildModel());
   lx = glucose.lx;
   lx.enableKeyboardTempo();
-  threadColors = new color[lx.total];
   logTime("Built GLucose engine");
   
   // Set the patterns
@@ -267,12 +266,9 @@ void draw() {
   // Gamma correction here. Apply a cubic to the brightness
   // for better representation of dynamic range
   for (int i = 0; i < sendColors.length; ++i) {
-    float b = brightness(sendColors[i]) / 100.f;
-    sendColors[i] = color(
-      hue(sendColors[i]),
-      saturation(sendColors[i]),
-      (b*b*b) * 100.
-    );
+    lx.RGBtoHSB(sendColors[i], hsb);
+    float b = hsb[2];
+    sendColors[i] = lx.hsb(360.*hsb[0], 100.*hsb[1], 100.*(b*b*b));
   }
   
   // TODO(mcslee): move into GLucose engine
index ec590fef863e733c3b1fe335241d8ce43e60b544..f4a0a40796fe4a3a42e5360985eb032ab76ca282 100644 (file)
@@ -718,7 +718,7 @@ public class UIScrollList extends UIObject {
     }
     if (hasScroll) {
       pg.noStroke();
-      pg.fill(color(0, 0, 100, 15));
+      pg.fill(0x26ffffff);
       pg.rect(w-12, 0, 12, h);
       pg.fill(#333333);
       pg.rect(w-12, scrollYStart, 12, scrollYHeight);
index 336c147944128b00d9986e734b6c29e9bf4d878f..6069116fa5100282693f58bbf58e7c6134982384 100755 (executable)
Binary files a/code/HeronLX.jar and b/code/HeronLX.jar differ