More DPat Fixes

[SugarCubes.git] / DanHorwitz.pde

diff --git a/DanHorwitz.pde b/DanHorwitz.pde
index 51b22cd22ee015a122e71b4f86d69c042aadd9a3..e8780db26473ad44a31197f7bb9c7a6efd08e98a 100755 (executable)
--- a/DanHorwitz.pde
+++ b/DanHorwitz.pde
@@ -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
@@ -51,9 +51,10 @@ public class Noise extends DPat
 \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
        }\r
 \r
        void StartRun(double deltaMs) {\r
@@ -122,15 +123,16 @@ public class Play extends DPat
 \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", "?", "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
@@ -147,7 +149,7 @@ public class Play extends DPat
                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
@@ -167,8 +169,9 @@ 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