proposed new lattice, plus dpat changes
[SugarCubes.git] / DanHorwitz.pde
index 96101809f59680b0bf91b23f0d156db0f04ddc2f..3d72b5fddfd68c49beff96b763fc5a713c708284 100755 (executable)
@@ -15,12 +15,13 @@ public class Pong extends DPat {
                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
+           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
@@ -50,25 +51,25 @@ public class Noise extends DPat
 {\r
        int                     CurAnim, iSymm;\r
        int             XSym=1,YSym=2,RadSym=3;\r
-       float           zTime   = random(10000), zTheta=0, zSin, zCos;\r
-       float           rtime   = 0, ttime      = 0, transAdd=0;\r
-       DParam          pSpeed , pDensity, pRotZ;\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
-               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
+               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*(pRotZ .Val()-.5)*.01        ;\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
@@ -77,8 +78,8 @@ public class Noise extends DPat
 \r
                if (pChoose.Cur() != CurAnim) {\r
                        CurAnim = pChoose.Cur(); ttime = rtime;\r
-                       pRotZ           .reset();       zTheta          = 0;\r
-                       pDensity        .reset();       pSpeed          .reset();       \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
@@ -111,6 +112,14 @@ public class Noise extends DPat
                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
@@ -149,11 +158,14 @@ public class Play extends DPat
                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, pRad;\r
-       DParam  pRotX, pRotY, pRotZ;\r
+       DParam  pAmp, pRadius, pBounce;\r
 \r
-       float   t,amp;\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
@@ -164,28 +176,48 @@ public class Play extends DPat
        float   LastBeat=3, LastMeasure=3;\r
        int             CurRandTempo = 1, CurRandTPat = 1;\r
 \r
-\r
-       Pick    pTimePattern, pTempoMult, pShape, pForm;\r
+       Pick    pTimePattern, pTempoMult, pShape;\r
        int             RandCube;\r
 \r
        Play(GLucose glucose) {\r
                super(glucose);\r
-               pRotX           = addParam("RotX", .5);\r
-               pRotY           = addParam("RotY", .5);\r
-               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"   , 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
+           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);\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
@@ -205,6 +237,21 @@ public class Play extends DPat
                        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
@@ -220,10 +267,8 @@ public class Play extends DPat
                        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
@@ -235,56 +280,70 @@ public class Play extends DPat
                Pn.set(Px); Pn.setNorm();\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
+               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, amp*map(Pn.x<.5?Pn.x:1-Pn.x,0,.5 ,0,t-.5)+.5, Pn.z);                                break;  // V shape\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
+                                                                                                               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
+               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:         return color(0,0, min(\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)) <rad*40?100:0); // clock\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:         return color(0,0,c1c(.9+2*pRad.getValuef() - Px.distance(a1.x,a1.y)*.03) );             // sphere - radial\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 8:         float r = amp*200;\r
-                                       return color(0,0, min(\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))\r
-                                               ) <rad*40?100:0); // shape\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 9:         return color(0,0,c1c(.9+2*pRad.getValuef() - cMid.distance(Px)*.03) );          // sphere - radial\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 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
+               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
-               switch (pForm.Cur()) {\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)/rad));\r
-\r
-                       default:        return color(0,0,c1c(Pn.y < V.y ?1:0));\r
-               }\r
+               return color(0,\r
+                               150-c1c(1 - V.distance(Pn)/rad),\r
+                               c1c(1 - V.distance(Pn)/rad));\r
        }\r
 }\r
 //----------------------------------------------------------------------------------------------------------------------------------\r