more dpat fixes
[SugarCubes.git] / DanHorwitz.pde
index a51f0a407a7484dd3a9dd1ec99e10095cf8f3415..96101809f59680b0bf91b23f0d156db0f04ddc2f 100755 (executable)
@@ -7,25 +7,25 @@ public class Pong extends DPat {
 \r
        Pong(GLucose glucose) {\r
                super(glucose);\r
-               cRad = xdMax/15;\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, xdMax - cRad, 0)).trigger(); x.modulateDurationBy(dx);\r
-               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
+               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     , 3, new String[] {"Pong", "Ball", "Cone"}      );\r
        }\r
 \r
-       void    StartRun(double deltaMs)        { cRad = xdMax*pSize.Val()/6; }\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
                switch(pChoose.Cur()) {\r
-               case 0: vMir.set(xyzdMax); vMir.subtract(p);\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(xdMax/2,0,zdMax/2);\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
@@ -109,17 +109,17 @@ public class Noise extends DPat
 \r
        color CalcPoint(xyz P) {\r
                color c = 0;\r
-               P.RotateZ(xyzMid, zSin, zCos);\r
+               P.RotateZ(mCtr, 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
+               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,xyzMid)/n.xz)\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
@@ -133,11 +133,29 @@ public class Noise extends DPat
 //----------------------------------------------------------------------------------------------------------------------------------\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
        int             nBeats  =       0;\r
        DParam  pAmp, pRad;\r
        DParam  pRotX, pRotY, pRotZ;\r
 \r
        float   t,amp;\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
@@ -157,11 +175,10 @@ public class Play extends DPat
                pRotZ           = addParam("RotZ", .5);\r
            pAmp                = addParam("Amp" , .2);\r
            pRad                = addParam("Rad"        , .1            );\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"      , 4 , 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
+               pTempoMult      = addPick ("TMult"      , 0 , 6         , new String[] {"1x", "2x", "4x", "8x", "16x", "Rand"   }       );\r
+               pTimePattern= addPick ("TPat"   , 6 , 8         , new String[] {"Bounce", "Sin", "Roll", "Quant", "Accel", "Deccel", "Slide", "Rand"}   );\r             pShape          = addPick ("Shape"      , 8 , 12        , new String[] {"Line", "Tap", "V", "RandV", "Pyramid", "Wings", "W2", "Clock",\r
+                                                                                                                                       "RSphere", "Sphere", "Cone", "Noise" }                                  );\r
+               pForm           = addPick ("Form"       , 0 , 3         , new String[] {"Bar", "Volume", "Fade"}                                                                );\r
        }\r
 \r
        void StartRun(double deltaMs) {\r
@@ -173,12 +190,12 @@ public class Play extends DPat
                TCos    .set(cos(Theta.x), cos(Theta.y), cos(Theta.z));\r
 \r
                if (t<LastMeasure) {\r
-                       if (random(2) < 1) CurRandTempo = int(random(4));\r
-                       if (random(2) < 1) CurRandTPat  = int(random(5));\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  == 5) nTPat  = CurRandTPat ;\r
+               int nTPat  = pTimePattern.Cur(); if (nTPat  == 7) nTPat  = CurRandTPat ;\r
 \r
                switch (nTempo) {\r
                        case 0:         t = t;                                                          break;\r
@@ -188,61 +205,83 @@ public class Play extends DPat
                        case 4:         t = (t*16.)%1.;                                         break;\r
                }\r
 \r
-               if (t<LastBeat) { cPrev.set(cRand); cRand.setRand(); } LastBeat = t;\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;\r
-                       case 1:         t = norm(sin(2*PI*(t+PI/2)),-1,1);      break;\r
-                       case 2:         t = t;                                                          break;\r
-                       case 3:         t = constrain(int(t*8)/7.,0,1);         break;\r
-                       case 4:         t = t*t*t;                                                      break;\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
+               \r
                cMid.set                (cPrev);        cMid.interpolate        (t,cRand);\r
                cMidNorm.set    (cMid);         cMidNorm.setNorm();\r
+\r
+               a1.move(); a2.move(); a3.move(); a4.move();\r
        }\r
 \r
        color CalcPoint(xyz Px) {\r
-               Px.zoomX(1.3);\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
-               if (Theta.x != 0)               Pn.RotateX(xyzHalf, TSin.x, TCos.x);\r
-               if (Theta.y != 0)               Pn.RotateY(xyzHalf, TSin.y, TCos.y);\r
-               if (Theta.z != 0)               Pn.RotateZ(xyzHalf, TSin.z, TCos.z);\r
 \r
                float mp        = min(Pn.x, Pn.z);\r
                float yt        = map(t,0,1,.5-amp/2,.5+amp/2);\r
+               float rad       = pRad.getValuef();\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, amp*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, amp*map((Pn.x-.5)*(Pn.x-.5),0,.25,0,t-.5)+.5, Pn.z);                                break;  // wings\r
-                       case 6: V.set(Pn.x, amp*map((mp -.5)*(mp -.5),0,.25,0,t-.5)+.5, Pn.z);                                  break;  // wings\r
-\r
-                       case 7: V.set(cMid); return color(0,0,c1c(1 - (V.distance(Px) > (pRad.getValuef()+.1)*150?1:0)) );      // sphere\r
-                       case 8: V.set(cMid); return color(0,0,c1c(1 - CalcCone(Px,V,xyzMid) * 0.02 > .5?1:0));                          // cone\r
-                       case 9: \r
-                               \r
-                               \r
-                       case 10:        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
-                       default:        return color(0,0,0);\r
-               }\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, amp*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, amp*map((Pn.x-.5)*(Pn.x-.5),0,.25,0,t-.5)+.5, Pn.z);                                break;  // wings\r
+               case 6:         V.set(Pn.x, amp*map((mp  -.5)*(mp  -.5),0,.25,0,t-.5)+.5, Pn.z);                                break;  // wings\r
+\r
+               case 7:         return color(0,0, 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)) <rad*40?100:0); // clock\r
+\r
+//             case 8:         return color(0,0,c1c(.9+2*pRad.getValuef() - Px.distance(a1.x,a1.y)*.03) );             // sphere - radial\r
 \r
+               case 8:         float r = amp*200;\r
+                                       return color(0,0, 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))\r
+                                               ) <rad*40?100:0); // shape\r
+\r
+\r
+               case 9:         return color(0,0,c1c(.9+2*pRad.getValuef() - cMid.distance(Px)*.03) );          // sphere - radial\r
+\r
+               case 10:        return color(0,0,c1c(1 - CalcCone(Px,cMid,mCtr) * 0.02 > .5?1:0));                              // cone\r
+\r
+               case 11:        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
+               default:        return color(0,0,0);\r
+               }\r
 \r
                switch (pForm.Cur()) {\r
-                       case 0:         return color(0,0,c1c(1 - V.distance(Pn)/pRad.getValuef() > .5?1:0));\r
+                       case 0:         return color(0,0,c1c(1 - V.distance(Pn)/rad > .5?1:0));\r
                        case 1:         return color(0,0,c1c(Pn.y < V.y ?1:0));\r
-                       case 2:         return color(0,0,c1c(1 - V.distance(Pn)/pRad.getValuef()));\r
+                       case 2:         return color(0,0,c1c(1 - V.distance(Pn)/rad));\r
 \r
                        default:        return color(0,0,c1c(Pn.y < V.y ?1:0));\r
                }\r