X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=DanHorwitz.pde;h=ab23fa5ddd69805b312811cb9211278a93f7b1a1;hb=8f4e6c99775f2724edf3cec488860eb68b06491c;hp=5435e62ed7ab0472ef5911c6f871bad71b446197;hpb=957d253fcdc00ed1abd91594535a16f2d163f760;p=SugarCubes.git

diff --git a/DanHorwitz.pde b/DanHorwitz.pde
index 5435e62..ab23fa5 100644
--- a/DanHorwitz.pde
+++ b/DanHorwitz.pde
@@ -1,276 +1,138 @@
 //----------------------------------------------------------------------------------------------------------------------------------
-static 	MidiOutput midiout;
-int		nNumRows  = 6, nNumCols = 8;
-boolean btwn  (int a,int b,int c)		{ return a >= b && a <= c; 	}
-
-public class _P extends BasicParameter {
-	_P(String label, double value) 				{ super(label,value); 									}
-	void 	updateValue	(double value) 			{ super.updateValue(value);								}
-	float 	Val			() 						{ return getValuef();									}
-}
-
-public class Pick {
-	Pick	(String label, int _Def, int _Max)	{ Picks=_Max; Default = _Def; tag=label; 									}
-	int		Cur() 	 							{ return (CurCol-StartCol)*nNumRows + CurRow; 								}
-	int 	Picks, Default, CurRow, CurCol, StartCol, EndCol;
-	String	tag;
-}
-//----------------------------------------------------------------------------------------------------------------------------------
-float xMax,yMax,zMax;
-public class xyz {	float x,y,z;
-			xyz() {x=y=z=0;}
-			xyz(Point p					  ) {x=p.fx	; y=p.fy; z=p.fz;}
-			xyz(float _x,float _y,float _z) {x=_x	; y=_y	; z=_z	;}
-	void	set(float _x,float _y,float _z) {x=_x	; y=_y	; z=_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  );  }
-
-	xyz		RotateX	(xyz o, float a) 		{ return new xyz (	x,
-																cos(a)*(y-o.y) - sin(a)*(z-o.z) + o.y,
-																sin(a)*(y-o.y) + cos(a)*(z-o.z) + o.z);			}
-	
-	xyz		RotateY	(xyz o, float a) 		{ return new xyz (	cos(a)*(x-o.x) - sin(a)*(z-o.z) + o.x,
-																y,
-																sin(a)*(x-o.x) + cos(a)*(z-o.z) + o.z);			}
-	
-	xyz		RotateZ	(xyz o, float a) 		{ return new xyz (	cos(a)*(x-o.x) - sin(a)*(y-o.y) + o.x,
-																sin(a)*(x-o.x) + cos(a)*(y-o.y) + o.y,
-																z	);											}
-	
-	
-	xyz		setRand	()						{ return new xyz ( random(xMax), random(yMax), random(zMax)); 		}
-	xyz		setNorm	() 						{ return new xyz ( x / xMax, y / yMax, z / zMax); 					}
-	
-	
-	float	interp (float a, float b, float c) { return (1-a)*b + a*c; }
-	xyz		interpolate(float i, xyz d)		{ return new xyz ( interp(i,x,d.x), interp(i,y,d.y), interp(i,z,d.z)); }
-}
-//----------------------------------------------------------------------------------------------------------------------------------
-public class hsb { float h,s,b;
-	hsb(color c) { h=hue(c); s=saturation(c); b=brightness(c); }
-	color Out()	 { return color(h%360.,constrain(s,0,100),constrain(b,0,100)); }
-}
-
-public class DPat extends SCPattern
-{
-	float	zSpinHue;
-	xyz		xyzMax, xyz0, xyzMid, xyzHalf;
-
-	ArrayList picks	 	= new ArrayList();
-	int		nMaxCol  	= 0;
-	boolean	bIsActive 	= false;
-	float	Dist	 (xyz a, xyz b) 			{ return dist(a.x,a.y,a.z,b.x,b.y,b.z); 			}
-	float 	c1c		 (float a) 					{ return 100*constrain(a,0,1); 						}
-	int 	mapRow   (int a) 					{ return a == 52 ? 5  : btwn(a,53,57) ? a-53 : a;	}
-	int 	unmapRow (int a) 					{ return a == 5  ? 52 : btwn(a,0 , 4) ? a+53 : a;	}
-	void 	SetLight (int row, int col, int clr){ if (midiout != null) midiout.sendNoteOn(col, unmapRow(row), clr); }
-	void 	keypad   (int row, int col)			{}
-	void 	onInactive() 						{ bIsActive=false; }
-	void 	onActive  () 						{ bIsActive=true;
-		zSpinHue = 0;
-		for (int i=0; i<nNumRows	; i++) for (int j=0; j<nNumCols; j++) SetLight(i, j, 0);
-		for (int i=0; i<picks.size(); i++) UpdateLights((Pick)picks.get(i));
-	}
-	void  	StartRun(int deltaMs) 				{}
-	color 	CalcPoint(Point p) 	  				{ return color(0,0,0); }
-	float 	CalcCone (xyz v1, xyz v2, xyz c) 	{
-		return degrees( acos ( v1.minus(c).dot(v2.minus(c)) / (sqrt(v1.minus(c).dot(v1.minus(c))) * sqrt(v2.minus(c).dot(v2.minus(c))) ) ));
-	}
-
-	
-	void  	run(int deltaMs) {
-		StartRun(deltaMs);
-		zSpinHue += s_SpinHue ()*deltaMs*.05;
-		for (Point p : model.points) {
-			hsb cOld = new hsb(colors[p.index]);
-			hsb cNew = new hsb (CalcPoint(p));
-			if (s_Trails   ()>0) cNew.b  = max(cNew.b,cOld.b - (1-s_Trails()) * deltaMs);
-			if (s_Dim      ()>0) cNew.b *= 1-s_Dim	();
-			if (s_Saturate ()>0) cNew.s += s_Saturate()*100;
-			if (s_SpinHue  ()>0) cNew.h += zSpinHue;
-			if (s_ModHue   ()>0) cNew.h += s_ModHue()*360;
-			colors[p.index] = cNew.Out();
-		}
-	}
-
-	void 	controllerChangeReceived(rwmidi.Controller cc) {
-		if (cc.getCC() == 7 && btwn(cc.getChannel(),0,7)) Sliders[cc.getChannel()] = 1.*cc.getValue()/127.;
-	}
-
-	float	Sliders[] 	= new float[] {0,0,0,0,0,0,0,0};
-	float	s_Trails	()	{ return Sliders[0]; }
-	float	s_Dim		()	{ return Sliders[1]; }
-	float	s_Saturate	()	{ return Sliders[2]; }
-	float	s_SpinHue	()	{ return Sliders[3]; }
-	float	s_ModHue	()	{ return Sliders[4]; }
-
-	DPat(GLucose glucose) {
-		super(glucose);
-		xMax 	= model.xMax; yMax = model.yMax; zMax = model.zMax;
-		xyzMax 	= new xyz(xMax,yMax,zMax);
-		xyzMid	= new xyz(xMax/2, yMax/2, zMax/2);
-		xyzHalf	= new xyz(.5,.5,.5);
-		xyz0	= new xyz(0,0,0);
-	    for (MidiInputDevice  input  : RWMidi.getInputDevices ()) { if (input.toString().contains("APC")) input .createInput (this);}
-	    for (MidiOutputDevice output : RWMidi.getOutputDevices()) {
-			if (midiout == null && output.toString().contains("APC")) midiout = output.createOutput();
-		}
-	}
-
-	void UpdateLights(Pick P) {
-		if (P==null) return;
-		for (int i=0; i<nNumRows; i++) for (int j=P.StartCol; j<=P.EndCol; j++) SetLight(i, j, 0);
-		SetLight(P.CurRow, P.CurCol, 3);
-	}
-
-	Pick GetPick(int row, int col) {
-		for (int i=0; i<picks.size(); i++) { Pick P = (Pick)picks.get(i);
-			if (!btwn(col,P.StartCol,P.EndCol)						) continue;
-			if (!btwn(row,0,nNumRows-1) 							) continue;
-			if (!btwn((col-P.StartCol)*nNumRows + row,0,P.Picks-1)	) continue;
-			return P;
-		}
-		return null;
-	}
-
-	void noteOffReceived(Note note) { if (!bIsActive) return;
-		int row = mapRow(note.getPitch()), col = note.getChannel();
-		UpdateLights(GetPick(row,col));
-	}
-
-	void noteOnReceived (Note note) { if (!bIsActive) return;
-		int row = mapRow(note.getPitch()), col = note.getChannel();
-		Pick P = GetPick(row,col);
-		if (P != null) { P.CurRow=row; P.CurCol=col;} else keypad(row, col);
-	}
-
-	Pick addPick(String name, int def, int nmax) {
-		Pick P 		= new Pick(name, def, nmax); 
-		P.StartCol 	= nMaxCol;
-		P.EndCol	= P.StartCol + int((nmax-1) / nNumRows);
-		nMaxCol 	= P.EndCol	 + 1;
-		P.CurRow	= def % nNumRows;
-		P.CurCol	= P.StartCol + def/nNumRows;
-		picks.add(P);
-		return P;
-	}
-}
-//----------------------------------------------------------------------------------------------------------------------------------
 public class Pong extends DPat {
-	SinLFO x,y,z,dx,dy,dz; 
-	float cRad;	_P pSize;
-	Pick  pChoose;
+	SinLFO x,y,z,dx,dy,dz;
+	float cRad;	BasicParameter pSize;
+	Pick 	pChoose;
+	PVector	v = new PVector(), vMir =  new PVector();
 
 	Pong(GLucose glucose) {
 		super(glucose);
-		cRad = xMax/15;
+		cRad = mMax.x/10;
 		addModulator(dx = new SinLFO(6000,  500, 30000	)).trigger();
 		addModulator(dy = new SinLFO(3000,  500, 22472	)).trigger();
 		addModulator(dz = new SinLFO(1000,  500, 18420	)).trigger();
-		addModulator(x  = new SinLFO(cRad, xMax - cRad, 0)).trigger();	x.modulateDurationBy(dx);
-		addModulator(y  = new SinLFO(cRad, yMax - cRad, 0)).trigger();	y.modulateDurationBy(dy);
-		addModulator(z  = new SinLFO(cRad, zMax - cRad, 0)).trigger();	z.modulateDurationBy(dz);
-	    addParameter(pSize 		= new _P("Size", 0.4	));
-	    pChoose = addPick("Anim", 0	, 3);
+		addModulator(x  = new SinLFO(cRad, mMax.x - cRad, 0)).trigger();	x.modulateDurationBy(dx);
+		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"	, 2, 2, new String[] {"Pong", "Ball", "Cone"}	);
 	}
 
-	color Calc(xyz p, xyz v) {
+	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: return	color(0,0,c1c(1 - min(v.distance(p), v.distance(xyzMax.minus(p)))*.5/cRad));			// balls
-		case 1: return	color(0,0,c1c(1 - v.distance(p)*.5/cRad));												// ball
-		case 2: return	color(0,0,c1c(1 - CalcCone(p,v,new xyz(xMax/2,0,zMax/2)) * max(.02,.45-pSize.Val())));  // spot
+		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-val(pSize))));  	// spot
 		}
