Latest version of GLucose.jar
[SugarCubes.git] / DanHorwitz.pde
index b15bad9d1b6a801a8fd6ebe84610043f3248f8c0..3744086f2a9a5ab84e5eaeb1f0cc620f75cd72bd 100755 (executable)
@@ -14,7 +14,7 @@ public class Pong extends DPat {
                addModulator(y  = new SinLFO(cRad, ydMax - cRad, 0)).trigger(); y.modulateDurationBy(dy);\r
                addModulator(z  = new SinLFO(cRad, zdMax - cRad, 0)).trigger(); z.modulateDurationBy(dz);\r
            pSize       = addParam      ("Size"                 , 0.4   );\r
-           pChoose = addPick   ("Animiation"   , 0     , 3     );\r
+           pChoose = addPick   ("Animiation"   , 0     , 3, new String[] {"Pong", "Ball", "Cone"}      );\r
        }\r
 \r
        void    StartRun(double deltaMs)        { cRad = xdMax*pSize.Val()/6; }\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,20 +45,22 @@ 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
+       float           zTime   = random(10000), zTheta=0, zSin, zCos;\r
+       float           rtime   = 0, ttime      = 0, transAdd=0;\r
        _DhP            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
-               pRotZ   = addParam("RotZ"       , .5 ); pSpeed          = addParam("Fast", .55);\r
-               pDensity= addParam("Dens"       , .5);\r
-               pSymm   = addPick("Symmetry", 0, 4);    pChoose         = addPick("Animation", 1, 6);\r
+               pRotZ   = addParam("RotZ"        , .5 );        pSpeed          = addParam("Fast", .55);\r
+               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
@@ -62,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
@@ -113,21 +133,25 @@ public class Play extends DPat
        int             nBeats  =       0;\r
        _DhP    pAmp, pRad;\r
        _DhP    pRotX, pRotY, pRotZ;\r
-       xyz             Theta = new xyz();\r
+       xyz             Theta   = new xyz();\r
+       xyz             TSin    = new xyz();\r
+       xyz             TCos    = new xyz();\r
+       \r
        Pick    pTimePattern, pTempoMult, pShape, pForm;\r
        int             RandCube;\r
 \r
        Play(GLucose glucose) {\r
                super(glucose);\r
-           pAmp                = addParam("Amp" , .2);\r
                pRotX           = addParam("RotX", .5);\r
                pRotY           = addParam("RotY", .5);\r
                pRotZ           = addParam("RotZ", .5);\r
-           pRad                = addParam("Rad" , .1           );\r
-               pTimePattern= addPick ("TimePattern", 0 , 5             );\r
-               pTempoMult      = addPick ("TimeMult"   , 0 , 6         );\r
-               pShape          = addPick ("Shape"              , 0 , 16        );\r
-               pForm           = addPick ("Form"               , 0 , 3         );\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", "Sin", "Roll", "Quant", "Accel"       }       );\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
        }\r
 \r
        float   t,a;\r
@@ -139,12 +163,12 @@ public class Play extends DPat
                t = lx.tempo.rampf();\r
                a = pAmp.Val();\r
 \r
-               Theta.x = pRotX.ZeroOrOne() ? 0 :(pRotX.Val()-.5)*10;\r
-               Theta.y = pRotY.ZeroOrOne() ? 0 :(pRotY.Val()-.5)*10;\r
-               Theta.z = pRotZ.ZeroOrOne() ? 0 :(pRotZ.Val()-.5)*10;\r
+               Theta   .set(pRotX.Val()*PI*2, pRotY.Val()*PI*2, pRotZ.Val()*PI*2);\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) { CurRandTempo = int(random(4)); } LastMeasure = t;\r
-               \r
+\r
                switch (pTempoMult.Cur()) {\r
                        case 0:         t = t;                                                          break;\r
                        case 1:         t = (t*2. )%1.;                                         break;\r
@@ -164,43 +188,44 @@ public class Play extends DPat
                        case 4:         t = t*t*t;                                                      break;\r
                }\r
 \r
