X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=blobdiff_plain;f=DanUtil.pde;h=382cf975c8a36740b4f15079783f657a52e720f1;hp=097c61f38598afd49e1ad284310122444e6f3d6d;hb=8f4e6c99775f2724edf3cec488860eb68b06491c;hpb=42a424d76b6ed74ffae8d72215e912d66a3d4bf6 diff --git a/DanUtil.pde b/DanUtil.pde index 097c61f..382cf97 100644 --- a/DanUtil.pde +++ b/DanUtil.pde @@ -1,13 +1,13 @@ //---------------------------------------------------------------------------------------------------------------------------------- -xyz mMax, mCtr, mHalf; 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 pointDist(Point p1, Point p2) { return dist(p1.x,p1.y,p1.z,p2.x,p2.y,p2.z); } +float min (float a, float b, float c, float d) { return min(min(a,b),min(c,d)); } +float pointDist(LXPoint p1, LXPoint p2) { return dist(p1.x,p1.y,p1.z,p2.x,p2.y,p2.z); } +float xyDist (LXPoint p1, LXPoint 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; @@ -21,7 +21,6 @@ float distToSeg(float x, float y, float x1, float y1, float x2, float y2) { return sqrt(dx * dx + dy * dy); } - public class Pick { int NumPicks, Default , CurRow , CurCol , @@ -56,91 +55,46 @@ public class DBool { def = _def; b = _def; tag = _tag; row = _row; col = _col; } } - -public class DParam extends BasicParameter { - double dflt; - DParam (String label, double value) { super(label,value); dflt=value; } - void set (double value) { super.setValue(value); } - float Val () { return getValuef(); } -} -//---------------------------------------------------------------------------------------------------------------------------------- -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); } - xyz(float _x,float _y,float _z) {x=_x ; y=_y ; z=_z ;} - void set(Point p ) {x=p.x ; y=p.y; z=p.z;} - 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 ;} - - 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 { ArrayList picks = new ArrayList (); ArrayList bools = new ArrayList (); - ArrayList params = new ArrayList(); + + PVector mMax, mCtr, mHalf; MidiOutput APCOut; int nMaxRow = 53; - float LastQuant = -1, LastJog = -1; + float 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 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 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); } - - DParam addParam(String label, double value) { - DParam P = new DParam(label, value); - super.addParameter(P); - params.add(P); return P; - } + 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); @@ -159,13 +113,11 @@ public class DPat extends SCPattern int row = note.getPitch(), col = note.getChannel(); for (int i=0; i= 0.55) { + return raw - 0.05; + } + return 0.5; + } void setAPCOutput(MidiOutput output) { APCOut = output; @@ -229,8 +191,8 @@ public class DPat extends SCPattern NoiseMove += deltaMs; NoiseMove = NoiseMove % 1e7; StartRun (deltaMs); - xyz P = new xyz(), tP = new xyz(), pSave = new xyz(); - xyz pTrans = new xyz(pTransX.Val()*200-100, pTransY.Val()*100-50,0); + PVector P = new PVector(), tP = new PVector(), pSave = new PVector(); + PVector pTrans = new PVector(val(pTransX)*200-100, val(pTransY)*100-50,0); nPoint = 0; if (pJog.b) { @@ -240,7 +202,7 @@ public class DPat extends SCPattern } // precalculate this stuff - float wvAmp = pWave.Val(), sprk = pSpark.Val(); + float wvAmp = val(pWave), sprk = val(pSpark); if (wvAmp > 0) { for (int i=0; i 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); @@ -278,39 +240,51 @@ class dTurn { } class dVertex { - dVertex c0, c1, // connections on the cube - opp, same; // opp - same strip, opp direction - // same - same strut, diff strip, dir - dTurn t0, t1; + 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); } + dVertex(Strip _s, LXPoint _p) { s = _s; ci = _p.index; } + LXPoint 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; else v0.t1=t; } + 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); } + float pd2 (LXPoint 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; } dVertex v0(Strip s) { return (dVertex)s.obj1; } dVertex v1(Strip s) { return (dVertex)s.obj2; } - dPixel getClosest(xyz p) { + dPixel getClosest(PVector p) { dVertex v = null; int pos=0; float d = 500; for (Strip s : glucose.model.strips) { @@ -358,7 +332,6 @@ class dLattice { 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); - }} } }