X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=DanUtil.pde;h=30ae8945b7c574238da64e80436ada4fc3788a88;hb=3ce73bc7c95a6f4485a6cd70881bd3299ef3507d;hp=395ba44adef5b95bc9ad4cfb80b204f181dd402e;hpb=a41f334c045811daef7e319214da557b5e48143a;p=SugarCubes.git
diff --git a/DanUtil.pde b/DanUtil.pde
index 395ba44..30ae894 100644
--- a/DanUtil.pde
+++ b/DanUtil.pde
@@ -1,15 +1,15 @@
//----------------------------------------------------------------------------------------------------------------------------------
xyz mMax, mCtr, mHalf;
-int NumApcRows = 5, NumApcCols = 8;
-DGlobals DG = new DGlobals();
+int NumApcRows=4, NumApcCols=8;
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 min (float a, float b, float c, float d) { return min(min(a,b),min(c,d)); }
+float pointDist(Point p1, Point p2) { return dist(p1.x,p1.y,p1.z,p2.x,p2.y,p2.z); }
+float xyDist (Point p1, Point p2) { return dist(p1.x,p1.y,p2.x,p2.y); }
+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;
@@ -24,10 +24,11 @@ float distToSeg (float x, float y, float x1, float y1, float x2, float y2) {
public class Pick {
- int NumPicks, Default , CurRow , CurCol ,
+ 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);
@@ -57,15 +58,8 @@ public class DBool {
}
}
-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(); }
-}
//----------------------------------------------------------------------------------------------------------------------------------
-public class xyz { float x,y,z;
+public class xyz { float x,y,z; // extends pVector; eliminate half of the functions
xyz() {x=y=z=0;}
xyz(Point p ) {x=p.x ; y=p.y; z=p.z;}
xyz(xyz p ) {set(p); }
@@ -85,19 +79,19 @@ public class xyz { float x,y,z;
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) {
+ 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) {
+ 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) {
+ 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;
@@ -108,149 +102,70 @@ public class xyz { float x,y,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 DGlobals {
- boolean bInit = false;
- MidiOutput APCOut = null;
- MidiInput APCIn = null, OxygenIn = null;
- DPat CurPat = null;
- int KeyPressed = -1;
- boolean bSustain = false;
-
-
- float Sliders[] = new float [] {1,0,0,0,0,0,0,0};
- String SliderText[] = new String[] {"Level", "SpinHue", "Spark", "Xwave", "Ywave", "Trails", "Quant", "??", "??"};
-
- 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 _Level () { 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]; }
- float _Quantize () { return Sliders[6]; }
-
- 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) {
- bSustain = false;
- CurPat = p;
- while (lx.tempo.bpm() > 40) lx.tempo.setBpm(lx.tempo.bpm()/2);
- for (int i=0; i
picks = new ArrayList();
- ArrayList params = new ArrayList();
- ArrayList bools = new ArrayList();
+ ArrayList picks = new ArrayList ();
+ ArrayList bools = new ArrayList ();
+
+ MidiOutput APCOut;
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 pRotX, pRotY, pRotZ, pSpin, pSharp, pSaturate, pTransX, pTransY;
-
- DBool pXsym, pYsym, pRsym, pXdup, pXtrip, pJog, pKey, pInvert;
- float Dist (xyz a, xyz b) { return dist(a.x,a.y,a.z,b.x,b.y,b.z); }
+ 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)]); }
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 lx.hsb(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;
- }
+ void StartRun(double deltaMs) { }
+ color CalcPoint(xyz p) { return lx.hsb(0,0,0); }
+ color blend3(color c1, color c2, color c3){ return blendColor(c1,blendColor(c2,c3,ADD),ADD); }
+ float val (BasicParameter p) { return p.getValuef(); }
+
+ BasicParameter addParam(String label, double value) { return new BasicParameter(label, value); }
- Pick addPick(String name, int def, int _max, String[] desc) {
+ 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 100) return;
+
+ if (this == midiEngine.getFocusedDeck().getActivePattern()) {
+ String Text1="", Text2="";
+ for (int i=0; i 0) {
- float tRamp = (lx.tempo.rampf() % (1./pow(2,floor((1-fQuant) * 4))));
- float f = LastQuant; LastQuant = tRamp; if (tRamp > f) return;
- }
-
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));
@@ -306,20 +229,22 @@ public class DPat extends SCPattern
}
// precalculate this stuff
- float yWv = DG._YWave(), xWv = DG._XWave(), sprk = DG._Spark();
- if (yWv > 0) for (int i=0; i 0) {
+ for (int i=0; i 0) for (int i=0; i 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 (sprk > 0) {P.y += sprk*randctr(50); P.x += sprk*randctr(50); P.z += sprk*randctr(50); }
+ if (wvAmp > 0) P.y += interpWv(p.x-modmin.x, yWaveNz);
+ if (wvAmp > 0) P.x += interpWv(p.y-modmin.y, xWaveNz);
if (pJog.b) P.add(xyzJog);
@@ -329,24 +254,114 @@ public class DPat extends SCPattern
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); }
+ if (pGrey.b) { cNew = lx.hsb(0, 0, lx.b(cNew)); }
+ colors[p.index] = cNew;
+ }
+ }
+}
+//----------------------------------------------------------------------------------------------------------------------------------
+class dTurn {
+ dVertex v;
+ int pos0, pos1;
+ dTurn(int _pos0, dVertex _v, int _pos1) { v = _v; pos0 = _pos0; pos1 = _pos1; }
+}
- float s = lx.s(cNew) + 100*(fSaturate*2-1);
- float b = lx.b(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) (lx.b(cOld)/100. - (1-DG._Trails()) * deltaMs/200.));
- if (DG.bSustain == true) b = max(b, (float) (lx.b(cOld)/100.));
+class dVertex {
+ dVertex c0, c1, c2, c3, // connections on the cube
+ opp, same; // opp - same strip, opp direction
+ // same - same strut, diff strip, dir
+ dTurn t0, t1, t2, t3;
+ Strip s;
+ int dir, ci; // dir -- 1 or -1.
+ // ci -- color index
+
+ dVertex(Strip _s, Point _p) { s = _s; ci = _p.index; }
+ Point getPoint(int i) { return s.points.get(dir>0 ? i : 15-i); }
+ void setOpp(dVertex _opp) { opp = _opp; dir = (ci < opp.ci ? 1 : -1); }
+}
+//----------------------------------------------------------------------------------------------------------------------------------
+class dPixel { dVertex v; int pos; dPixel(dVertex _v, int _pos) { v=_v; pos=_pos; } }
+class dLattice {
+ void addTurn (dVertex v0, int pos0, dVertex v1, int pos1) { dTurn t = new dTurn(pos0, v1, pos1);
+ if (v0.t0 == null) { v0.t0=t; return; }
+ if (v0.t1 == null) { v0.t1=t; return; }
+ if (v0.t2 == null) { v0.t2=t; return; }
+ if (v0.t3 == null) { v0.t3=t; return; }
+ }
+ float dist2 (Strip s1, int pos1, Strip s2, int pos2) { return pointDist(s1.points.get(pos1), s2.points.get(pos2)); }
+ float pd2 (Point p1, float x, float y, float z) { return dist(p1.x,p1.y,p1.z,x,y,z); }
+ boolean sameSame (Strip s1, Strip s2) { return max(dist2(s1, 0, s2, 0), dist2(s1,15, s2,15)) < 5 ; } // same strut, same direction
+ boolean sameOpp (Strip s1, Strip s2) { return max(dist2(s1, 0, s2,15), dist2(s1,15, s2,0 )) < 5 ; } // same strut, opp direction
+ boolean sameBar (Strip s1, Strip s2) { return sameSame(s1,s2) || sameOpp(s1,s2); } // 2 strips on same strut
+
+
+ void addJoint (dVertex v1, dVertex v2) {
+ // should probably replace parallel but further with the new one
+ if (v1.c0 != null && sameBar(v2.s, v1.c0.s)) return;
+ if (v1.c1 != null && sameBar(v2.s, v1.c1.s)) return;
+ if (v1.c2 != null && sameBar(v2.s, v1.c2.s)) return;
+ if (v1.c3 != null && sameBar(v2.s, v1.c3.s)) return;
+
+ if (v1.c0 == null) v1.c0 = v2;
+ else if (v1.c1 == null) v1.c1 = v2;
+ else if (v1.c2 == null) v1.c2 = v2;
+ else if (v1.c3 == null) v1.c3 = v2;
+ }
- if (pInvert.b) { b = 1-b; s = 1-s; }
+ dVertex v0(Strip s) { return (dVertex)s.obj1; }
+ dVertex v1(Strip s) { return (dVertex)s.obj2; }
- colors[p.index] = lx.hsb(
- (lx.h(cNew) + zSpinHue) % 360,
- s,
- 100 * b * DG._Level()
- );
+ dPixel getClosest(xyz p) {
+ dVertex v = null; int pos=0; float d = 500;
-// colors[p.index] = lx.hsb(0,0, p.x >= modmin.x && p.y >= modmin.y && p.z >= modmin.z &&
-// p.x <= modmin.x+mMax.x && p.y <= modmin.y+mMax.y && p.z <= modmin.z+mMax.z ? 100 : 0);
+ for (Strip s : glucose.model.strips) {
+ float nd = pd2(s.points.get(0),p.x,p.y,p.z); if (nd < d) { v=v0(s); d=nd; pos=0; }
+ if (nd > 30) continue;
+ for (int k=0; k<=15; k++) {
+ nd = pd2(s.points.get(k),p.x,p.y,p.z); if (nd < d) { v =v0(s); d=nd; pos=k; }
+ }
}
+ return random(2) < 1 ? new dPixel(v,pos) : new dPixel(v.opp,15-pos);
+ }
+
+ dLattice() {
+ lattice=this;
+
+ for (Strip s : glucose.model.strips) {
+ dVertex vrtx0 = new dVertex(s,s.points.get(0 )); s.obj1=vrtx0;
+ dVertex vrtx1 = new dVertex(s,s.points.get(15)); s.obj2=vrtx1;
+ vrtx0.setOpp(vrtx1); vrtx1.setOpp(vrtx0);
+ }
+
+ for (Strip s1 : glucose.model.strips) { for (Strip s2 : glucose.model.strips) {
+ if (s1.points.get(0).index < s2.points.get(0).index) continue;
+ int c=0;
+ if (sameSame(s1,s2)) { v0(s1).same = v0(s2); v1(s1).same = v1(s2);
+ v0(s2).same = v0(s1); v1(s2).same = v1(s1); continue; } // parallel
+ if (sameOpp (s1,s2)) { v0(s1).same = v1(s2); v1(s1).same = v0(s2);
+ v0(s2).same = v1(s1); v1(s2).same = v0(s1); continue; } // parallel
+ if (dist2(s1, 0, s2, 0) < 5) { c++; addJoint(v1(s1), v0(s2)); addJoint(v1(s2), v0(s1)); }
+ if (dist2(s1, 0, s2,15) < 5) { c++; addJoint(v1(s1), v1(s2)); addJoint(v0(s2), v0(s1)); }
+ if (dist2(s1,15, s2, 0) < 5) { c++; addJoint(v0(s1), v0(s2)); addJoint(v1(s2), v1(s1)); }
+ if (dist2(s1,15, s2,15) < 5) { c++; addJoint(v0(s1), v1(s2)); addJoint(v0(s2), v1(s1)); }
+ if (c>0) continue;
+
+ // Are they touching at all?
+ int pos1=0, pos2=0; float d = 100;
+
+ while (pos1 < 15 || pos2 < 15) {
+ float oldD = d;
+ if (pos1<15) { float d2 = dist2(s1, pos1+1, s2, pos2+0); if (d2 < d) { d=d2; pos1++; } }
+ if (pos2<15) { float d2 = dist2(s1, pos1+0, s2, pos2+1); if (d2 < d) { d=d2; pos2++; } }
+ if (d > 50 || oldD == d) break ;
+ }
+
+ if (d>5) continue;
+ addTurn(v0(s1), pos1, v0(s2), pos2); addTurn(v1(s1), 15-pos1, v0(s2), pos2);
+ addTurn(v0(s2), pos2, v0(s1), pos1); addTurn(v1(s2), 15-pos2, v0(s1), pos1);
+ }}
}
}
+
+dLattice lattice;
//----------------------------------------------------------------------------------------------------------------------------------