X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=DanHorwitz.pde;h=cdec36b6b1d160b44e8e3aeeda1a1d1c62a76621;hb=dde759833df1c0190d9d3a982a90c0a4f8d76a26;hp=009d74f5515b6e2966c81026b9af109e6d5981ab;hpb=d174ec52e9ed7bdb10f9bd9384f200bc97fe1c0e;p=SugarCubes.git diff --git a/DanHorwitz.pde b/DanHorwitz.pde index 009d74f..cdec36b 100644 --- a/DanHorwitz.pde +++ b/DanHorwitz.pde @@ -1,12 +1,12 @@ //---------------------------------------------------------------------------------------------------------------------------------- public class Pong extends DPat { SinLFO x,y,z,dx,dy,dz; - float cRad; DParam pSize; + float cRad; BasicParameter pSize; Pick pChoose; - xyz v = new xyz(), vMir = new xyz(); + PVector v = new PVector(), vMir = new PVector(); - Pong(GLucose glucose) { - super(glucose); + Pong(LX lx) { + super(lx); cRad = mMax.x/10; addModulator(dx = new SinLFO(6000, 500, 30000 )).trigger(); addModulator(dy = new SinLFO(3000, 500, 22472 )).trigger(); @@ -15,19 +15,19 @@ public class Pong extends DPat { addModulator(y = new SinLFO(cRad, mMax.y - cRad, 0)).trigger(); y.modulateDurationBy(dy); addModulator(z = new SinLFO(cRad, mMax.z - cRad, 0)).trigger(); z.modulateDurationBy(dz); pSize = addParam ("Size" , 0.4 ); - pChoose = addPick ("Animiation" , 0, 2, new String[] {"Pong", "Ball", "Cone"} ); + pChoose = addPick ("Animiation" , 2, 2, new String[] {"Pong", "Ball", "Cone"} ); } - void StartRun(double deltaMs) { cRad = mMax.x*pSize.Val()/6; } - color CalcPoint(xyz p) { + void StartRun(double deltaMs) { cRad = mMax.x*val(pSize)/6; } + color CalcPoint(PVector p) { v.set(x.getValuef(), y.getValuef(), z.getValuef()); v.z=0;p.z=0;// ignore z dimension switch(pChoose.Cur()) { - case 0: vMir.set(mMax); vMir.subtract(p); - return lx.hsb(lxh(),100,c1c(1 - min(v.distance(p), v.distance(vMir))*.5/cRad)); // balls - case 1: return lx.hsb(lxh(),100,c1c(1 - v.distance(p)*.5/cRad)); // ball + case 0: vMir.set(mMax); vMir.sub(p); + return lx.hsb(lxh(),100,c1c(1 - min(v.dist(p), v.dist(vMir))*.5/cRad)); // balls + case 1: return lx.hsb(lxh(),100,c1c(1 - v.dist(p)*.5/cRad)); // ball case 2: vMir.set(mMax.x/2,0,mMax.z/2); - return lx.hsb(lxh(),100,c1c(1 - CalcCone(p,v,vMir) * max(.02,.45-pSize.Val()))); // spot + return lx.hsb(lxh(),100,c1c(1 - calcCone(p,v,vMir) * max(.02,.45-val(pSize)))); // spot } return lx.hsb(0,0,0); } @@ -49,16 +49,16 @@ public class NDat { public class Noise extends DPat { - int CurAnim, iSymm; - int XSym=1,YSym=2,RadSym=3; - float zTime , zTheta=0, zSin, zCos, rtime, ttime, transAdd; - DParam pSpeed , pDensity, pSharp; - Pick pChoose, pSymm; - int _ND = 4; - NDat N[] = new NDat[_ND]; - - Noise(GLucose glucose) { - super(glucose); + int CurAnim, iSymm; + int XSym=1,YSym=2,RadSym=3; + float zTime , zTheta=0, zSin, zCos, rtime, ttime; + BasicParameter pSpeed , pDensity, pSharp; + Pick pChoose, pSymm; + int _ND = 4; + NDat N[] = new NDat[_ND]; + + Noise(LX lx) { + super(lx); pSpeed = addParam("Fast" , .55); pDensity = addParam("Dens" , .5); pSharp = addParam("Shrp" , 0); @@ -67,13 +67,13 @@ public class Noise extends DPat for (int i=0; i<_ND; i++) N[i] = new NDat(); } - void StartPattern() { zTime = random(500); zTheta=0; rtime = 0; ttime = 0; transAdd=0; } + void onActive() { zTime = random(500); zTheta=0; rtime = 0; ttime = 0; } + void StartRun(double deltaMs) { - zTime += deltaMs*(pSpeed.Val()-.5)*.002 ; - zTheta += deltaMs*(pSpin .Val()-.5)*.01 ; + zTime += deltaMs*(val(pSpeed)-.5)*.002 ; + zTheta += deltaMs*(spin()-.5)*.01 ; rtime += deltaMs; iSymm = pSymm.Cur(); - transAdd = 1*(1 - constrain(rtime - ttime,0,1000)/1000); zSin = sin(zTheta); zCos = cos(zTheta); @@ -85,22 +85,20 @@ public class Noise extends DPat switch(CurAnim) { // hue xz yz zz den mph angle - case 0: N[0].set(0 ,75 ,75 ,150,45 ,3 ,0 ); pSharp.set(1 ); break; // drip - case 1: N[0].set(0 ,100,100,200,45 ,3 ,180); pSharp.set(0 ); break; // clouds - case 2: N[0].set(0 ,2 ,400,2 ,20 ,3 ,0 ); pSharp.set(.5); break; // rain + case 0: N[0].set(0 ,75 ,75 ,150,45 ,3 ,0 ); pSharp.setValue(1 ); break; // drip + case 1: N[0].set(0 ,100,100,200,45 ,3 ,180); pSharp.setValue(0 ); break; // clouds + case 2: N[0].set(0 ,2 ,400,2 ,20 ,3 ,0 ); pSharp.setValue(.5); break; // rain case 3: N[0].set(40 ,100,100,200,10 ,1 ,180); - N[1].set(0 ,100,100,200,10 ,5 ,180); pSharp.set(0 ); break; // fire 1 + N[1].set(0 ,100,100,200,10 ,5 ,180); pSharp.setValue(0 ); break; // fire 1 case 4: N[0].set(0 ,40 ,40 ,40 ,15 ,2.5,180); N[1].set(20 ,40 ,40 ,40 ,15 ,4 ,0 ); N[2].set(40 ,40 ,40 ,40 ,15 ,2 ,90 ); - N[3].set(60 ,40 ,40 ,40 ,15 ,3 ,-90); pSharp.set(.5); break; // machine + N[3].set(60 ,40 ,40 ,40 ,15 ,3 ,-90); pSharp.setValue(.5); break; // machine case 5: N[0].set(0 ,400,100,2 ,15 ,3 ,90 ); N[1].set(20 ,400,100,2 ,15 ,2.5,0 ); N[2].set(40 ,100,100,2 ,15 ,2 ,180); - N[3].set(60 ,100,100,2 ,15 ,1.5,270); pSharp.set(.5); break; // spark + N[3].set(60 ,100,100,2 ,15 ,1.5,270); pSharp.setValue(.5); break; // spark } - - DG.UpdateLights(); } for (int i=0; i<_ND; i++) if (N[i].Active()) { @@ -109,32 +107,31 @@ public class Noise extends DPat } } - color CalcPoint(xyz P) { + color CalcPoint(PVector p) { color c = 0; - P.RotateZ(mCtr, zSin, zCos); + rotateZ(p, mCtr, zSin, zCos); if (CurAnim == 6 || CurAnim == 7) { - P.setNorm(); + setNorm(p); return lx.hsb(lxh(),100, 100 * ( - constrain(1-50*(1-pDensity.Val())*abs(P.y-sin(zTime*10 + P.x*(300))*.5 - .5),0,1) + - (CurAnim == 7 ? constrain(1-50*(1-pDensity.Val())*abs(P.x-sin(zTime*10 + P.y*(300))*.5 - .5),0,1) : 0)) + constrain(1-50*(1-val(pDensity))*abs(p.y-sin(zTime*10 + p.x*(300))*.5 - .5),0,1) + + (CurAnim == 7 ? constrain(1-50*(1-val(pDensity))*abs(p.x-sin(zTime*10 + p.y*(300))*.5 - .5),0,1) : 0)) ); } - if (iSymm == XSym && P.x > mMax.x/2) P.x = mMax.x-P.x; - if (iSymm == YSym && P.y > mMax.y/2) P.y = mMax.y-P.y; + if (iSymm == XSym && p.x > mMax.x/2) p.x = mMax.x-p.x; + if (iSymm == YSym && p.y > mMax.y/2) p.y = mMax.y-p.y; for (int i=0;i<_ND; i++) if (N[i].Active()) { NDat n = N[i]; float zx = zTime * n.speed * n.sinAngle, zy = zTime * n.speed * n.cosAngle; - float b = (iSymm==RadSym ? noise(zTime*n.speed+n.xoff-Dist(P,mCtr)/n.xz) - : noise(P.x/n.xz+zx+n.xoff,P.y/n.yz+zy+n.yoff,P.z/n.zz+n.zoff)) + float b = (iSymm==RadSym ? noise(zTime*n.speed+n.xoff-p.dist(mCtr)/n.xz) + : noise(p.x/n.xz+zx+n.xoff,p.y/n.yz+zy+n.yoff,p.z/n.zz+n.zoff)) *1.8; - b += n.den/100 -.4 + pDensity.Val() -1; - b += transAdd; + b += n.den/100 -.4 + val(pDensity) -1; c = blendColor(c,lx.hsb(lxh()+n.hue,100,c1c(b)),ADD); } return c; @@ -160,28 +157,26 @@ public class Play extends DPat prvR = dstR; dstR = random(mCtr.y); } } - int nBeats = 0; - DParam pAmp, pRadius, pBounce; + BasicParameter pAmp, pRadius, pBounce; + Pick pTimePattern, pTempoMult, pShape; - float t,amp,rad,bnc; - float zTheta=0; ArrayList waves = new ArrayList(10); - rAngle a1 = new rAngle(), a2 = new rAngle(), - a3 = new rAngle(), a4 = new rAngle(); - xyz cPrev = new xyz(), cRand = new xyz(), - cMid = new xyz(), V = new xyz(), - Theta = new xyz(), TSin = new xyz(), - TCos = new xyz(), cMidNorm = new xyz(), - Pn = new xyz(); + int nBeats = 0; + float t,amp,rad,bnc,zTheta=0; + + rAngle a1 = new rAngle(), a2 = new rAngle(), + a3 = new rAngle(), a4 = new rAngle(); + PVector cPrev = new PVector(), cRand = new PVector(), + cMid = new PVector(), V = new PVector(), + theta = new PVector(), tSin = new PVector(), + tCos = new PVector(), cMidNorm = new PVector(), + Pn = new PVector(); float LastBeat=3, LastMeasure=3; - int CurRandTempo = 1, CurRandTPat = 1; - - Pick pTimePattern, pTempoMult, pShape; - int RandCube; + int curRandTempo = 1, curRandTPat = 1; - Play(GLucose glucose) { - super(glucose); + Play(LX lx) { + super(lx); pRadius = addParam("Rad" , .1 ); pBounce = addParam("Bnc" , .2 ); pAmp = addParam("Amp" , .2 ); @@ -211,25 +206,37 @@ public class Play extends DPat } } - void StartPattern() { zTheta=0; } + void onReset() { zTheta=0; super.onReset(); } + void onActive() { + zTheta=0; + while (lx.tempo.bpm() > 40) lx.tempo.setBpm(lx.tempo.bpm()/2); + } + + int KeyPressed = -1; + boolean noteOn(Note note) { + int row = note.getPitch(), col = note.getChannel(); + if (row == 57) {KeyPressed = col; return true; } + return super.noteOn(note); + } + void StartRun(double deltaMs) { t = lx.tempo.rampf(); - amp = pAmp.Val(); - rad = pRadius.getValuef(); - bnc = pBounce.getValuef(); - zTheta += deltaMs*(pSpin .Val()-.5)*.01; + amp = pAmp .getValuef(); + rad = pRadius .getValuef(); + bnc = pBounce .getValuef(); + zTheta += deltaMs*(val(pSpin)-.5)*.01; - Theta .set(pRotX.Val()*PI*2, pRotY.Val()*PI*2, pRotZ.Val()*PI*2 + zTheta); - TSin .set(sin(Theta.x), sin(Theta.y), sin(Theta.z)); - TCos .set(cos(Theta.x), cos(Theta.y), cos(Theta.z)); + theta .set(val(pRotX)*PI*2, val(pRotY)*PI*2, val(pRotZ)*PI*2 + zTheta); + tSin .set(sin(theta.x), sin(theta.y), sin(theta.z)); + tCos .set(cos(theta.x), cos(theta.y), cos(theta.z)); if (t 6 ? 2+int(random(5)) : int(random(7)); } + if (random(3) < 1) { curRandTempo = int(random(4)); if (curRandTempo == 3) curRandTempo = int(random(4)); } + if (random(3) < 1) { curRandTPat = pShape.Cur() > 6 ? 2+int(random(5)) : int(random(7)); } } LastMeasure = t; - int nTempo = pTempoMult .Cur(); if (nTempo == 5) nTempo = CurRandTempo; - int nTPat = pTimePattern.Cur(); if (nTPat == 7) nTPat = CurRandTPat ; + int nTempo = pTempoMult .Cur(); if (nTempo == 5) nTempo = curRandTempo; + int nTPat = pTimePattern.Cur(); if (nTPat == 7) nTPat = curRandTPat ; switch (nTempo) { case 0: t = t; break; @@ -244,18 +251,18 @@ public class Play extends DPat w.move(deltaMs); if (w.bDone) waves.remove(i); else i++; } - if ((t-1) { + if ((t-1) { waves.add(new rWave( - pKey.b ? map(DG.KeyPressed,0,7,0,1) : random(1), // location + KeyPressed>-1 ? map(KeyPressed,0,7,0,1) : random(1), // location bnc*10, // bounciness 7, // velocity 2*(1-amp))); // dampiness - DG.KeyPressed=-1; + KeyPressed=-1; if (waves.size() > 5) waves.remove(0); } if (t .5?1:0)); // cone + return lx.hsb(lxh(),100,c1c(1 - calcCone(Px,cMid,mCtr) * 0.02 > .5?1:0)); // cone case 12: return lx.hsb(lxh() + noise(Pn.x,Pn.y,Pn.z + (NoiseMove+50000)/1000.)*200, 85,c1c(Pn.y < noise(Pn.x + NoiseMove/2000.,Pn.z)*(1+amp)-amp/2.-.1 ? 1 : 0)); // noise - case 13: float y=0; for (rWave w : waves) y += .5*w.val(Pn.x); + case 13: + case 14: float y=0; for (rWave w : waves) y += .5*w.val(Pn.x); // wave V.set(Pn.x, .7+y, Pn.z); break; default: return lx.hsb(0,0,0); } - return lx.hsb(lxh(), 100, c1c(1 - V.distance(Pn)/rad)); + return lx.hsb(lxh(), 100, c1c(1 - V.dist(Pn)/rad)); } } //---------------------------------------------------------------------------------------------------------------------------------- -// 0 - TLB, L (b), BLB, B (l) // Fwd , Down, Back, Up -// 4 - TLF, F (l), BLF, L (f) // Fwd , Down, Back, Up -// 8 - TRF, R (f), BRF, F (r) // Back, Down, Fwd , Up -// 12- TRB, B (r), BRB, R (b) // Back, Down, Fwd , Up -// 1->7, 15->9 - -int randDir() { return round(random(1))*2-1; } -//---------------------------------------------------------------------------------------------------------------------------------- -boolean dDebug = true; +boolean dDebug = false; class dCursor { dVertex vCur, vNext, vDest; float destSpeed; @@ -366,42 +366,44 @@ class dCursor { boolean isDone () { return pos==posStop; } boolean atDest () { return vCur.s==vDest.s || - PointDist(vCur.getPoint(0), vDest.getPoint(0)) < 12 || - PointDist(vCur.getPoint(0), vDest.getPoint(15))< 12;} - void setCur (dVertex _v, int _p) { p2=null; vCur=_v; pos=_p; PickNext(); } + xyDist(vCur.getPoint(0), vDest.getPoint(0)) < 12 || + xyDist(vCur.getPoint(0), vDest.getPoint(15))< 12;} + void setCur (dVertex _v, int _p) { p2=null; vCur=_v; pos=_p; pickNext(); } void setCur (dPixel _p) { setCur(_p.v, _p.pos); } void setNext (dVertex _v, int _p, int _s) { vNext = _v; posNext = _p<<12; posStop = _s<<12; } void setDest (dVertex _v, float _speed) { vDest = _v; destSpeed = _speed; } - void onDone () { setCur(vNext, posNext); PickNext(); } + void onDone () { setCur(vNext, posNext); pickNext(); } float minDist; int nTurns; boolean bRandEval; - void Evaluate(dVertex v, int p, int s) { + void evaluate(dVertex v, int p, int s) { if (v == null) return; ++nTurns; if (bRandEval) { if (random(nTurns) < 1) setNext(v,p,s); return; } else { - float d = PointDist(v.getPoint(15), vDest.getPoint(0)); + float d = xyDist(v.getPoint(15), vDest.getPoint(0)); if (d < minDist) { minDist=d; setNext(v,p,s); } if (d == minDist && random(2)<1) { minDist=d; setNext(v,p,s); } } } - void EvalTurn(dTurn t) { + void evalTurn(dTurn t) { if (t == null || t.pos0<<12 <= pos) return; - Evaluate(t.v , t.pos1, t.pos0); - Evaluate(t.v.opp, 16-t.pos1, t.pos0); + evaluate(t.v , t.pos1, t.pos0); + evaluate(t.v.opp, 16-t.pos1, t.pos0); } - void PickNext() { + void pickNext() { bRandEval = random(.05+destSpeed) < .05; minDist=500; nTurns=0; - Evaluate(vCur.c0, 0, 16); Evaluate(vCur.c1, 0, 16); - EvalTurn(vCur.t0); EvalTurn(vCur.t1); + evaluate(vCur.c0, 0, 16); evaluate(vCur.c1, 0, 16); + evaluate(vCur.c2, 0, 16); evaluate(vCur.c3, 0, 16); + evalTurn(vCur.t0); evalTurn(vCur.t1); + evalTurn(vCur.t2); evalTurn(vCur.t3); } - Point p1, p2; int i2; + LXPoint p1, p2; int i2; int draw(int nAmount, SCPattern pat) { int nFrom = (pos ) >> 12; @@ -409,14 +411,14 @@ class dCursor { int nTo = min(15,(pos+nMv) >> 12); dVertex v = vCur; - if (dDebug) { p1 = v.getPoint(nFrom); float d = (p2 == null ? 0 : PointDist(p1,p2)); if (d>5) { println("too wide! quitting: " + d); exit(); }} + if (dDebug) { p1 = v.getPoint(nFrom); float d = (p2 == null ? 0 : pointDist(p1,p2)); if (d>5) { println("too wide! quitting: " + d); exit(); }} for (int i = nFrom; i <= nTo; i++) { pat.getColors()[v.ci + v.dir*i ] = clr; } if (v.same != null) for (int i = nFrom; i <= nTo; i++) { pat.getColors()[v.same.ci + v.same.dir*i] = clr; } if (dDebug) { p2 = v.getPoint(nTo); i2 = nTo; } pos += nMv; return nAmount - nMv; - } + } } //---------------------------------------------------------------------------------------------------------------------------------- @@ -437,34 +439,35 @@ class Worms extends SCPattern { private BasicParameter pSpawn = new BasicParameter("DIR" , 0); private BasicParameter pColor = new BasicParameter("CLR" , .1); - int zMidLat = 82; + float zMidLat = 82.; float nConfusion; private final Click moveChase = new Click(1000); - xyz middle; + PVector middle; int AnimNum() { return floor(pSpawn.getValuef()*(4-.01)); } float randX() { return random(model.xMax-model.xMin)+model.xMin; } float randY() { return random(model.yMax-model.yMin)+model.yMin; } - xyz randEdge() { - return random(2) < 1 ? new xyz(random(2)<1 ? model.xMin:model.xMax, randY(), zMidLat) : - new xyz(randX(), random(2)<1 ? model.yMin:model.yMax, zMidLat) ; + PVector randEdge() { + return random(2) < 1 ? new PVector(random(2)<1 ? model.xMin:model.xMax, randY(), zMidLat) : + new PVector(randX(), random(2)<1 ? model.yMin:model.yMax, zMidLat) ; } - Worms(GLucose glucose) { - super(glucose); + Worms(LX lx) { + super(lx); addModulator(moveChase).start(); addParameter(pBeat); addParameter(pSpeed); addParameter(pBlur); addParameter(pWorms); addParameter(pEQ); addParameter(pConfusion); addParameter(pSpawn); addParameter(pColor); - middle = new xyz(model.cx, model.cy, 71); + middle = new PVector(1.5*model.cx, 1.5*model.cy, 71); if (lattice == null) lattice = new dLattice(); for (int i=0; i