From: Mark Slee <mcslee@gmail.com>
Date: Wed, 26 Feb 2014 08:49:20 +0000 (-0800)
Subject: Merge branch 'grizzly-dev'
X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=commitdiff_plain;h=21dffb1b77608cacc57382f3eb6eac3ed16054c3

Merge branch 'grizzly-dev'
---

21dffb1b77608cacc57382f3eb6eac3ed16054c3
diff --cc AlexGreen.pde
index 3e164d8,db7e0af..61754b1
--- a/AlexGreen.pde
+++ b/AlexGreen.pde
@@@ -378,140 -377,6 +378,140 @@@ final Sphery[] spherys
         //   } 
          
    }
 +/*This just takes all of Dan Horwitz's code that I want to inherit and leaves the rest behind.
 + A work in progress. */
 +
 +public class APat extends SCPattern
 +
 +
 +{
 +  ArrayList<Pick>   picks  = new ArrayList<Pick>  ();
 +  ArrayList<DBool>  bools  = new ArrayList<DBool> ();
 +
 +  PVector   mMax, mCtr, mHalf;
 +
 +  MidiOutput  APCOut;
 +  int     nMaxRow   = 53;
 +  float   LastJog = -1;
 +  float[]   xWaveNz, yWaveNz;
 +  int     nPoint  , nPoints;
 +  PVector   xyzJog = new PVector(), modmin;
 +
 +  float     NoiseMove = random(10000);
 +  BasicParameter  pSpark, pWave, pRotX, pRotY, pRotZ, pSpin, pTransX, pTransY;
 +  DBool     pXsym, pYsym, pRsym, pXdup, pXtrip, pJog, pGrey;
 +
 +  float   lxh   ()                  { return lx.getBaseHuef();                      }
 +  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)]);     }
 +  void    setNorm (PVector vec)           { vec.set(vec.x/mMax.x, vec.y/mMax.y, vec.z/mMax.z);        }
 +  void    setRand (PVector vec)           { vec.set(random(mMax.x), random(mMax.y), random(mMax.z));      }
 +  void    setVec  (PVector vec, LXPoint p)        { vec.set(p.x, p.y, p.z);                       }
 +  void    interpolate(float i, PVector a, PVector b)  { a.set(interp(i,a.x,b.x), interp(i,a.y,b.y), interp(i,a.z,b.z));   }
 +  //void      StartRun(double deltaMs)          { }
 +  float     val   (BasicParameter p)          { return p.getValuef();                       }
 +  //color   CalcPoint(PVector p)            { return lx.hsb(0,0,0);                       }
 +  color   blend3(color c1, color c2, color c3)    { return blendColor(c1,blendColor(c2,c3,ADD),ADD);          }
 +
 +  void  rotateZ (PVector p, PVector o, float nSin, float nCos) { p.set(    nCos*(p.x-o.x) - nSin*(p.y-o.y) + o.x    , nSin*(p.x-o.x) + nCos*(p.y-o.y) + o.y,p.z); }
 +  void  rotateX (PVector p, PVector o, float nSin, float nCos) { p.set(p.x,nCos*(p.y-o.y) - nSin*(p.z-o.z) + o.y    , nSin*(p.y-o.y) + nCos*(p.z-o.z) + o.z    ); }
 +  void  rotateY (PVector p, PVector o, float nSin, float nCos) { p.set(    nSin*(p.z-o.z) + nCos*(p.x-o.x) + o.x,p.y, nCos*(p.z-o.z) - nSin*(p.x-o.x) + o.z    ); }
 +
 +  BasicParameter  addParam(String label, double value)  { BasicParameter p = new BasicParameter(label, value); addParameter(p); return p; }
 +
 +  PVector   vT1 = new PVector(), vT2 = new PVector();
 +  float     calcCone (PVector v1, PVector v2, PVector c)  { vT1.set(v1); vT2.set(v2); vT1.sub(c); vT2.sub(c);
 +                                  return degrees(PVector.angleBetween(vT1,vT2)); }
 +
 +  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;
 +  }
 +
 +    boolean   noteOff(Note note) {
 +    int row = note.getPitch(), col = note.getChannel();
 +    for (int i=0; i<bools.size(); i++) if (bools.get(i).set(row, col, false)) { presetManager.dirty(this); return true; }
 +    updateLights(); return false;
 +  }
 +
 +    boolean   noteOn(Note note) {
 +    int row = note.getPitch(), col = note.getChannel();
 +    for (int i=0; i<picks.size(); i++) if (picks.get(i).set(row, col))        { presetManager.dirty(this); return true; }
 +    for (int i=0; i<bools.size(); i++) if (bools.get(i).set(row, col, true))  { presetManager.dirty(this); return true; }
 +    println("row: " + row + "  col:   " + col); return false;
 +  }
 +
 +  void    onInactive()      { uiDebugText.setText(""); }
 +  void    onReset()         {
 +    for (int i=0; i<bools .size(); i++) bools.get(i).reset();
 +    for (int i=0; i<picks .size(); i++) picks.get(i).reset();
 +    presetManager.dirty(this); 
 +    updateLights(); 
 +  }
 +
