Apat and added acos to spherycolor, not included in color yet but working

[SugarCubes.git] / DanHorwitz.pde

diff --git a/DanHorwitz.pde b/DanHorwitz.pde
index 01904013009f04332910bbd9f9081c6f10e92ca0..ab23fa5ddd69805b312811cb9211278a93f7b1a1 100644 (file)
--- a/DanHorwitz.pde
+++ b/DanHorwitz.pde
@@ -71,7 +71,7 @@ public class Noise extends DPat
 
        void StartRun(double deltaMs) {
                zTime   += deltaMs*(val(pSpeed)-.5)*.002        ;
-               zTheta  += deltaMs*(val(pSpin )-.5)*.01 ;
+               zTheta  += deltaMs*(spin()-.5)*.01      ;
                rtime   += deltaMs;
                iSymm    = pSymm.Cur();
                zSin    = sin(zTheta);
@@ -157,13 +157,14 @@ public class Play extends DPat
                                                                        prvR    = dstR;         dstR    = random(mCtr.y);                                                                       }
        }
 
-       int             nBeats  =       0;
        BasicParameter  pAmp, pRadius, pBounce;
+       Pick                    pTimePattern, pTempoMult, pShape;
 
-       float   t,amp,rad,bnc;
-       float   zTheta=0;
        ArrayList<rWave> waves = new ArrayList<rWave>(10);
 
+       int             nBeats  =       0;
+       float   t,amp,rad,bnc,zTheta=0;
+
        rAngle  a1              = new rAngle(), a2                      = new rAngle(),
                        a3              = new rAngle(), a4                      = new rAngle();
        PVector cPrev   = new PVector(), cRand          = new PVector(),
@@ -173,7 +174,6 @@ public class Play extends DPat
                        Pn              = new PVector();
        float   LastBeat=3, LastMeasure=3;
        int             curRandTempo = 1, curRandTPat = 1;
-       Pick    pTimePattern, pTempoMult, pShape;
 
        Play(GLucose glucose) {
                super(glucose);
@@ -206,6 +206,7 @@ public class Play extends DPat
                }
        }
 
+       void onReset()  { zTheta=0; super.onReset(); }
        void onActive() { 
                zTheta=0; 
                while (lx.tempo.bpm() > 40) lx.tempo.setBpm(lx.tempo.bpm()/2);
@@ -354,15 +355,7 @@ public class Play extends DPat
        }
 }
 //----------------------------------------------------------------------------------------------------------------------------------
-// 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
-
-int randDir() { return round(random(1))*2-1; }
-//----------------------------------------------------------------------------------------------------------------------------------
-boolean dDebug = true;
+boolean dDebug = false;
 class dCursor {
        dVertex vCur, vNext, vDest;
        float   destSpeed;
@@ -410,7 +403,7 @@ class dCursor {
                evalTurn(vCur.t2);                      evalTurn(vCur.t3);
        }
 
-       Point   p1, p2; int i2;
+       LXPoint         p1, p2; int i2;
 
        int draw(int nAmount, SCPattern pat) {
                int nFrom       = (pos    ) >> 12;
@@ -467,13 +460,14 @@ class Worms extends SCPattern {
            addParameter(pEQ);      addParameter(pConfusion);
                addParameter(pSpawn);   addParameter(pColor);
 
-           middle = new PVector(model.cx, model.cy, 71);
+           middle = new PVector(1.5*model.cx, 1.5*model.cy, 71);
                if (lattice == null) lattice = new dLattice();
                for (int i=0; i<numCursors; i++) { dCursor c = new dCursor(); reset(c); cur.add(c); }
                onParameterChanged(pEQ); setNewDest();
        }
 
        void onParameterChanged(LXParameter parameter) {
+               super.onParameterChanged(parameter);
                nConfusion = 1-pConfusion.getValuef();
                for (int i=0; i<numCursors; i++) {
                        if (parameter==pSpawn) reset(cur.get(i));