New ViolinWave pattern to play with for Paramount show
[SugarCubes.git] / DanUtil.pde
index 9577673d0ca5ca6f77025d8bbb9fb50d37ff4af0..f6b3a815814e66af1cdfc4882eb9cecfc30c6005 100644 (file)
 //----------------------------------------------------------------------------------------------------------------------------------
-static         MidiOutput midiout;
-int            nNumRows  = 5, nNumCols = 8;
-float xdMax,ydMax,zdMax;
-String DanTextLine1 = "", DanTextLine2 = "";
+xyz                    mMax, mCtr, mHalf;
+int                    NumApcRows = 5, NumApcCols = 8;
+DGlobals       DG = new DGlobals();
+
+boolean btwn   (int            a,int    b,int          c)              { return a >= b && a <= c;      }
+boolean btwn   (double         a,double b,double       c)              { return a >= b && a <= c;      }
+float  interp  (float a, float b, float c) { return (1-a)*b + a*c; }
+float  randctr (float a) { return random(a) - a*.5; }
+float  min             (float a, float b, float c, float d) { return min(min(a,b),min(c,d)); }
+
+float  distToSeg       (float x, float y, float x1, float y1, float x2, float y2) {
+       float A                         = x - x1, B = y - y1, C = x2 - x1, D = y2 - y1;
+       float dot                       = A * C + B * D, len_sq = C * C + D * D;
+       float xx, yy,param      = dot / len_sq;
+       
+       if (param < 0 || (x1 == x2 && y1 == y2)) {      xx = x1; yy = y1; }
+       else if (param > 1) {                                           xx = x2; yy = y2; }
+       else {                                                                          xx = x1 + param * C;
+                                                                                               yy = y1 + param * D; }
+       float dx = x - xx, dy = y - yy;
+       return sqrt(dx * dx + dy * dy);
+}
 
-boolean btwn  (int             a,int    b,int          c)              { return a >= b && a <= c;      }
-boolean btwn  (double  a,double b,double       c)              { return a >= b && a <= c;      }
 
 public class Pick {
-       Pick    (String label, int _Def, int _Max)      { NumPicks=_Max; Default = _Def; tag=label;                                                             }
-       int             Cur()                                                           { return (CurRow-StartRow)*nNumCols + CurCol;                                                           }
-       int     NumPicks, Default, CurRow, CurCol, StartRow, EndRow;
-       String  tag;
+       int     NumPicks, Default       ,       CurRow  , CurCol        ,
+                       StartRow, EndRow        ;
+       String  tag             , Desc[]        ;
+       
+       Pick    (String label, int _Def, int _Num,      int nStart, String d[]) {
+               NumPicks        = _Num;         Default = _Def; 
+               StartRow        = nStart;       EndRow  = StartRow + floor((NumPicks-1) / NumApcCols);
+               tag                     = label;        Desc    = d;
+               reset();
+       }
+
+       int             Cur()                   { return (CurRow-StartRow)*NumApcCols + CurCol;                                 }
+       String  CurDesc()               { return Desc[Cur()]; }
+       void    reset()                 { CurCol = Default % NumApcCols; CurRow = StartRow + Default / NumApcCols; }
+
+       boolean set(int r, int c)       {
+               if (!btwn(r,StartRow,EndRow) || !btwn(c,0,NumApcCols-1) ||
+                       !btwn((r-StartRow)*NumApcCols + c,0,NumPicks-1))        return false;
+               CurRow=r; CurCol=c;                                                                     return true;
+       }
 }