-		return color(0,0,0);
+		return lx.hsb(0,0,0);
 	}
-
-	void  	StartRun(int deltaMs) 	{ cRad = xMax*pSize.Val()/6; }
-	color 	CalcPoint(Point p) 	  	{ return Calc(new xyz(p), new xyz(x.getValuef(), y.getValuef(), z.getValuef())); }
 }
 //----------------------------------------------------------------------------------------------------------------------------------
 public class NDat {
-	float xz, yz, zz, hue, sat, speed, angle, den, sharp;
-	float xoff,yoff,zoff;
-	NDat (float _hue, float _sat, float _xz, float _yz, float _zz, float _sharp, float _den, float _speed, float _angle) {
-		hue=_hue; sat=_sat; xz=_xz; yz=_yz; zz =_zz; sharp=_sharp; den=_den; speed=_speed; angle=_angle;
+	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 _xz, float _yz, float _zz, float _den, float _speed, float _angle) {
+		isActive = true;
+		hue=_hue; xz=_xz; yz=_yz; zz =_zz; den=_den; speed=_speed; angle=_angle;
 		xoff = random(100e3); yoff = random(100e3); zoff = random(100e3);
 	}
 }
 
 public class Noise extends DPat
 {
-	int 	CurAnim = -1, numAnims = 6;
-	float 	zTime 	= random(10000), zSpin=0;
-	float	rtime	= 0, ttime	= 0, transAdd=0;
-	int XSym=1,YSym=2,XyzSym=3,RadSym=4;
-
-	ArrayList noises 	= new ArrayList();
-	_P 		pSpeed, pSharp, pDensity, pSpin;
-	Pick 	pChoose, pSymm;
+	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(GLucose glucose) {
 		super(glucose);
-		addParameter(pSpin		= new _P("Spin", .5  ));  addParameter(pSpeed	= new _P("Fast"	, .55));
-		addParameter(pSharp		= new _P("Shrp", .5  ));  addParameter(pDensity	= new _P("Dens" , .5 ));
-		pSymm 	= addPick("Symm", 0, 5);
-		pChoose = addPick("Anim", 0, 6);
+		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 StartRun(int deltaMs) {
-		zTime 	+= deltaMs*(pSpeed.Val()-.5)*.002	;
-		zSpin	+= deltaMs*(pSpin .Val()-.5)*.01	;
+	void onActive() { zTime = random(500); zTheta=0; rtime = 0; ttime = 0; }
+
+	void StartRun(double deltaMs) {
+		zTime 	+= deltaMs*(val(pSpeed)-.5)*.002	;
+		zTheta	+= deltaMs*(spin()-.5)*.01	;
 		rtime	+= deltaMs;
-		transAdd = 1*(1 - constrain(rtime - ttime,0,1000)/1000);
+		iSymm	 = pSymm.Cur();
+		zSin	= sin(zTheta);
+		zCos	= cos(zTheta);
 
 		if (pChoose.Cur() != CurAnim) {
-			noises.clear(); CurAnim = pChoose.Cur(); ttime = rtime;
+			CurAnim = pChoose.Cur(); ttime = rtime;
+			pSpin		.reset();	zTheta 		= 0;
+			pDensity	.reset();	pSpeed		.reset();
+			for (int i=0; i<_ND; i++) { N[i].isActive = false; }
+			
 			switch(CurAnim) {
-			//                          hue sat xz  yz  zz srhp den mph angle
-			case 0: noises.add(new NDat(0  ,0  ,75 ,75 ,150,1  ,45 ,3  ,0  )); break; 	// drip
-			case 1: noises.add(new NDat(0  ,0  ,100,100,200,0  ,45 ,3  ,180)); break;	// clouds
-			case 2: noises.add(new NDat(0  ,0  ,2  ,400,2  ,.5 ,40 ,3  ,0  )); break;	// rain
-			case 3: noises.add(new NDat(40 ,100,100,100,200,0  ,30 ,1  ,180)); 
-					noises.add(new NDat(0  ,100,100,100,200,0  ,30 ,5  ,180)); break;	// fire 1
-			case 4: noises.add(new NDat(0  ,100,40 ,40 ,40 ,.5 ,35 ,2.5,180));
-					noises.add(new NDat(20 ,100,40 ,40 ,40 ,.5 ,35 ,4  ,0  ));
-					noises.add(new NDat(40 ,100,40 ,40 ,40 ,.5 ,35 ,2  ,90 ));
-					noises.add(new NDat(60 ,100,40 ,40 ,40 ,.5 ,35 ,3  ,-90)); break; 	// machine
-			case 5: noises.add(new NDat(0  ,100,400,100,2  ,.5 ,35 ,3  ,225));
-					noises.add(new NDat(20 ,100,400,100,2  ,.5 ,35 ,2.5,45 ));
-					noises.add(new NDat(40 ,400,100,100,2  ,.5 ,35 ,2  ,135));
-					noises.add(new NDat(60 ,400,100,100,2  ,.5 ,35 ,1.5,-45)); break; 	// spark
+			//                          hue xz yz zz den mph angle
+			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.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.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.setValue(.5); break; // spark
 			}
 		}
+		
+		for (int i=0; i<_ND; i++) if (N[i].Active()) {
+			N[i].sinAngle = sin(radians(N[i].angle));
+			N[i].cosAngle = cos(radians(N[i].angle));
+		}
 	}
 
-	color CalcPoint(Point p) {
-		color c = color(0,0,0);
-		int symm = pSymm.Cur();
-		for (int i=0;i<noises.size(); i++) {
-			xyz v = new xyz(p).RotateZ(xyzMid,zSpin);
-
-			if ((symm == XSym || symm == XyzSym) && v.x > xMax/2) 	v.x = xMax-v.x;
-			if ((symm == YSym || symm == XyzSym) && v.y > yMax/2) 	v.y = yMax-v.y;
-			if ((			     symm == XyzSym) && v.z > zMax/2) 	v.z = zMax-v.z;
-
-			NDat  n     = (NDat) noises.get(i);
-			float deg   = radians(n.angle + (symm==XyzSym?45:0));
-			float zx    = zTime * n.speed * sin(deg),
-				  zy    = zTime * n.speed * cos(deg),
-				  sharp = 1/constrain(2-n.sharp - 2*pSharp.Val(),0,1);
-
-			float b     = (symm==RadSym ? noise(zTime*n.speed+n.xoff-Dist(v,xyzMid)/n.xz)
-										: noise(v.x/n.xz+zx+n.xoff,v.y/n.yz+zy+n.yoff,v.z/n.zz+n.zoff))
-							*1.8-.4 + n.den/100 + pDensity.Val() -1;
-
-			b += 	 n.den/100 + pDensity.Val() -1;
-			b = 	b < .5 ? pow(b,sharp) : 1-pow(1-b,sharp);
-			b +=	transAdd;
-			c = 	blendColor(c,color(n.hue,n.sat,c1c(b)),ADD);
+	color CalcPoint(PVector p) {
+		color c = 0;
+		rotateZ(p, mCtr, zSin, zCos);
+
+		if (CurAnim == 6 || CurAnim == 7) {
+			setNorm(p);
+			return lx.hsb(lxh(),100, 100 * (
+							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;
+
+		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-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 + val(pDensity) -1;
+			c = 	blendColor(c,lx.hsb(lxh()+n.hue,100,c1c(b)),ADD);
 		}
 		return c;
 	}
@@ -278,94 +140,413 @@ public class Noise extends DPat
 //----------------------------------------------------------------------------------------------------------------------------------
 public class Play extends DPat
 {
+	public class rAngle {
+		float 	prvA, dstA, c;
+		float 	prvR, dstR, r;		
+		float 	_cos, _sin, x, y;
+		float 	fixAngle	(float a, float b) { return a<b ?
+										(abs(a-b) > abs(a+2*PI-b) ? a : a+2*PI) :
+										(abs(a-b) > abs(a-2*PI-b) ? a : a-2*PI)	; }
+		float	getX(float r)	{	return mCtr.x + _cos*r; }
+		float	getY(float r)	{	return mCtr.y + _sin*r; }
+		void	move() 			{	c 		= interp(t,prvA,dstA); 
+									r 		= interp(t,prvR,dstR);
+									_cos 	= cos(c); 	_sin 	= sin(c);
+	                               x 		= getX(r); 	y 		= getY(r);		}		
+		void	set() 			{	prvA 	= dstA; 	dstA 	= random(2*PI); 	prvA = fixAngle(prvA, dstA);
+									prvR 	= dstR; 	dstR 	= random(mCtr.y);									}
+	}
+
+	BasicParameter 	pAmp, pRadius, pBounce;
+	Pick			pTimePattern, pTempoMult, pShape;
+
+	ArrayList<rWave> waves = new ArrayList<rWave>(10);
+
 	int		nBeats	=  	0;
-	_P 		pAmp, pRotX, pRotY, pRotZ, pRad;
-	Pick	pTimePattern, pTempoMult, pShape;
+	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;
 
 	Play(GLucose glucose) {
 		super(glucose);
-	    addParameter(pAmp  			= new _P("Amp" ,   .2   ));
-	    addParameter(pRotX			= new _P("RotX",    0   ));
-	    addParameter(pRotY			= new _P("RotY",    0   ));
-	    addParameter(pRotZ			= new _P("RotZ",    0   ));
-	    addParameter(pRad			= new _P("Rad" ,   .1   ));
+	    pRadius		= addParam("Rad" 	, .1  	);
+		pBounce		= addParam("Bnc"	, .2	);
+	    pAmp  		= addParam("Amp" 	, .2	);
+		pTempoMult 	= addPick ("TMult"	, 5 , 5		, new String[] {"1x", "2x", "4x", "8x", "16x", "Rand"	}	);
+		pTimePattern= addPick ("TPat"	, 7 , 7		, new String[] {"Bounce", "Sin", "Roll", "Quant", "Accel", "Deccel", "Slide", "Rand"}	);
+		pShape	 	= addPick ("Shape"	, 7 , 15	, new String[] {"Line", "Tap", "V", "RandV",
+																	"Pyramid", "Wings", "W2", "Clock",
+																	"Triangle", "Quad", "Sphere", "Cone",
+																	"Noise", "Wave", "?", "?"} 						);
+	}
 
-		pTimePattern = addPick("TPat",   0 , 5	);
-		pTempoMult 	 = addPick("TMul",   5 , 6	);
-		pShape	 	 = addPick("Shap",   8 , 10	);
+	public class rWave {
+		float v0, a0, x0, t,damp,a;
+		boolean bDone=false;
+		final float len=8;
+		rWave(float _x0, float _a0, float _v0, float _damp) { x0=_x0*len; a0=_a0; v0=_v0; t=0; damp = _damp; }
+		void move(double deltaMs) {
+			t += deltaMs*.001;
+			if (t>4) bDone=true;
+		}
+		float val(float _x) {
+			_x*=len;
+			float dist = t*v0 - abs(_x-x0);
+			if (dist<0) { a=1; return 0; }
+			a  = a0*exp(-dist*damp) * exp(-abs(_x-x0)/(.2*len)); // * max(0,1-t/dur)
+			return	-a*sin(dist);
+		}
+	}
 
-		lx.tempo.setBpm(30);
+	void onReset()  { zTheta=0; super.onReset(); }
+	void onActive() { 
+		zTheta=0; 
+		while (lx.tempo.bpm() > 40) lx.tempo.setBpm(lx.tempo.bpm()/2);
 	}
 
-	float 	t,a;
-	xyz		cPrev = new xyz(), cCur = new xyz(), cMid = new xyz(), cMidNorm;
-	float	LastBeat=3, LastMeasure=3;
-	int		CurRandTempo = 1;
-	
-	void StartRun(int deltaMs) {
-		t = lx.tempo.rampf();
-		a = pAmp.Val();
-		
-		if (t<LastMeasure) { CurRandTempo = int(random(4)); } LastMeasure = t;
-		
-		switch (pTempoMult.Cur()) {
+	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		.getValuef();
+		rad	= pRadius	.getValuef();
+		bnc	= pBounce	.getValuef();		
+		zTheta	+= deltaMs*(val(pSpin)-.5)*.01;
+
+		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<LastMeasure) {
+			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 ;
+
+		switch (nTempo) {
 			case 0: 	t = t;								break;
 			case 1: 	t = (t*2. )%1.;						break;
 			case 2: 	t = (t*4. )%1.;						break;
 			case 3: 	t = (t*8. )%1.;						break;
 			case 4: 	t = (t*16.)%1.;						break;
-			case 5:		t = (t*pow(2,CurRandTempo))%1.;		break;
 		}
 
-		if (t<LastBeat) { cPrev = cCur; cCur = cCur.setRand(); } LastBeat = t;
-
-		switch (pTimePattern.Cur()) {
-			case 0: 	t = sin(PI*t);						break;
-			case 1: 	t = norm(sin(2*PI*(t+PI/2)),-1,1);	break;
-			case 2: 	t = t; 								break;
-			case 3: 	t = constrain(int(t*8)/7.,0,1);		break;
-			case 4: 	t = t*t*t;							break;
+		int i=0; while (i< waves.size()) {
+			rWave w = waves.get(i);
+			w.move(deltaMs); if (w.bDone) waves.remove(i); else i++;
 		}
 
-		cMid 		= cPrev.interpolate(t,cCur);
-		cMidNorm 	= cMid.setNorm();
+		if ((t<LastBeat && pShape.Cur()!=14) || KeyPressed>-1) {
+			waves.add(new rWave(
+						KeyPressed>-1 ? map(KeyPressed,0,7,0,1) : random(1),		// location
+						bnc*10,			// bounciness
+						7,				// velocity
+						2*(1-amp)));	// dampiness
+			KeyPressed=-1;
+			if (waves.size() > 5) waves.remove(0);
+		}
+		
+		if (t<LastBeat) {
+			cPrev.set(cRand); setRand(cRand);
+			a1.set(); a2.set(); a3.set(); a4.set();
+		} LastBeat = t;
+
+		switch (nTPat) {
+			case 0: 	t = sin(PI*t);							break;	// bounce
+			case 1: 	t = norm(sin(2*PI*(t+PI/2)),-1,1);		break;	// sin
+			case 2: 	t = t; 									break;	// roll
+			case 3: 	t = constrain(int(t*8)/7.,0,1);			break;	// quant
+			case 4: 	t = t*t*t;								break;	// accel
+			case 5: 	t = sin(PI*t*.5);						break;	// deccel
+			case 6: 	t = .5*(1-cos(PI*t));					break;	// slide
+		}
+		
+		cMid.set		(cPrev);	interpolate(t,cMid,cRand);
+		cMidNorm.set	(cMid);		setNorm(cMidNorm);
+		a1.move(); a2.move(); a3.move(); a4.move();
 	}
 
-	color CalcPoint(Point p) {
-		xyz V 		= new xyz(0,0,0);
-		xyz P  		= new xyz(p).setNorm(). RotateX(xyzHalf,pRotX.Val()*PI*2).
-											RotateY(xyzHalf,pRotY.Val()*PI*2).
-											RotateZ(xyzHalf,pRotZ.Val()*PI*2);
-		xyz Px 		= new xyz(p);
+	color CalcPoint(PVector Px) {
+		if (theta.x != 0) rotateX(Px, mCtr, tSin.x, tCos.x);
+		if (theta.y != 0) rotateY(Px, mCtr, tSin.y, tCos.y);
+		if (theta.z != 0) rotateZ(Px, mCtr, tSin.z, tCos.z);
 		
-		float mp   = min(P.x, P.z);
-		float yt 	= map(t,0,1,.5-a/2,.5+a/2);
+		Pn.set(Px); setNorm(Pn);
+
+		float mp	= min(Pn.x, Pn.z);
+		float yt 	= map(t,0,1,.5-bnc/2,.5+bnc/2);
+		float r,d;
+
 		switch (pShape.Cur()) {
-		
-			case 0:		V = new xyz(P.x, yt								, P.z); 			break;	// bouncing line
-			case 1:		V = new xyz(P.x, map(cos(PI*t * P.x),-1,1,0,1)  , P.z); 			break;	// top tap
-			case 2:		V = new xyz(P.x, a*map(P.x<.5?P.x:1-P.x,0,.5 ,0,t-.5)+.5, P.z);		break;	// V shape
-			case 3:		V = new xyz(P.x, P.x < cMidNorm.x ? map(P.x,0,cMidNorm.x, .5,yt) :
-															map(P.x,cMidNorm.x,1, yt,.5), P.z);	  break;	//  Random V shape
+		case 0:		V.set(Pn.x, yt							 	, Pn.z); 							break;	// bouncing line
+		case 1:		V.set(Pn.x, map(cos(PI*t * Pn.x),-1,1,0,1)  , Pn.z); 							break;	// top tap
+		case 2:		V.set(Pn.x, bnc*map(Pn.x<.5?Pn.x:1-Pn.x,0,.5 ,0,t-.5)+.5, Pn.z);				break;	// V shape
+		case 3:		V.set(Pn.x, Pn.x < cMidNorm.x ? map(Pn.x,0,cMidNorm.x, .5,yt) :
+												map(Pn.x,cMidNorm.x,1, yt,.5), Pn.z);	  			break;	//  Random V shape
+
+		case 4:		V.set(Pn.x,	.5*(Pn.x < cMidNorm.x ? 	map(Pn.x,0,cMidNorm.x, .5,yt) :
+														map(Pn.x,cMidNorm.x,1, yt,.5)) +
+							.5*(Pn.z < cMidNorm.z ? 	map(Pn.z,0,cMidNorm.z, .5,yt) :
+														map(Pn.z,cMidNorm.z,1, yt,.5)), Pn.z); 		break;	//  Random Pyramid shape
+													
+		case 5:		V.set(Pn.x, bnc*map((Pn.x-.5)*(Pn.x-.5),0,.25,0,t-.5)+.5, Pn.z);				break;	// wings
+		case 6:		V.set(Pn.x, bnc*map((mp  -.5)*(mp  -.5),0,.25,0,t-.5)+.5, Pn.z);				break;	// wings
+
+		case 7:		d = min(
+						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(lxh(),100, d); // clock
+
+		case 8:		r = amp*200 * map(bnc,0,1,1,sin(PI*t));
+					d = min(
+						distToSeg(Px.x, Px.y, a1.getX(r),a1.getY(r), a2.getX(r),a2.getY(r)),
+						distToSeg(Px.x, Px.y, a2.getX(r),a2.getY(r), a3.getX(r),a3.getY(r)),
+						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(lxh(),100, d); // clock
+
+		case 9:		r = amp*200 * map(bnc,0,1,1,sin(PI*t));
+					d = min(
+						distToSeg(Px.x, Px.y, a1.getX(r),a1.getY(r), a2.getX(r),a2.getY(r)),
+						distToSeg(Px.x, Px.y, a2.getX(r),a2.getY(r), a3.getX(r),a3.getY(r)),
+						distToSeg(Px.x, Px.y, a3.getX(r),a3.getY(r), a4.getX(r),a4.getY(r)),
+						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(lxh(),100, d); // clock
+
+		case 10:
+					r = map(bnc,0,1,a1.r,amp*200*sin(PI*t));
+					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(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:	
+		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);
+		}
 
-			case 4:		V = new xyz(P.x, .5*(P.x < cMidNorm.x ? map(P.x,0,cMidNorm.x, .5,yt) :
-															 map(P.x,cMidNorm.x,1, yt,.5)) +
-										 .5*(P.z < cMidNorm.z ? map(P.z,0,cMidNorm.z, .5,yt) :
-															 map(P.z,cMidNorm.z,1, yt,.5)), P.z); break;	//  Random Pyramid shape
-															
-			case 5:		V = new xyz(P.x, a*map((P.x-.5)*(P.x-.5),0,.25,0,t-.5)+.5, P.z);	break;	// wings
-			case 6:		V = new xyz(P.x, a*map((mp -.5)*(mp -.5),0,.25,0,t-.5)+.5, P.z);	break;	// wings
+		return lx.hsb(lxh(), 100, c1c(1 - V.dist(Pn)/rad));
+	}
+}
+//----------------------------------------------------------------------------------------------------------------------------------
+boolean dDebug = false;
+class dCursor {
+	dVertex vCur, vNext, vDest;
+	float 	destSpeed;
+	int 	posStop, pos,posNext;	// 0 - 65535
+	color 	clr;
+
+	dCursor() {}
+
+	boolean isDone	() 									{ return pos==posStop; 										 }
+	boolean atDest  ()									{ return vCur.s==vDest.s || 
+																 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(); 						 }
+
+	float  	minDist;
+	int 	nTurns;
+	boolean bRandEval;
+
+	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 = 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) { 
+		if (t == null || t.pos0<<12 <= pos) return; 
+		evaluate(t.v 	,    t.pos1, t.pos0);
+		evaluate(t.v.opp, 16-t.pos1, t.pos0);
+	}
+
+	void 	pickNext() 	{
+		bRandEval = random(.05+destSpeed) < .05; minDist=500; nTurns=0;
+		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);
+	}
 
-			case 7:		V = new xyz(cMid.x,cMid.y,cMid.z);
-						return color(0,0,c1c(1 - (V.distance(Px) > (pRad.getValuef()+.1)*100?1:0)) );	// sphere
+	LXPoint 	p1, p2; int i2;
 
-			case 8:		V = new xyz(cMid.x,cMid.y,cMid.z);
-						return color(0,0,c1c(1 - CalcCone(Px,V,xyzMid) * 0.02 > .5?1:0));  			// cone
+	int draw(int nAmount, SCPattern pat) {
+		int nFrom	= (pos    ) >> 12;
+		int	nMv 	= min(nAmount, posStop-pos);
+		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(); }}
+								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;
+			}	
+}
+
+//----------------------------------------------------------------------------------------------------------------------------------
+class Worms extends SCPattern {
+	float 	StripsPerSec 	= 10;
+	float	TrailTime		= 3000;
+	int 	numCursors		= 50;
+	ArrayList<dCursor> cur  = new ArrayList<dCursor>(30);
+
+	private GraphicEQ eq = null;
+
+	private BasicParameter pBeat	  = new BasicParameter("BEAT",  0);
+	private BasicParameter pSpeed     = new BasicParameter("FAST", .2);
+	private BasicParameter pBlur      = new BasicParameter("BLUR", .3);
+	private BasicParameter pWorms     = new BasicParameter("WRMS", .3);
+	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);
+
+	float 	zMidLat = 82.;
+	float 	nConfusion;
+	private final Click moveChase = new Click(1000);
+
+	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; }
+	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); 
+	    addModulator(moveChase).start();
+	    addParameter(pBeat);    addParameter(pSpeed);
+	    addParameter(pBlur);    addParameter(pWorms);
+	    addParameter(pEQ);	    addParameter(pConfusion);
+		addParameter(pSpawn);	addParameter(pColor);
+
+	    middle = new PVector(1.5*model.cx, 1.5*model.cy, 71);
+		if (lattice == null) lattice = new dLattice();
+		for (int i=0; i<numCursors; i++) { dCursor c = new dCursor(); reset(c); cur.add(c); }
+		onParameterChanged(pEQ); setNewDest();
+	}
+
+	void onParameterChanged(LXParameter parameter) {
+		super.onParameterChanged(parameter);
+		nConfusion = 1-pConfusion.getValuef();
+		for (int i=0; i<numCursors; i++) {
+			if (parameter==pSpawn) reset(cur.get(i));
+			cur.get(i).destSpeed = nConfusion;
 		}
+	}
 
-		return color(0,0,c1c(1 - V.distance(P)/pRad.getValuef() > .5?1:0));
+	float getClr() { return lx.getBaseHuef() + random(pColor.getValuef()*300); }
+	void reset(dCursor c) {
+		switch(AnimNum()) {
+			case 0:	c.clr = lx.hsb(getClr(),100,100);			// middle to edges
+					c.setDest(lattice.getClosest(randEdge()).v, nConfusion);
+					c.setCur (lattice.getClosest(middle));
+					break;
+
+			case 1:	c.clr = lx.hsb(getClr(),100,100);				// top to bottom
+					float xLin = randX();
+					c.setDest(lattice.getClosest(new PVector(xLin, 0         , zMidLat)).v, nConfusion);
+					c.setCur (lattice.getClosest(new PVector(xLin, model.yMax, zMidLat)));
+					break;
+
+			case 2: c.clr = lx.hsb(getClr(),100,100); break; 		// chase a point around
+
+			case 3: boolean bLeft = random(2)<1;
+					c.clr = lx.hsb(getClr()+random(120),100,100);				// sideways
+					float yLin = randX();
+					c.setDest(lattice.getClosest(new PVector(bLeft ? 0 : model.xMax,yLin,zMidLat)).v, nConfusion);
+					c.setCur (lattice.getClosest(new PVector(bLeft ? model.xMax : 0,yLin,zMidLat)));
+					break;
+		}
+		if (pBlur.getValuef() == 1 && random(2)<1) c.clr = lx.hsb(0,0,0);
+	}
+
+	void setNewDest() {
+		if (AnimNum() != 2) return;
+		PVector dest = new PVector(randX(), randY(), zMidLat);
+		for (int i=0; i<numCursors; i++) {
+			cur.get(i).setDest(lattice.getClosest(dest).v, nConfusion);
+			cur.get(i).clr = lx.hsb(getClr()+75,100,100);	// chase a point around
+		}
 	}
+
+	void run(double deltaMs) { 
+		if (deltaMs > 100) return;
+	    if (moveChase.click()) setNewDest();
+
+	    float fBass=0, fTreble=0;
+	    if (pEQ.getValuef()>0) {		// EQ
+		    eq.run(deltaMs);
+		    fBass 	= eq.getAverageLevel(0, 4);
+		    fTreble = eq.getAverageLevel(eq.numBands-7, 7);
+		}
+
+		if (pBlur.getValuef() < 1) {	// trails
+			for (int i=0,s=model.points.size(); i<s; i++) {
+				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));
+			}
+		}
+
+		int nWorms = floor(pWorms.getValuef() * numCursors * 
+					 map(pEQ.getValuef(),0,1,1,constrain(2*fTreble,0,1)));
+
+		for (int i=0; i<nWorms; i++) {
+			dCursor c = cur.get(i);
+			int nLeft = floor((float)deltaMs*.001*StripsPerSec * 65536 * (5*pSpeed.getValuef()));
+			nLeft *= (1 - lx.tempo.rampf()*pBeat.getValuef());
+			while(nLeft > 0) { 
+				nLeft = c.draw(nLeft,this); if (!c.isDone()) continue;
+				c.onDone(); if (c.atDest()) reset(c);
+			}
+		}
+	}
+
+
+	public void onActive() { if (eq == null) {
+		eq = new GraphicEQ(lx, 16);		eq.slope.setValue(0.6);
+		eq.level.setValue(0.65);		eq.range.setValue(0.35);
+		eq.release.setValue(0.4);
+	}}
 }
-//----------------------------------------------------------------------------------------------------------------------------------
\ No newline at end of file
+//----------------------------------------------------------------------------------------------------------------------------------