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 841a2ff9a0980faa7d5b9f588d77fe2e2d0f510e..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);
@@ -403,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;
@@ -460,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));