X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=DanHorwitz.pde;h=acf85949d17ba3229bcda89838b7d273c21e0fc6;hb=66067e53a4adab2860ba09f88e2c3f8984ff65ba;hp=856c579a2e8ac7c7a14ce809b378abea3e4980d9;hpb=a5e5b14c18126657ce8f673173b7cb009d5ee26e;p=SugarCubes.git diff --git a/DanHorwitz.pde b/DanHorwitz.pde index 856c579..acf8594 100644 --- a/DanHorwitz.pde +++ b/DanHorwitz.pde @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------------------------------------------------------------- public class Pong extends DPat { - SinLFO x,y,z,dx,dy,dz; + SinLFO x,y,z,dx,dy,dz; float cRad; DParam pSize; Pick pChoose; xyz v = new xyz(), vMir = new xyz(); @@ -24,25 +24,25 @@ public class Pong extends DPat { v.z=0;p.z=0;// ignore z dimension switch(pChoose.Cur()) { case 0: vMir.set(mMax); vMir.subtract(p); - return lx.hsb(0,0,c1c(1 - min(v.distance(p), v.distance(vMir))*.5/cRad)); // balls - case 1: return lx.hsb(0,0,c1c(1 - v.distance(p)*.5/cRad)); // ball + 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 2: vMir.set(mMax.x/2,0,mMax.z/2); - return lx.hsb(0,0,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-pSize.Val()))); // spot } return lx.hsb(0,0,0); } } //---------------------------------------------------------------------------------------------------------------------------------- public class NDat { - float xz, yz, zz, hue, sat, speed, angle, den; + float xz, yz, zz, hue, speed, angle, den; float xoff,yoff,zoff; float sinAngle, cosAngle; boolean isActive; NDat () { isActive=false; } boolean Active() { return isActive; } - void set (float _hue, float _sat, float _xz, float _yz, float _zz, float _den, float _speed, float _angle) { + void set (float _hue, float _xz, float _yz, float _zz, float _den, float _speed, float _angle) { isActive = true; - hue=_hue; sat=_sat; xz=_xz; yz=_yz; zz =_zz; den=_den; speed=_speed; angle=_angle; + hue=_hue; xz=_xz; yz=_yz; zz =_zz; den=_den; speed=_speed; angle=_angle; xoff = random(100e3); yoff = random(100e3); zoff = random(100e3); } } @@ -52,7 +52,7 @@ 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; + DParam pSpeed , pDensity, pSharp; Pick pChoose, pSymm; int _ND = 4; NDat N[] = new NDat[_ND]; @@ -61,12 +61,14 @@ public class Noise extends DPat super(glucose); pSpeed = addParam("Fast" , .55); pDensity = addParam("Dens" , .5); + pSharp = addParam("Shrp" , 0); pSymm = addPick("Symmetry" , 0, 3, new String[] {"None", "X", "Y", "Radial"} ); pChoose = addPick("Animation", 6, 7, new String[] {"Drip", "Cloud", "Rain", "Fire", "Machine", "Spark","VWave", "Wave"} ); 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; transAdd=0; } + void StartRun(double deltaMs) { zTime += deltaMs*(pSpeed.Val()-.5)*.002 ; zTheta += deltaMs*(pSpin .Val()-.5)*.01 ; @@ -83,23 +85,21 @@ public class Noise extends DPat for (int i=0; i<_ND; i++) { N[i].isActive = false; } switch(CurAnim) { - // hue sat xz yz zz den mph angle - case 0: N[0].set(0 ,0 ,75 ,75 ,150,45 ,3 ,0 ); pSharp.set(1 ); break; // drip - case 1: N[0].set(0 ,0 ,100,100,200,45 ,3 ,180); pSharp.set(0 ); break; // clouds - case 2: N[0].set(0 ,0 ,2 ,400,2 ,20 ,3 ,0 ); pSharp.set(.5); break; // rain - case 3: N[0].set(40 ,1 ,100,100,200,10 ,1 ,180); - N[1].set(0 ,1 ,100,100,200,10 ,5 ,180); pSharp.set(0 ); break; // fire 1 - case 4: N[0].set(0 ,1 ,40 ,40 ,40 ,15 ,2.5,180); - N[1].set(20 ,1 ,40 ,40 ,40 ,15 ,4 ,0 ); - N[2].set(40 ,1 ,40 ,40 ,40 ,15 ,2 ,90 ); - N[3].set(60 ,1 ,40 ,40 ,40 ,15 ,3 ,-90); pSharp.set(.5); break; // machine - case 5: N[0].set(0 ,1 ,400,100,2 ,15 ,3 ,90 ); - N[1].set(20 ,1 ,400,100,2 ,15 ,2.5,0 ); - N[2].set(40 ,1 ,100,100,2 ,15 ,2 ,180); - N[3].set(60 ,1 ,100,100,2 ,15 ,1.5,270); pSharp.set(.5); break; // spark + // 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 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 + 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 + 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 } - - DG.UpdateLights(); } for (int i=0; i<_ND; i++) if (N[i].Active()) { @@ -111,15 +111,15 @@ public class Noise extends DPat color CalcPoint(xyz P) { color c = 0; P.RotateZ(mCtr, zSin, zCos); - + if (CurAnim == 6 || CurAnim == 7) { P.setNorm(); - return lx.hsb(0,0, 100 * ( + 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)) ); } - + 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; @@ -127,14 +127,14 @@ public class Noise extends DPat 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)) *1.8; b += n.den/100 -.4 + pDensity.Val() -1; b += transAdd; - c = blendColor(c,color(n.hue,100*n.sat,c1c(b)),ADD); + c = blendColor(c,lx.hsb(lxh()+n.hue,100,c1c(b)),ADD); } return c; } @@ -166,12 +166,12 @@ public class Play extends DPat 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(), + 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(); float LastBeat=3, LastMeasure=3; int CurRandTempo = 1, CurRandTPat = 1; @@ -210,7 +210,18 @@ public class Play extends DPat } } - void StartPattern() { zTheta=0; } + 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(); @@ -243,13 +254,13 @@ 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); } @@ -303,7 +314,7 @@ public class Play extends DPat distToSeg(Px.x, Px.y, a1.getX(70),a1.getY(70), mCtr.x, mCtr.y), distToSeg(Px.x, Px.y, a2.getX(40),a2.getY(40), mCtr.x, mCtr.y)); d = constrain(30*(rad*40-d),0,100); - return lx.hsb(0,max(0,150-d), d); // clock + return lx.hsb(lxh(),100, d); // clock case 8: r = amp*200 * map(bnc,0,1,1,sin(PI*t)); d = min( @@ -312,7 +323,7 @@ public class Play extends DPat distToSeg(Px.x, Px.y, a3.getX(r),a3.getY(r), a1.getX(r),a1.getY(r)) // triangle ); d = constrain(30*(rad*40-d),0,100); - return lx.hsb(0,max(0,150-d), d); // clock + return lx.hsb(lxh(),100, d); // clock case 9: r = amp*200 * map(bnc,0,1,1,sin(PI*t)); d = min( @@ -322,29 +333,28 @@ public class Play extends DPat distToSeg(Px.x, Px.y, a4.getX(r),a4.getY(r), a1.getX(r),a1.getY(r)) // quad ); d = constrain(30*(rad*40-d),0,100); - return lx.hsb(0,max(0,150-d), d); // clock + return lx.hsb(lxh(),100, d); // clock case 10: r = map(bnc,0,1,a1.r,amp*200*sin(PI*t)); - return lx.hsb(0,0,c1c(.9+2*rad - dist(Px.x,Px.y,a1.getX(r),a1.getY(r))*.03) ); // sphere + return lx.hsb(lxh(),100,c1c(.9+2*rad - dist(Px.x,Px.y,a1.getX(r),a1.getY(r))*.03) ); // sphere case 11: Px.z=mCtr.z; cMid.z=mCtr.z; - return lx.hsb(0,0,c1c(1 - CalcCone(Px,cMid,mCtr) * 0.02 > .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(100 + noise(Pn.x,Pn.y,Pn.z + (NoiseMove+50000)/1000.)*200, + 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(0, - 150-c1c(1 - V.distance(Pn)/rad), - c1c(1 - V.distance(Pn)/rad)); + return lx.hsb(lxh(), 100, c1c(1 - V.distance(Pn)/rad)); } } //---------------------------------------------------------------------------------------------------------------------------------- @@ -367,39 +377,39 @@ 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(); } + 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(); } 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 = pointDist(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); + evalTurn(vCur.t0); evalTurn(vCur.t1); } Point p1, p2; int i2; @@ -410,14 +420,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; - } + } } //---------------------------------------------------------------------------------------------------------------------------------- @@ -436,13 +446,14 @@ class Worms extends SCPattern { private BasicParameter pConfusion = new BasicParameter("CONF", .1); private BasicParameter pEQ = new BasicParameter("EQ" , 0); private BasicParameter pSpawn = new BasicParameter("DIR" , 0); + private BasicParameter pColor = new BasicParameter("CLR" , .1); int zMidLat = 82; float nConfusion; private final Click moveChase = new Click(1000); xyz middle; - int AnimNum() { return floor(pSpawn.getValuef()*(4-.01)); } + 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() { @@ -456,7 +467,8 @@ class Worms extends SCPattern { addParameter(pBeat); addParameter(pSpeed); addParameter(pBlur); addParameter(pWorms); addParameter(pEQ); addParameter(pConfusion); - addParameter(pSpawn); + addParameter(pSpawn); addParameter(pColor); + middle = new xyz(model.cx, model.cy, 71); if (lattice == null) lattice = new dLattice(); for (int i=0; i0) colors[i] = color(hue(c), saturation(c), (float)(b-100*deltaMs/(pBlur.getValuef()*TrailTime))); + color c = colors[i]; float b = lx.b(c); + if (b>0) colors[i] = lx.hsb(lx.h(c), lx.s(c), constrain((float)(b-100*deltaMs/(pBlur.getValuef()*TrailTime)),0,100)); } }