-//----------------------------------------------------------------------------------------------------------------------------------
-public class _DhP extends BasicParameter {
-       double  dflt;   
-       _DhP    (String label, double value)            { super(label,value); dflt=value;               }
-       void    Set                     (double value)                  { super.updateValue(value);                             }
-       void    reset           ()                                              { super.updateValue(dflt);                              }
-       float   Val                     ()                                              { return getValuef();                                   }
-       boolean ZeroOrOne       ()                                              { return Val()==0 || Val() == 1;                }
+
+public class DBool {
+       boolean def, b;
+       String  tag;
+       int             row, col;
+       void    reset() { b = def; }
+       boolean set     (int r, int c, boolean val) { if (r != row || c != col) return false; b = val; return true; }
+       DBool(String _tag, boolean _def, int _row, int _col) {
+               def = _def; b = _def; tag = _tag; row = _row; col = _col;
+       }
 }
 
-public class IndexNums {
-       int     point   ;//, cube       , tower  , face  , strip        ;
-       int     nPoints ;//, nCubes, nTowers, nFaces, nStrips   ;
-//     boolean isHoriz;
-       void reset() { point=0;}//cube=tower=face=strip=0; }
+public class DParam extends BasicParameter {
+       double  dflt;
+       DParam  (String label, double value)            { super(label,value); dflt=value;               }
+       void    set                     (double value)                  { super.setValue(value);                                }
+       void    reset           ()                                              { super.setValue(dflt);                                 }
+       float   Val                     ()                                              { return getValuef();                                   }
 }
-IndexNums iCur = new IndexNums();
 //----------------------------------------------------------------------------------------------------------------------------------
 public class xyz {     float x,y,z;
                        xyz() {x=y=z=0;}
                        xyz(Point p                                       ) {x=p.fx     ; y=p.fy; z=p.fz;}
+                       xyz(xyz p                                         ) {set(p);                             }
                        xyz(float _x,float _y,float _z) {x=_x   ; y=_y  ; z=_z  ;}
+       void    set(Point p                                       ) {x=p.fx     ; y=p.fy; z=p.fz;}
+       void    set(xyz p                                         ) {x=p.x      ; y=p.y ; z=p.z ;}
        void    set(float _x,float _y,float _z) {x=_x   ; y=_y  ; z=_z  ;}
-       float   distance(xyz b)                                 {return dist(x,y,z,b.x,b.y,b.z);         }
-       float   dot     (xyz b)                                 {return x*b.x + y*b.y + z*b.z;           }
-       xyz             minus   (xyz b)                                 {return new xyz(x-b.x,y-b.y,z-b.z);  }
-       xyz             plus    (xyz b)                                 {return new xyz(x+b.x,y+b.y,z+b.z);  }
-       xyz             plus    (float b)                               {return new xyz(x+b  ,y+b  ,z+b  );  }
-       xyz             over    (xyz b)                                 {return new xyz(x/b.x,y/b.y,z/b.z);  }
-       xyz             times   (float b)                               {return new xyz(x*b  ,y*b  ,z*b  );  }
-
-       xyz             RotateX (xyz o, float a)                { return new xyz (      x,
-                                                                                                                               cos(a)*(y-o.y) - sin(a)*(z-o.z) + o.y,
-                                                                                                                               sin(a)*(y-o.y) + cos(a)*(z-o.z) + o.z);                 }
-       
-       xyz             RotateY (xyz o, float a)                { return new xyz (      cos(a)*(x-o.x) - sin(a)*(z-o.z) + o.x,
-                                                                                                                               y,
-                                                                                                                               sin(a)*(x-o.x) + cos(a)*(z-o.z) + o.z);                 }
-       
-       xyz             RotateZ (xyz o, float a)                { return new xyz (      cos(a)*(x-o.x) - sin(a)*(y-o.y) + o.x,
-                                                                                                                               sin(a)*(x-o.x) + cos(a)*(y-o.y) + o.y,
-                                                                                                                               z       );                                                                                      }
-       
-       xyz             setRand ()                                              { return new xyz ( random(xdMax), random(ydMax), random(zdMax));                }
-       xyz             setNorm ()                                              { return new xyz ( x / xdMax, y / ydMax, z / zdMax);                                    }
-       
-       float   interp (float a, float b, float c) { return (1-a)*b + a*c; }
-       xyz             interpolate(float i, xyz d)             { return new xyz ( interp(i,x,d.x), interp(i,y,d.y), interp(i,z,d.z)); }
+
+       void    zoomX   (float zx)                              {x = x*zx - mMax.x*(zx-1)/2;                            }
+       void    zoomY   (float zy)                              {y = y*zy - mMax.y*(zy-1)/2;                            }
+
+       float   distance(xyz b)                                 {return dist(x,y,z,b.x,b.y,b.z);                }
+       float   distance(float _x, float _y)    {return dist(x,y,_x,_y);                                }
+       float   dot     (xyz b)                                 {return x*b.x + y*b.y + z*b.z;                  }
+       void    add             (xyz b)                                 {x += b.x; y += b.y; z += b.z;                  }
+       void    add             (float b)                               {x += b  ; y += b  ; z += b  ;                  }
+       void    subtract(xyz b)                                 {x -= b.x; y -= b.y; z -= b.z;                  }
+       void    scale   (float b)                               {x *= b  ; y *= b  ; z *= b  ;                  }
+
+       void    RotateZ   (xyz o, float nSin, float nCos) {
+               float nX = nCos*(x-o.x) - nSin*(y-o.y) + o.x;
+               float nY = nSin*(x-o.x) + nCos*(y-o.y) + o.y;
+               x = nX; y = nY;
+       }
+
+       void    RotateX   (xyz o, float nSin, float nCos) {
+               float nY = nCos*(y-o.y) - nSin*(z-o.z) + o.y;
+               float nZ = nSin*(y-o.y) + nCos*(z-o.z) + o.z;
+               y = nY; z = nZ;
+       }
+
+       void    RotateY   (xyz o, float nSin, float nCos) {
+               float nZ = nCos*(z-o.z) - nSin*(x-o.x) + o.z;
+               float nX = nSin*(z-o.z) + nCos*(x-o.x) + o.x;
+               z = nZ; x = nX;
+       }
+
+       void    setRand ()                                              { x = random(mMax.x); y = random(mMax.y); z = random(mMax.z);   }
+       void    setNorm ()                                              { x /= mMax.x; y /= mMax.y; z /= mMax.z;                                                }
+       void    interpolate(float i, xyz d)             { x = interp(i,x,d.x); y = interp(i,y,d.y); z = interp(i,z,d.z); }
 }
 //----------------------------------------------------------------------------------------------------------------------------------
-public class DPat extends SCPattern
-{
-       float           zSpinHue;
-       xyz                     xyzdMax, xyz0, xyzMid, xyzHalf;
-       PFont           itemFont        = createFont("Lucida Grande", 11);
-       ArrayList       picklist        = new ArrayList();
-       ArrayList       paramlist       = new ArrayList();
-       int                     nMaxRow         = 0;
-       boolean         bIsActive       = false;
-       float           NoiseMove       = random(10000);
+public class DGlobals {
+       boolean         bInit                   = false;
+       MidiOutput      APCOut                  = null;
+       MidiInput       APCIn                   = null,         OxygenIn                = null;
+       DPat            CurPat                  = null;
 
-       float           Dist     (xyz a, xyz b)                         { return dist(a.x,a.y,a.z,b.x,b.y,b.z);         }
-       int                     c1c              (float a)                                      { return int(100*constrain(a,0,1));                     }
-       int             mapRow   (int a)                                        { return btwn(a,53,57) ? a-53 : a;                      }
-       int             unmapRow (int a)                                        { return btwn(a,0 , 4) ? a+53 : a;                      }
-       void            SetLight (int row, int col, int clr){ if (midiout != null) midiout.sendNoteOn(col, unmapRow(row), clr); }
-       void            keypad   (int row, int col)                     { println(row + " " + col); }
-       void            onInactive()                                            { bIsActive=false; DanTextLine1 = ""; DanTextLine2 = ""; uiDebugText.setText(""); }
-       void            onActive  ()                                            { bIsActive=true;
-               zSpinHue = 0;
-               for (int i=0; i<paramlist.size(); i++) ((_DhP)paramlist.get(i)).reset();
+       float           Sliders[]               = new float [] {1,0,0,0,0,0,0,0};
+       String          SliderText[]    = new String[] {"Level", "SpinHue", "Spark", "Xwave", "Ywave", "Trails", "??", "??", "??"};
+       
+       void            SetNoteOn       (int row, int col, int clr){ if (APCOut != null) APCOut.sendNoteOn              (col, row, clr);        }
+       void            SetNoteOff      (int row, int col, int clr){ if (APCOut != null) APCOut.sendNoteOff             (col, row, clr);        }
+       void            SetKnob         (int cc , int c  , int v  ){ if (APCOut != null) APCOut.sendController  (cc , c, v);            }
+
+       DBool           GetBool (int i)                                         { return (DBool)CurPat.bools .get(i); }
+       Pick            GetPick (int i)                                         { return (Pick) CurPat.picks .get(i); }
+       DParam          GetParam(int i)                                         { return (DParam) CurPat.params.get(i); }
+
+       float           _Dim            ()                                              { return Sliders[0]; }
+       float           _SpinHue        ()                                              { return Sliders[1]; }
+       float           _Spark          ()                                              { return Sliders[2]; }
+       float           _XWave          ()                                              { return Sliders[3]; }
+       float           _YWave          ()                                              { return Sliders[4]; }
+       float           _Trails         ()                                              { return Sliders[5]; }
+
+       void            Init            () {
+               if (bInit) return; bInit=true;
+           for (MidiOutputDevice o: RWMidi.getOutputDevices()) { if (o.toString().contains("APC")) { APCOut = o.createOutput(); break;}}
+               for (MidiInputDevice  i: RWMidi.getInputDevices ()) { if (i.toString().contains("APC")) { i.createInput (this);          break;}}
+       }
+       
+       boolean         isFocused  ()           { return CurPat != null && CurPat == midiEngine.getFocusedDeck().getActivePattern(); }
+       void            Deactivate (DPat p) { if (p != CurPat) return; uiDebugText.setText(""); CurPat = null;                                   }
+       void            Activate   (DPat p) {
+               CurPat = p;
                while (lx.tempo.bpm() > 40) lx.tempo.setBpm(lx.tempo.bpm()/2);
+               for (int i=0; i<p.params.size(); i++) GetParam(i).reset();
+               for (int i=0; i<p.bools .size(); i++) GetBool (i).reset();
+               for (int i=0; i<p.picks .size(); i++) GetPick (i).reset();
                UpdateLights();
        }
-       void    StartRun(int deltaMs)                           {       }
-       color   CalcPoint(xyz p)                                        { return color(0,0,0); }
-       float   CalcCone (xyz v1, xyz v2, xyz c)        {
-               return degrees( acos ( v1.minus(c).dot(v2.minus(c)) / (sqrt(v1.minus(c).dot(v1.minus(c))) * sqrt(v2.minus(c).dot(v2.minus(c))) ) ));
+
+       void    SetText() {
+               if (!isFocused()) return;
+               String Text1="", Text2="";
+               for (int i=0; i<CurPat.bools.size(); i++) if (GetBool(i).b) Text1 += " " + GetBool(i).tag       + "   ";
+               for (int i=0; i<CurPat.picks.size(); i++) Text1 += GetPick(i).tag + ": " + GetPick(i).CurDesc() + "   ";
+               for (int i=0; i<5; i++)                                   Text2 += SliderText[i]  + ": " + round(100*Sliders[i])  + "   ";
+               uiDebugText.setText(Text1, Text2);
        }
 
-       void AddDanText() {
-               DanTextLine1  = "APC40:   ";
-               for (int i=0; i<picklist.size() ; i++) { Pick P = (Pick)picklist.get(i); DanTextLine1 += P.tag + ": " + P.Cur() + "    "; }
-               DanTextLine1  += " X-Symm:   " + (_XSym   ? "ON" : "OFF") + "    ";
-               DanTextLine1  += " Y-Symm:   " + (_YSym   ? "ON" : "OFF") + "    ";
-               DanTextLine1  += " Z-Symm:   " + (_ZSym   ? "ON" : "OFF") + "    ";
-               DanTextLine1  += " Rad-Sym:  " + (_RadSym ? "ON" : "OFF") + "    ";
-//             DanTextLine1  += " Horiz:    " + (_Horiz  ? "ON" : "OFF") + "    ";
-//             DanTextLine1  += " Vert:     " + (_Vert   ? "ON" : "OFF") + "    ";
+       void    UpdateLights() {
+               if (!isFocused() || APCOut == null) return;
+               for (int i=53;i< 58; i++) for (int j=0; j<NumApcCols; j++) SetNoteOn(i, j, 0);
+               for (int i=48;i< 56; i++) SetKnob(0, i, 0);
+               for (int i=16;i< 20; i++) SetKnob(0, i, 0);
 
-               DanTextLine2  = "SLIDERS: ";
-               for (int i=0; i<8; i++) if (SliderText[i] != "") { DanTextLine2 += SliderText[i] + ": " + Sliders[i] + "     "; }
+               for (int i=0; i<CurPat.params.size(); i++) SetKnob              ( 0, i<8 ? 48+i : 16 + i - 8, round(GetParam(i).Val()*127) );
+               for (int i=0; i<CurPat.picks .size(); i++) SetNoteOn    (GetPick(i).CurRow, GetPick(i).CurCol, 3);
+               for (int i=0; i<CurPat.bools .size(); i++) if (GetBool(i).b)    SetNoteOn       (GetBool(i).row, GetBool(i).col, 1);
+                                                                                                       else                            SetNoteOff      (GetBool(i).row, GetBool(i).col, 0);
+       }
 
-               uiDebugText.setText(DanTextLine1, DanTextLine2);
+       void    controllerChangeReceived(rwmidi.Controller cc) {
+               if (cc.getCC() == 7 && btwn(cc.getChannel(),0,7)) { Sliders[cc.getChannel()] = 1.*cc.getValue()/127.; }
        }
 
-       void    run(int deltaMs) {
-               NoiseMove   += deltaMs;
-               xdMax           =  model.xMax;
-               ydMax           =  model.yMax;
-               zdMax           =  model.zMax;
-               xyzdMax         =  new xyz(xdMax,ydMax,zdMax);
-               xyzMid          =  new xyz(xdMax/2, ydMax/2, zdMax/2);
-               StartRun                (deltaMs);
-               zSpinHue        += s_SpinHue ()*deltaMs*.05;
-               float fSharp = 1/(1.01-pSharp.Val());
-               AddDanText();
-               iCur.reset();                                                   iCur.nPoints = model.points.size();
-//             iCur.nTowers = model.towers.size();             iCur.nCubes  = model.cubes .size();
-//             iCur.nFaces  = model.faces .size();             iCur.nStrips = model.strips.size();
-
-//             for (Tower t : model.towers)    {       iCur.tower++;
-//             for (Cube  c : t.cubes)                 {       iCur.cube ++; 
-//             for (Face  f : c.faces)                 {       iCur.face ++; 
-//             for (Strip s : f.strips)                {       iCur.strip++; iCur.isHoriz= (iCur.strip % 2 == 1 || iCur.strip < 5) ? true : false;
-               for (Point p : model.points)    {       iCur.point++; 
-                       xyz P           = new xyz(p);
-
-                       if (s_Spark () > 0) P.y += s_Spark () * (noise(P.x,P.y+NoiseMove/30  ,P.z)*ydMax - ydMax/2.);
-                       if (s_Wiggle() > 0) P.y += s_Wiggle() * (noise(P.x/(xdMax*.3)-NoiseMove/1500.) - .5) * (ydMax/2.);
-
-                       color cOld      = colors[p.index];
-                       color cNew      = CalcPoint(P);
-
-//                     if (_Horiz  && !iCur.isHoriz) { colors[p.index] = 0; continue; }
-//                     if (_Vert   &&  iCur.isHoriz) { colors[p.index] = 0; continue; }                
-                       if (_XSym)      cNew = blendColor(cNew, CalcPoint(new xyz(xdMax-P.x,P.y,P.z)), ADD);
-                       if (_YSym)      cNew = blendColor(cNew, CalcPoint(new xyz(P.x,ydMax-P.y,P.z)), ADD);
-                       if (_ZSym)      cNew = blendColor(cNew, CalcPoint(new xyz(P.x,P.y,zdMax-P.z)), ADD);
-
-                       float b = brightness(cNew)/100.;
-                       b = b < .5 ? pow(b,fSharp) : 1-pow(1-b,fSharp);
-
-                       float modhue  = s_ModHue  ()>0 ? s_ModHue  ()*360:0;
-
-                       float noizhue = s_NoiseHue()>0 ? s_NoiseHue()*360*noise(        P.x/(xdMax*.3)+NoiseMove/3000.,
-                                                                                                                       P.y/(ydMax*.3)+NoiseMove/4000.,
-                                                                                                                       P.z/(zdMax*.3)+NoiseMove/5000.) : 0;
-
-                       cNew = color( (hue(cNew) + modhue + zSpinHue - noizhue) % 360,
-                                               saturation(cNew) + 100*s_Saturate(),
-                                               100 *  (s_Trails()==0 ? b : max(b, brightness(cOld)/100. - (1-s_Trails()) * deltaMs/200.))
-                                                       *  (s_Dim   ()==0 ? 1 : 1-s_Dim())
-                                               );
-                                                  
-                       colors[p.index] = cNew;
-               }
-//             }}}}
+       void noteOffReceived(Note note) { if (!isFocused()) return;
+               int row = note.getPitch(), col = note.getChannel();
+               for (int i=0; i<CurPat.bools.size(); i++) if (GetBool(i).set(row, col, false)) return;
+               UpdateLights();
        }
 
-       void    controllerChangeReceived(rwmidi.Controller cc) {
-               if (cc.getCC() == 7 && btwn(cc.getChannel(),0,7)) Sliders[cc.getChannel()] = 1.*cc.getValue()/127.;
+       void noteOnReceived (Note note) { if (!isFocused()) return;
+               int row = note.getPitch(), col = note.getChannel();
+               for (int i=0; i<CurPat.picks.size(); i++) if (GetPick(i).set(row, col))           return;
+               for (int i=0; i<CurPat.bools.size(); i++) if (GetBool(i).set(row, col, true)) return;
+               //println("row: " + row + "  col:   " + col);
        }
+}
+//----------------------------------------------------------------------------------------------------------------------------------
+public class DPat extends SCPattern
+{
+       ArrayList       picks           = new ArrayList();
+       ArrayList       params          = new ArrayList();
+       ArrayList       bools           = new ArrayList();
+       int                     nMaxRow         = 53;
+       float           zSpinHue        = 0;
+       float           LastQuant       = -1, LastJog = -1;
+       float[]         xWaveNz, yWaveNz;
+       int             nPoint  , nPoints;
+       xyz                     xyzJog = new xyz(), vT1 = new xyz(), vT2 = new xyz();
+       xyz                     modmin;
+       
+       float           NoiseMove       = random(10000);
+       DParam          pSharp, pQuantize, pSaturate;
+       DBool           pXsym, pYsym, pRsym, pXdup, pXtrip, pJog;
+       float           Dist     (xyz a, xyz b)                         { return dist(a.x,a.y,a.z,b.x,b.y,b.z);         }
+       int                     c1c              (float a)                                      { return round(100*constrain(a,0,1));           }
+       float           interpWv(float i, float[] vals)         { return interp(i-floor(i), vals[floor(i)], vals[ceil(i)]); }
 
-       public float    Sliders[]       = new float[] {0,0,0,0,0,0,0,0};
-       String  SliderText[]= new String[] {"Trails", "Dim", "Saturate", "SpinHue", "Hue", "NoiseHue", "Spark", "Wiggle"};
-       float   s_Trails        ()      { return Sliders[0]; }
-       float   s_Dim           ()      { return Sliders[1]; }
-       float   s_Saturate      ()      { return Sliders[2]; }
-       float   s_SpinHue       ()      { return Sliders[3]; }
-       float   s_ModHue        ()      { return Sliders[4]; }
-       float   s_NoiseHue      ()      { return Sliders[5]; }
-       float   s_Spark         ()      { return Sliders[6]; }
-       float   s_Wiggle        ()      { return Sliders[7]; }
-       _DhP    pSharp;
+       float           CalcCone (xyz v1, xyz v2, xyz c)        { vT1.set(v1); vT2.set(v2); vT1.subtract(c); vT2.subtract(c);
+                                                                                                               return degrees( acos ( vT1.dot(vT2) / (sqrt(vT1.dot(vT1)) * sqrt(vT2.dot(vT2)) ) ));    }
+
+       void            StartPattern()                                          {                                                               }
+       void            StartRun(double deltaMs)                        {                                                               }
+       color           CalcPoint(xyz p)                                        { return color(0,0,0);                  }
+       boolean         IsActive()                                                      { return this == DG.CurPat;                                                                                             }
+       boolean         IsFocused()                                                     { return this == midiEngine.getFocusedDeck().getActivePattern();                }
+       void            onInactive()                                            { UpdateState(); }
+       void            onActive  ()                                            { UpdateState(); StartPattern(); }
+       void            UpdateState()                                           { if (IsFocused() != IsActive()) { if (IsFocused()) DG.Activate(this); else DG.Deactivate(this); } }
+       color           blend3(color c1, color c2, color c3){ return blendColor(c1,blendColor(c2,c3,ADD),ADD);                                          }
+
+       DParam          addParam(String label, double value) {
+               DParam P = new DParam(label, value);
+               super.addParameter(P);
+               params.add(P); return P;
+       }
+       Pick addPick(String name, int def, int _max, String[] desc) {
+               Pick P          = new Pick(name, def, _max+1, nMaxRow, desc); 
+               nMaxRow         = P.EndRow + 1;
+               picks.add(P);
+               return P;
+       }
 
        DPat(GLucose glucose) {
                super(glucose);
-               xyzHalf = new xyz(.5,.5,.5);
-               xyz0    = new xyz(0,0,0);
-               pSharp  = addParam("Shrp", 0);
+               pSharp          =       addParam("Shrp",  0 );
+               pQuantize       =       addParam("Qunt",  0 );
+               pSaturate       =       addParam("Sat" ,  .5);
+               nPoints         =       model.points.size();
+               pXsym           =       new DBool("X-SYM", false, 49, 0);       bools.add(pXsym );
+               pYsym           =       new DBool("Y-SYM", false, 49, 1);       bools.add(pYsym );
+               pRsym           =       new DBool("R-SYM", false, 49, 2);       bools.add(pRsym );
+               pXdup           =       new DBool("X-DUP", false, 49, 3);       bools.add(pXdup );
+               pJog            =       new DBool("JOGGER",false, 49, 4);       bools.add(pJog  );
+               modmin          =       new xyz(model.xMin, model.yMin, model.zMin);
+               mMax            =       new xyz(model.xMax, model.yMax, model.zMax); mMax.subtract(modmin);
+               mCtr            =       new xyz(mMax); mCtr.scale(.5);
+               mHalf           =       new xyz(.5,.5,.5);
+               xWaveNz         =       new float[ceil(mMax.y)+1];
+               yWaveNz         =       new float[ceil(mMax.x)+1];
                
-           for (MidiInputDevice  input  : RWMidi.getInputDevices ()) { if (input.toString().contains("APC")) input .createInput (this);}
-           for (MidiOutputDevice output : RWMidi.getOutputDevices()) {
-                       if (midiout == null && output.toString().contains("APC")) midiout = output.createOutput();
-               }
-       }
-
-       void UpdateLights() {
-               for (int i=0; i<nNumRows                ; i++) for (int j=0; j<nNumCols; j++) SetLight(i, j, 0);
-               for (int i=0; i<picklist.size() ; i++) {
-                       Pick P = (Pick)picklist.get(i); SetLight(P.CurRow, P.CurCol, 3);
-               }
-               SetLight(82, 0, _XSym   ? 3 : 0);
-               SetLight(83, 0, _YSym   ? 3 : 0);
-               SetLight(84, 0, _ZSym   ? 3 : 0);
-               SetLight(85, 0, _RadSym ? 3 : 0);
-//             SetLight(86, 0, _Horiz  ? 3 : 0);
-//             SetLight(87, 0, _Vert   ? 3 : 0);
+               //println (model.xMin + " " + model.yMin + " " +  model.zMin);
+               //println (model.xMax + " " + model.yMax + " " +  model.zMax);
+               DG.Init();
        }
 
-       Pick GetPick(int row, int col) {
-               for (int i=0; i<picklist.size(); i++) { Pick P = (Pick)picklist.get(i);
-                       if (!btwn(row,P.StartRow,P.EndRow)                                                      ) continue;
-                       if (!btwn(col,0,nNumCols-1)                                                             ) continue;
-                       if (!btwn((row-P.StartRow)*nNumCols + col,0,P.NumPicks-1)       ) continue;
-                       return P;
+       void run(double deltaMs)
+       {
+               UpdateState();
+               NoiseMove       += deltaMs; NoiseMove = NoiseMove % 1e7;
+               StartRun                (deltaMs);
+               zSpinHue                += DG._SpinHue ()*deltaMs*.05; zSpinHue = zSpinHue % 5000.;
+               xyz P                   = new xyz(), tP = new xyz(), pSave = new xyz();
+               float fSharp    = 1/(1.0001-pSharp.Val());
+               float fQuant    = pQuantize.Val();
+               float fSaturate = pSaturate.Val();
+               
+               DG.SetText();
+               nPoint  = 0;
+               
+               if (fQuant > 0) {
+                       float tRamp     = (lx.tempo.rampf() % (1./pow(2,floor((1-fQuant) * 4))));
+                       float f = LastQuant; LastQuant = tRamp; if (tRamp > f) return;
                }
-               return null;
-       }
-       
-       double Tap1 = 0;
-       double getNow() { return millis() + 1000*second() + 60*1000*minute() + 3600*1000*hour(); }
        
-       void noteOffReceived(Note note) { if (!bIsActive) return;
-               int row = mapRow(note.getPitch()), col = note.getChannel();
-
-               if (row == 50 && col == 0 && btwn(getNow() - Tap1,5000,300*1000)) {     // hackish tapping mechanism
-                       double bpm = 32.*60000./(getNow()-Tap1);
-                       while (bpm < 20) bpm*=2;
-                       while (bpm > 40) bpm/=2;
-                       lx.tempo.setBpm(bpm); lx.tempo.trigger(); Tap1=0; println("Tap Set - " + bpm + " bpm");
+               if (pJog.b) {
+                       float tRamp     = (lx.tempo.rampf() % .25);
+                       if (tRamp < LastJog) xyzJog.set(randctr(mMax.x*.2), randctr(mMax.y*.2), randctr(mMax.z*.2));
+                       LastJog = tRamp; 
                }
 
-               UpdateLights();
-       }
+               // precalculate this stuff
+               float yWv = DG._YWave(), xWv = DG._XWave(), sprk = DG._Spark();
+               if (yWv > 0) for (int i=0; i<ceil(mMax.x)+1; i++)
+                       yWaveNz[i] = yWv * (noise(i/(mMax.x*.3)-(2e3+NoiseMove)/1500.) - .5) * (mMax.y/2.);
 
-       boolean _XSym=false, _YSym=false, _ZSym=false, _RadSym=false; //, _Horiz=false, _Vert=false;
-       
-       void noteOnReceived (Note note) { if (!bIsActive) return;
-               int row = mapRow(note.getPitch()), col = note.getChannel();
-               Pick P = GetPick(row,col);
-                        if (P != null)                                 { P.CurRow=row; P.CurCol=col;                   }
-               else if (row == 50 && col == 0)         { lx.tempo.trigger(); Tap1 = getNow();  }
-               else if (row == 82 && col == 0)         _XSym   = !_XSym        ;
-               else if (row == 83 && col == 0)         _YSym   = !_YSym        ;
-               else if (row == 84 && col == 0)         _ZSym   = !_ZSym        ;
-               else if (row == 85 && col == 0)         _RadSym = !_RadSym      ;
-               else                                                            keypad(row, col)        ;
-       }
+               if (xWv > 0) for (int i=0; i<ceil(mMax.y)+1; i++)
+                       xWaveNz[i] = xWv * (noise(i/(mMax.y*.3)-(1e3+NoiseMove)/1500.) - .5) * (mMax.x/2.);
+                       
+               for (Point p : model.points) { nPoint++;
+                       P.set(p);
+                       P.subtract(modmin);
+                       if (sprk > 0) { P.y += sprk*randctr(50); P.x += sprk*randctr(50); P.z += sprk*randctr(50); }
+                       if (yWv > 0)    P.y += interpWv(p.x-modmin.x, yWaveNz);
+                       if (xWv > 0)    P.x += interpWv(p.y-modmin.y, xWaveNz);
+                       if (pJog.b)             P.add(xyzJog);
 
-       _DhP addParam(String label, double value) {
-               _DhP P = new _DhP(label, value);                
-               super.addParameter(P);
-               paramlist.add(P); return P;
-       }
-               
-       Pick addPick(String name, int def, int nmax) {
-               Pick P          = new Pick(name, def, nmax); 
-               P.StartRow      = nMaxRow;
-               P.EndRow        = P.StartRow + int((nmax-1) / nNumCols);
-               nMaxRow         = P.EndRow + 1;
-               P.CurCol        = def % nNumCols;
-               P.CurRow        = P.StartRow + def/nNumCols;
-               picklist.add(P);
-               return P;
+
+                       color cNew, cOld = colors[p.index];
+                                                       { tP.set(P);                                                                    cNew = CalcPoint(tP);                                                   }
+                       if (pXsym.b)    { tP.set(mMax.x-P.x,P.y,P.z);                                   cNew = blendColor(cNew, CalcPoint(tP), ADD);    }
+                       if (pYsym.b)    { tP.set(P.x,mMax.y-P.y,P.z);                                   cNew = blendColor(cNew, CalcPoint(tP), ADD);    }
+                       if (pRsym.b)    { tP.set(mMax.x-P.x,mMax.y-P.y,mMax.z-P.z);             cNew = blendColor(cNew, CalcPoint(tP), ADD);    }
+                       if (pXdup.b)    { tP.set((P.x+mMax.x*.5)%mMax.x,P.y,P.z);               cNew = blendColor(cNew, CalcPoint(tP), ADD);    }
+
+                       float                                                           b = brightness(cNew)/100.;
+                       if (pSharp.Val()>0)                             b = b < .5 ? pow(b,fSharp) : 1-pow(1-b,fSharp);
+                       if (DG._Trails()>0 && fQuant == 0)      b = max(b, (float) (brightness(cOld)/100. - (1-DG._Trails()) * deltaMs/200.));
+
+                       colors[p.index] = color(
+                               (hue(cNew) + zSpinHue) % 360,
+                               saturation(cNew) + 100*(fSaturate*2-1),
+                               100 *  b * DG._Dim()
+                       );
+
+//                     colors[p.index] = color(0,0, p.fx >= modmin.x && p.fy >= modmin.y && p.fz >= modmin.z &&
+//                             p.fx <= modmin.x+mMax.x && p.fy <= modmin.y+mMax.y && p.fz <= modmin.z+mMax.z ? 100 : 0); 
+               }
        }
 }
-//----------------------------------------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------------------------------------------
\ No newline at end of file