-               cMid            = cPrev.interpolate(t,cCur);\r
-               cMidNorm        = cMid.setNorm();\r
+               \r
+               cMid                            = cPrev.interpolate(t,cCur);\r
+               cMidNorm                        = cMid.setNorm();\r
        }\r
 \r
        color CalcPoint(xyz Px) {\r
-               xyz V           = new xyz();\r
-               xyz P           = Px.setNorm();\r
-               if (Theta.x>0)  P = P.RotateZ(xyzHalf, Theta.x);\r
-               if (Theta.y>0)  P = P.RotateZ(xyzHalf, Theta.y);\r
-               if (Theta.z>0)  P = P.RotateZ(xyzHalf, Theta.z);\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
 \r
                switch (pShape.Cur()) {\r
-                       case 0:         V = new xyz(P.x, yt                                                             , P.z);                                         break;  // bouncing line\r
-                       case 1:         V = new xyz(P.x, map(cos(PI*t * P.x),-1,1,0,1)  , P.z);                                         break;  // top tap\r
-                       case 2:         V = new xyz(P.x, a*map(P.x<.5?P.x:1-P.x,0,.5 ,0,t-.5)+.5, P.z);                         break;  // V shape\r
-                       case 3:         V = new xyz(P.x, P.x < cMidNorm.x ? map(P.x,0,cMidNorm.x, .5,yt) :\r
-                                                                                                                       map(P.x,cMidNorm.x,1, yt,.5), P.z);             break;  //  Random V shape\r
-\r
-                       case 4:         V = new xyz(P.x, .5*(P.x < cMidNorm.x ? map(P.x,0,cMidNorm.x, .5,yt) :\r
-                                                                                                                        map(P.x,cMidNorm.x,1, yt,.5)) +\r
-                                                                                .5*(P.z < cMidNorm.z ? map(P.z,0,cMidNorm.z, .5,yt) :\r
-                                                                                                                        map(P.z,cMidNorm.z,1, yt,.5)), P.z);   break;  //  Random Pyramid shape\r
+                       case 0:         V.set(P.x, yt                                                     , P.z);                                                       break;  // bouncing line\r
+                       case 1:         V.set(P.x, map(cos(PI*t * P.x),-1,1,0,1)  , P.z);                                                       break;  // top tap\r
+                       case 2:         V.set(P.x, a*map(P.x<.5?P.x:1-P.x,0,.5 ,0,t-.5)+.5, P.z);                                       break;  // V shape\r
+                       case 3:         V.set(P.x, P.x < cMidNorm.x ? map(P.x,0,cMidNorm.x, .5,yt) :\r
+                                                                                                         map(P.x,cMidNorm.x,1, yt,.5), P.z);                   break;  //  Random V shape\r
+\r
+                       case 4:         V.set(P.x,      .5*(P.x < cMidNorm.x ?  map(P.x,0,cMidNorm.x, .5,yt) :\r
+                                                                                                                       map(P.x,cMidNorm.x,1, yt,.5)) +\r
+                                                                       .5*(P.z < cMidNorm.z ?  map(P.z,0,cMidNorm.z, .5,yt) :\r
+                                                                                                                       map(P.z,cMidNorm.z,1, yt,.5)), P.z);    break;  //  Random Pyramid shape\r
                                                                                                                        \r
-                       case 5:         V = new xyz(P.x, a*map((P.x-.5)*(P.x-.5),0,.25,0,t-.5)+.5, P.z);                        break;  // wings\r
-                       case 6:         V = new xyz(P.x, a*map((mp -.5)*(mp -.5),0,.25,0,t-.5)+.5, P.z);                        break;  // wings\r
+                       case 5:         V.set(P.x, a*map((P.x-.5)*(P.x-.5),0,.25,0,t-.5)+.5, P.z);                                      break;  // wings\r
+                       case 6:         V.set(P.x, a*map((mp -.5)*(mp -.5),0,.25,0,t-.5)+.5, P.z);                                      break;  // wings\r
 \r
-                       case 7:         V = new xyz(cMid.x,cMid.y,cMid.z);\r
+                       case 7:         V.set(cMid.x,cMid.y,cMid.z);\r
                                                return color(0,0,c1c(1 - (V.distance(Px) > (pRad.getValuef()+.1)*150?1:0)) );           // sphere\r
 \r
-                       case 8:         V = new xyz(cMid.x,cMid.y,cMid.z);\r
+                       case 8:         V.set(cMid.x,cMid.y,cMid.z);\r
                                                return color(0,0,c1c(1 - CalcCone(Px,V,xyzMid) * 0.02 > .5?1:0));                                       // cone\r
 \r
                        case 9:         return color(100 + noise(P.x,P.y,P.z + (NoiseMove+50000)/1000.)*200,\r
-                                                                       85,c1c(P.y < noise(P.x + NoiseMove/2000.,P.z)*(1+a)-a/2.-.1 ? 1 : 0));          //\r
+                                                       85,c1c(P.y < noise(P.x + NoiseMove/2000.,P.z)*(1+a)-a/2.-.1 ? 1 : 0));                  //\r
                }\r
 \r
 \r