X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=DanUtil.pde;h=4ce685ad68f0d63e56d08e1a366378f80700e63f;hb=b30f14fdacdcccafe123e00f20a4d6df46e6995c;hp=7b0c17d5e5ad911521bde23fad5d2975085f4df6;hpb=4404e6b81ef8713c47d8cc1e519be83bbbe5a87b;p=SugarCubes.git diff --git a/DanUtil.pde b/DanUtil.pde index 7b0c17d..4ce685a 100644 --- a/DanUtil.pde +++ b/DanUtil.pde @@ -28,9 +28,9 @@ public class Pick { StartRow, EndRow ; String tag , Desc[] ; - Pick (String label, int _Def, int _Max, int nStart, String d[]) { - NumPicks = _Max; Default = _Def; - StartRow = nStart; EndRow = StartRow + int((NumPicks-1) / NumApcCols); + 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(); } @@ -113,9 +113,12 @@ public class DGlobals { 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", "Wiggle", "Trails", "??", "??", "??"}; + 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); } @@ -125,11 +128,13 @@ public class DGlobals { 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 _Level () { return Sliders[0]; } float _SpinHue () { return Sliders[1]; } float _Spark () { return Sliders[2]; } - float _Wiggle () { return Sliders[3]; } - float _Trails () { return Sliders[4]; } + 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; @@ -140,6 +145,7 @@ public class DGlobals { 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(); 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; + 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); } - int c1c (float a) { return int(100*constrain(a,0,1)); } + 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 color(0,0,0); } boolean IsActive() { return this == DG.CurPat; } boolean IsFocused() { return this == midiEngine.getFocusedDeck().getActivePattern(); } void onInactive() { UpdateState(); } - void onActive () { 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); } @@ -221,8 +239,8 @@ public class DPat extends SCPattern params.add(P); return P; } - Pick addPick(String name, int def, int nmax, String[] desc) { - Pick P = new Pick(name, def, nmax, nMaxRow, 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; @@ -230,19 +248,32 @@ public class DPat extends SCPattern DPat(GLucose glucose) { super(glucose); - pSharp = addParam("Shrp", 0 ); - pQuantize = addParam("Qunt", 0 ); - pSaturate = addParam("Sat" , .5); + + pSharp = addParam("Shrp", 0); + pSaturate = addParam("Sat" , .5); + pTransX = addParam("TrnX", .5); + pTransY = addParam("TrnY", .5); + pRotX = addParam("RotX", .5); + pRotY = addParam("RotY", .5); + pRotZ = addParam("RotZ", .5); + pSpin = addParam("Spin", .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 ); + pJog = new DBool("JOG" ,false, 49, 4); bools.add(pJog ); + pKey = new DBool("KBD" ,false, 49, 5); bools.add(pKey ); + pInvert = new DBool("INVRT",false, 49, 6); bools.add(pInvert); + 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]; + //println (model.xMin + " " + model.yMin + " " + model.zMin); //println (model.xMax + " " + model.yMax + " " + model.zMax); DG.Init(); @@ -251,19 +282,20 @@ public class DPat extends SCPattern void run(double deltaMs) { UpdateState(); - NoiseMove += deltaMs; + NoiseMove += deltaMs; NoiseMove = NoiseMove % 1e7; StartRun (deltaMs); - zSpinHue += DG._SpinHue ()*deltaMs*.05; + zSpinHue += DG._SpinHue ()*deltaMs*.05; zSpinHue = zSpinHue % 5000.; xyz P = new xyz(), tP = new xyz(), pSave = new xyz(); + xyz pTrans = new xyz(pTransX.Val()*200-100, pTransY.Val()*100-50,0); float fSharp = 1/(1.0001-pSharp.Val()); - float fQuant = pQuantize.Val(); + float fQuant = DG._Quantize (); float fSaturate = pSaturate.Val(); DG.SetText(); nPoint = 0; - + if (fQuant > 0) { - float tRamp = (lx.tempo.rampf() % (1./pow(2,int((1-fQuant) * 4)))); + float tRamp = (lx.tempo.rampf() % (1./pow(2,floor((1-fQuant) * 4)))); float f = LastQuant; LastQuant = tRamp; if (tRamp > f) return; } @@ -273,12 +305,23 @@ public class DPat extends SCPattern LastJog = tRamp; } - for (Point p : model.points) { nPoint++; + // 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) P.y += DG._Spark () * (noise(P.x,P.y+NoiseMove/30 ,P.z)*mMax.y - mMax.y/2.); - if (DG._Wiggle() > 0) P.y += DG._Wiggle() * (noise(P.x/(mMax.x*.3)-NoiseMove/1500.) - .5) * (mMax.y/2.); + P.subtract(pTrans); + 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); + color cNew, cOld = colors[p.index]; { tP.set(P); cNew = CalcPoint(tP); } @@ -287,14 +330,18 @@ public class DPat extends SCPattern 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 s = saturation(cNew) + 100*(fSaturate*2-1); 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.)); + if (DG.bSustain == true) b = max(b, (float) (brightness(cOld)/100.)); + + if (pInvert.b) { b = 1-b; s = 1-s; } colors[p.index] = color( (hue(cNew) + zSpinHue) % 360, - saturation(cNew) + 100*(fSaturate*2-1), - 100 * b * DG._Dim() + s, + 100 * b * DG._Level() ); // colors[p.index] = color(0,0, p.fx >= modmin.x && p.fy >= modmin.y && p.fz >= modmin.z &&