From: bb3dan Date: Wed, 25 Sep 2013 20:20:23 +0000 (-0400) Subject: updates on dpat X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=6680a94a61653b9c2089dc3be2e0be475d358f26;p=SugarCubes.git updates on dpat more updates --- diff --git a/DanHorwitz.pde b/DanHorwitz.pde index 3744086..d73b6c4 100755 --- a/DanHorwitz.pde +++ b/DanHorwitz.pde @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------------------------------------------------------------- public class Pong extends DPat { SinLFO x,y,z,dx,dy,dz; - float cRad; _DhP pSize; + float cRad; DParam pSize; Pick pChoose; Pong(GLucose glucose) { @@ -49,7 +49,7 @@ public class Noise extends DPat int XSym=1,YSym=2,RadSym=3; float zTime = random(10000), zTheta=0, zSin, zCos; float rtime = 0, ttime = 0, transAdd=0; - _DhP pSpeed , pDensity, pRotZ; + DParam pSpeed , pDensity, pRotZ; Pick pChoose, pSymm; int _ND = 4; NDat N[] = new NDat[_ND]; @@ -131,8 +131,8 @@ public class Noise extends DPat public class Play extends DPat { int nBeats = 0; - _DhP pAmp, pRad; - _DhP pRotX, pRotY, pRotZ; + DParam pAmp, pRad; + DParam pRotX, pRotY, pRotZ; xyz Theta = new xyz(); xyz TSin = new xyz(); xyz TCos = new xyz(); @@ -147,8 +147,8 @@ public class Play extends DPat pRotZ = addParam("RotZ", .5); pAmp = addParam("Amp" , .2); pRad = addParam("Rad" , .1 ); - pTempoMult = addPick ("TMult" , 0 , 6 , new String[] {"1x", "2x", "4x", "8x", "16x", "Rand" } ); - pTimePattern= addPick ("TPat" , 0 , 5 , new String[] {"Bounce", "Sin", "Roll", "Quant", "Accel" } ); + pTempoMult = addPick ("TMult" , 5 , 6 , new String[] {"1x", "2x", "4x", "8x", "16x", "Rand" } ); + pTimePattern= addPick ("TPat" , 5 , 6 , new String[] {"Bounce", "Sin", "Roll", "Quant", "Accel", "Rand" } ); pShape = addPick ("Shape" , 0 , 10 , new String[] {"Line", "Tap", "V", "RandV", "Pyramid", "Wings", "W2", "Sphere", "Cone", "Noise" } ); pForm = addPick ("Form" , 0 , 3 , new String[] {"Bar", "Volume", "Fade" } ); @@ -157,7 +157,7 @@ public class Play extends DPat float t,a; xyz cPrev = new xyz(), cCur = new xyz(), cMid = new xyz(), cMidNorm; float LastBeat=3, LastMeasure=3; - int CurRandTempo = 1; + int CurRandTempo = 1, CurRandTPat = 1; void StartRun(double deltaMs) { t = lx.tempo.rampf(); @@ -167,20 +167,25 @@ public class Play extends DPat TSin .set(sin(Theta.x), sin(Theta.y), sin(Theta.z)); TCos .set(cos(Theta.x), cos(Theta.y), cos(Theta.z)); - if (t= 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, String d[]) { NumPicks=_Max; Default = _Def; tag=label; Desc = d; } - int Cur() { return (CurRow-StartRow)*NumApcCols + CurCol; } - int NumPicks, Default, CurRow, CurCol, StartRow, EndRow; - String Desc[] ; - String tag ; + int Cur() { return (CurRow-StartRow)*NumApcCols + CurCol; } + String CurDesc() { return Desc[Cur()]; } + void reset() { CurCol = Default % NumApcCols; CurRow = StartRow + Default / NumApcCols; } + + int NumPicks, Default , + CurRow , CurCol , + 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); + tag = label; Desc = d; + reset(); + } } -//---------------------------------------------------------------------------------------------------------------------------------- -public class _DhP extends BasicParameter { + +public class DBool { + boolean def, b; + String tag; + int row, col; + void reset() { b = def; } + DBool(String _tag, boolean _def, int _row, int _col) { + def = _def; b = _def; tag = _tag; row = _row; col = _col; + } +} + +public class DParam extends BasicParameter { double dflt; - _DhP (String label, double value) { super(label,value); dflt=value; } + 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(); } @@ -31,11 +51,8 @@ public class xyz { float x,y,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 ); } - boolean isZero () {return x==0 && y==0 && z==0; } + void add (xyz b) {x += b.x; y += b.y; z += b.z; } + void add (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; @@ -66,91 +83,74 @@ public class DGlobals { boolean bInit = false; MidiOutput APCOut = null; MidiInput APCIn = null, OxygenIn = null; - DPat CurPat = null;// NextPat = null; - boolean _XSym = false, _YSym = false, - _ZSym = false, _RSym = false; - String Text1 = "", Text2 = ""; + DPat CurPat = null; - 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 Sliders[] = new float [] {1,0,0,0,0,0,0,0}; + String SliderText[] = new String[] {"Level", "SpinHue", "Spark", "Wiggle", "Trails", "??", "??", "??"}; 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 (APCOut != null) APCOut.sendNoteOn(col, unmapRow(row), clr); } - void SetKnob (int cc , int chan,int val){ if (APCOut != null) APCOut.sendController(cc , chan , val); } + void SetKnob (int cc , int c , int v ){ if (APCOut != null) APCOut.sendController(cc , c, v); } - float _Trails () { return Sliders[0]; } - float _Dim () { return Sliders[1]; } - float _Saturate () { return Sliders[2]; } - float _SpinHue () { return Sliders[3]; } - float _ModHue () { return Sliders[4]; } - float _NoiseHue () { return Sliders[5]; } - float _Spark () { return Sliders[6]; } - float _Wiggle () { return Sliders[7]; } + 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 _Wiggle () { return Sliders[3]; } + float _Trails () { return Sliders[4]; } void Init () { if (bInit) return; bInit=true; - for (MidiOutputDevice output : RWMidi.getOutputDevices()) { if (APCOut == null && output.toString().contains("APC")) APCOut = output.createOutput(); } - for (MidiInputDevice input : RWMidi.getInputDevices ()) { if (input.toString().contains("APC")) input.createInput (this); } + 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;}} } - - void SetText() - { - if (!isFocused()) return; - Text1 = ""; Text2 = ""; - Text1 += " XSym: " + (_XSym ? "ON" : "OFF") + " "; - Text1 += " YSym: " + (_YSym ? "ON" : "OFF") + " "; - Text1 += " ZSym: " + (_ZSym ? "ON" : "OFF") + " "; - Text1 += " RSym: " + (_RSym ? "ON" : "OFF") + " "; - for (int i=0; i 40) lx.tempo.setBpm(lx.tempo.bpm()/2); - for (int i=0; i 0) { + float tRamp = (lx.tempo.rampf() % (1./pow(2,int((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(random(xdMax*.2)-.1, + random(ydMax*.2)-.1, + random(zdMax*.2)-.1); + LastJog = tRamp; + } + for (Point p : model.points) { nPoint++; P.set(p); - if (DG._Spark () > 0) P.y += DG._Spark () * (noise(P.x,P.y+NoiseMove/30 ,P.z)*ydMax - ydMax/2.); - if (DG._Wiggle() > 0) P.y += DG._Wiggle() * (noise(P.x/(xdMax*.3)-NoiseMove/1500.) - .5) * (ydMax/2.); - - color cOld = colors[p.index]; + if (pJog.b) P.add(xyzJog); + if (DG._Spark () > 0) P.y += DG._Spark () * (noise(P.x,P.y+NoiseMove/30 ,P.z)*ydMax - ydMax/2.); + if (DG._Wiggle() > 0) P.y += DG._Wiggle() * (noise(P.x/(xdMax*.3)-NoiseMove/1500.) - .5) * (ydMax/2.); + color cOld = colors[p.index]; color cNew = CalcPoint(P); - if (DG._XSym) cNew = blendColor(cNew, CalcPoint(new xyz(xdMax-P.x,P.y,P.z)), ADD); - if (DG._YSym) cNew = blendColor(cNew, CalcPoint(new xyz(P.x,ydMax-P.y,P.z)), ADD); - if (DG._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 noizhue = DG._NoiseHue()==0 ? 0 : DG._NoiseHue()*360*noise( - P.x/(xdMax*.3)+NoiseMove*.0003, - P.y/(ydMax*.3)+NoiseMove*.00025, - P.z/(zdMax*.3)+NoiseMove*.0002 ); - - cNew = color( (hue(cNew) + modhue + zSpinHue - noizhue) % 360, - saturation(cNew) + 100*DG._Saturate(), - 100 * (DG._Trails()==0 ? b : max(b, (float) (brightness(cOld)/100. - (1-DG._Trails()) * deltaMs/200.))) - * (DG._Dim ()==0 ? 1 : 1-DG._Dim()) - ); - - colors[p.index] = cNew; + + if (pXsym.b) cNew = blendColor(cNew, CalcPoint(new xyz(xdMax-P.x,P.y,P.z)), ADD); + if (pYsym.b) cNew = blendColor(cNew, CalcPoint(new xyz(P.x,ydMax-P.y,P.z)), ADD); + if (pZsym.b) cNew = blendColor(cNew, CalcPoint(new xyz(P.x,P.y,zdMax-P.z)), 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() + ); } } }