updates on dpat
[SugarCubes.git] / DanHorwitz.pde
index e8780db26473ad44a31197f7bb9c7a6efd08e98a..d73b6c48191cc3580e32035e472984e5c99780dc 100755 (executable)
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------------------------------------------------------------\r
 public class Pong extends DPat {\r
        SinLFO x,y,z,dx,dy,dz; \r
-       float cRad;     _DhP pSize;\r
+       float cRad;     DParam pSize;\r
        Pick  pChoose;\r
 \r
        Pong(GLucose glucose) {\r
@@ -30,9 +30,14 @@ public class Pong extends DPat {
 }\r
 //----------------------------------------------------------------------------------------------------------------------------------\r
 public class NDat {\r
-       float xz, yz, zz, hue, sat, speed, angle, den;\r
-       float xoff,yoff,zoff;\r
-       NDat (float _hue, float _sat, float _xz, float _yz, float _zz, float _den, float _speed, float _angle) {\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
@@ -40,14 +45,14 @@ public class NDat {
 \r
 public class Noise extends DPat\r
 {\r
-       int             CurAnim = -1, numAnims = 6;\r
-       float           zTime   = random(10000), zTheta=0;\r
-       float           rtime   = 0, ttime      = 0, transAdd=0;\r
+       int                     CurAnim, iSymm;\r
        int             XSym=1,YSym=2,RadSym=3;\r
-       int                     iSymm;\r
-       ArrayList       noises  = new ArrayList();\r
-       _DhP            pSpeed , pDensity, pRotZ;\r
+       float           zTime   = random(10000), zTheta=0, zSin, zCos;\r
+       float           rtime   = 0, ttime      = 0, transAdd=0;\r
+       DParam          pSpeed , pDensity, pRotZ;\r
        Pick            pChoose, pSymm;\r
+       int                     _ND = 4;\r
+       NDat            N[] = new NDat[_ND];\r
 \r
        Noise(GLucose glucose) {\r
                super(glucose);\r
@@ -55,6 +60,7 @@ public class Noise extends DPat
                pDensity= addParam("Dens"        , .5);\r
                pSymm   = addPick("Symmetry" , 0, 4, new String[] {"None", "X", "Y", "Radial"}  );\r
                pChoose = addPick("Animation", 1, 6, new String[] {"Drip", "Cloud", "Rain", "Fire", "Machine", "Spark"} );\r
+               for (int i=0; i<_ND; i++) N[i] = new NDat();\r
        }\r
 \r
        void StartRun(double deltaMs) {\r
@@ -63,42 +69,55 @@ public class Noise extends DPat
                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
-                       noises.clear(); CurAnim = pChoose.Cur(); ttime = rtime;\r
+                       CurAnim = pChoose.Cur(); ttime = rtime;\r
+                       pRotZ           .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: noises.add(new NDat(0  ,0  ,75 ,75 ,150,45 ,3  ,0  )); pSharp.Set(1 ); break;   // drip\r
-                       case 1: noises.add(new NDat(0  ,0  ,100,100,200,45 ,3  ,180)); pSharp.Set(0 ); break;   // clouds\r
-                       case 2: noises.add(new NDat(0  ,0  ,2  ,400,2  ,20 ,3  ,0  )); pSharp.Set(.5); break;   // rain\r
-                       case 3: noises.add(new NDat(40 ,1  ,100,100,200,10 ,1  ,180)); \r
-                                       noises.add(new NDat(0  ,1  ,100,100,200,10 ,5  ,180)); pSharp.Set(0 ); break;   // fire 1\r
-                       case 4: noises.add(new NDat(0  ,1  ,40 ,40 ,40 ,15 ,2.5,180));\r
-                                       noises.add(new NDat(20 ,1  ,40 ,40 ,40 ,15 ,4  ,0  ));\r
-                                       noises.add(new NDat(40 ,1  ,40 ,40 ,40 ,15 ,2  ,90 ));\r
-                                       noises.add(new NDat(60 ,1  ,40 ,40 ,40 ,15 ,3  ,-90)); pSharp.Set(.5); break;   // machine\r
-                       case 5: noises.add(new NDat(0  ,1  ,400,100,2  ,15 ,3  ,90 ));\r
-                                       noises.add(new NDat(20 ,1  ,400,100,2  ,15 ,2.5,0  ));\r
-                                       noises.add(new NDat(40 ,1  ,100,100,2  ,15 ,2  ,180));\r
-                                       noises.add(new NDat(60 ,1  ,100,100,2  ,15 ,1.5,270)); pSharp.Set(.5); break;   // spark\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
 \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
-               xyz v   = P.RotateZ(xyzMid,zTheta);\r
-               if (iSymm == XSym && v.x > xdMax/2) v.x = xdMax-v.x;\r
-               if (iSymm == YSym && v.y > ydMax/2) v.y = ydMax-v.y;\r
-\r
-               for (int i=0;i<noises.size(); i++) {\r
-                       NDat  n     = (NDat) noises.get(i);\r
-                       float zx    = zTime * n.speed * sin(radians(n.angle)),\r
-                                 zy    = zTime * n.speed * cos(radians(n.angle));\r
+               P.RotateZ(xyzMid, zSin, zCos);\r
+               \r
+               if (iSymm == XSym && P.x > xdMax/2) P.x = xdMax-P.x;\r
+               if (iSymm == YSym && P.y > ydMax/2) P.y = ydMax-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(v,xyzMid)/n.xz)\r
-                                                                                : noise(v.x/n.xz+zx+n.xoff,v.y/n.yz+zy+n.yoff,v.z/n.zz+n.zoff))\r
+                       float b     = (iSymm==RadSym ? noise(zTime*n.speed+n.xoff-Dist(P,xyzMid)/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
@@ -112,8 +131,8 @@ public class Noise extends DPat
 public class Play extends DPat\r
 {\r
        int             nBeats  =       0;\r
-       _DhP    pAmp, pRad;\r
-       _DhP    pRotX, pRotY, pRotZ;\r
+       DParam  pAmp, pRad;\r
+       DParam  pRotX, pRotY, pRotZ;\r
        xyz             Theta   = new xyz();\r
        xyz             TSin    = new xyz();\r
        xyz             TCos    = new xyz();\r
@@ -128,8 +147,8 @@ public class Play extends DPat
                pRotZ           = addParam("RotZ", .5);\r
            pAmp                = addParam("Amp" , .2);\r
            pRad                = addParam("Rad"        , .1            );\r
-               pTempoMult      = addPick ("TMult"      , 0 , 6         , new String[] {"1x", "2x", "4x", "8x", "16x", "Rand"   }       );\r
-               pTimePattern= addPick ("TPat"   , 0 , 5         , new String[] {"Bounce", "?", "Roll", "Quant", "Accel" }       );\r
+               pTempoMult      = addPick ("TMult"      , 5 , 6         , new String[] {"1x", "2x", "4x", "8x", "16x", "Rand"   }       );\r
+               pTimePattern= addPick ("TPat"   , 5 , 6         , new String[] {"Bounce", "Sin", "Roll", "Quant", "Accel", "Rand"       }       );\r
                pShape          = addPick ("Shape"      , 0 , 10        , new String[] {"Line", "Tap", "V", "RandV", "Pyramid",\r
                                                                                                                                        "Wings", "W2", "Sphere", "Cone", "Noise" }      );\r
                pForm           = addPick ("Form"       , 0 , 3         , new String[] {"Bar", "Volume", "Fade"                                 }       );\r
@@ -138,7 +157,7 @@ public class Play extends DPat
        float   t,a;\r
        xyz             cPrev = new xyz(), cCur = new xyz(), cMid = new xyz(), cMidNorm;\r
        float   LastBeat=3, LastMeasure=3;\r
-       int             CurRandTempo = 1;\r
+       int             CurRandTempo = 1, CurRandTPat = 1;\r
 \r
        void StartRun(double deltaMs) {\r
                t = lx.tempo.rampf();\r
@@ -148,20 +167,25 @@ public class Play extends DPat
                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) { CurRandTempo = int(random(4)); } LastMeasure = t;\r
+               if (t<LastMeasure) {\r
+                       if (random(2) < 1) CurRandTempo = int(random(4));\r
+                       if (random(2) < 1) CurRandTPat  = int(random(5));\r
+               } LastMeasure = t;\r
+                       \r
+               int nTempo = pTempoMult  .Cur(); if (nTempo == 5) nTempo = CurRandTempo;\r
+               int nTPat  = pTimePattern.Cur(); if (nTPat  == 5) nTPat  = CurRandTPat ;\r
 \r
-               switch (pTempoMult.Cur()) {\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
-                       case 5:         t = (t*pow(2,CurRandTempo))%1.;         break;\r
                }\r
 \r
                if (t<LastBeat) { cPrev = cCur; cCur = cCur.setRand(); } LastBeat = t;\r
 \r
-               switch (pTimePattern.Cur()) {\r
+               switch (nTPat) {\r
                        case 0:         t = sin(PI*t);                                          break;\r
                        case 1:         t = norm(sin(2*PI*(t+PI/2)),-1,1);      break;\r
                        case 2:         t = t;                                                          break;\r
@@ -175,9 +199,11 @@ public class Play extends DPat
        }\r
 \r
        color CalcPoint(xyz Px) {\r
-               xyz V           =       new xyz();\r
-               xyz P           =       Px.setNorm();\r
-                                               P.RotateXYZ(xyzHalf, Theta, TSin, TCos);\r
+               xyz V           =                       new xyz();\r
+               xyz P           =                       Px.setNorm();\r
+               if (Theta.x != 0)               P.RotateX(xyzHalf, TSin.x, TCos.x);\r
+               if (Theta.y != 0)               P.RotateY(xyzHalf, TSin.y, TCos.y);\r
+               if (Theta.z != 0)               P.RotateZ(xyzHalf, TSin.z, TCos.z);\r
 \r
                float mp        = min(P.x, P.z);\r
                float yt        = map(t,0,1,.5-a/2,.5+a/2);\r