-   APat(GLucose glucose) {
-     super(glucose);
++  APat(LX lx) {
++    super(lx);
 +
 +    
 +
 +    nPoints   = model.points.size();
 +    pXsym     = new DBool("X-SYM", false, 48, 0); bools.add(pXsym );
 +    pYsym     = new DBool("Y-SYM", false, 48, 1); bools.add(pYsym );
 +    pRsym     = new DBool("R-SYM", false, 48, 2); bools.add(pRsym );
 +    pXdup   = new DBool("X-DUP", false, 48, 3); bools.add(pXdup );
 +    pJog    = new DBool("JOG"  , false, 48, 4); bools.add(pJog  );
 +    pGrey   = new DBool("GREY" , false, 48, 5); bools.add(pGrey );
 +
 +    modmin    = new PVector(model.xMin, model.yMin, model.zMin);
 +    mMax    =   new PVector(model.xMax, model.yMax, model.zMax); mMax.sub(modmin);
 +    mCtr    =   new PVector(); mCtr.set(mMax); mCtr.mult(.5);
 +    mHalf   =   new PVector(.5,.5,.5);
 +    xWaveNz   = new float[ceil(mMax.y)+1];
 +    yWaveNz   = new float[ceil(mMax.x)+1];
 +
 +    //println (model.xMin + " " + model.yMin + " " +  model.zMin);
 +    //println (model.xMax + " " + model.yMax + " " +  model.zMax);
 +    //for (MidiOutputDevice o: RWMidi.getOutputDevices()) { if (o.toString().contains("APC")) { APCOut = o.createOutput(); break;}}
 +  }
 +
 +  float spin() {
 +    float raw = val(pSpin);
 +    if (raw <= 0.45) {
 +      return raw + 0.05;
 +    } else if (raw >= 0.55) {
 +      return raw - 0.05;
 +    }
 +    return 0.5;
 +  }
 +  
 +  void setAPCOutput(MidiOutput output) {
 +    APCOut = output;
 +  }
 +
 +  void updateLights() { if (APCOut == null) return;
 +      for (int i = 0; i < NumApcRows; ++i) 
 +        for (int j = 0; j < 8; ++j)     APCOut.sendNoteOn(j, 53+i,  0);
 +    for (int i=0; i<picks .size(); i++)   APCOut.sendNoteOn(picks.get(i).CurCol, picks.get(i).CurRow, 3);
 +    for (int i=0; i<bools .size(); i++)   if (bools.get(i).b)   APCOut.sendNoteOn (bools.get(i).col, bools.get(i).row, 1);
 +                        else          APCOut.sendNoteOff  (bools.get(i).col, bools.get(i).row, 0);
 +  }
 +
 +  void run(double deltaMs)
 +  {
 +    if (deltaMs > 100) return;
 +
 +    if (this == midiEngine.getFocusedDeck().getActivePattern()) {
 +      String Text1="", Text2="";
 +      for (int i=0; i<bools.size(); i++) if (bools.get(i).b) Text1 += " " + bools.get(i).tag       + "   ";
 +      for (int i=0; i<picks.size(); i++) Text1 += picks.get(i).tag + ": " + picks.get(i).CurDesc() + "   ";
 +      uiDebugText.setText(Text1, Text2);
 +    }
 +
 +    
 +  }
 +}
  
  class CubeCurl extends SCPattern{
  float CH, CW, diag;