From: bb3dan <gitdan@citopia.com>
Date: Wed, 25 Sep 2013 23:53:48 +0000 (-0400)
Subject: updates on dpat
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=3661fceed6aa9b6023c31850b42b86fc807d5abb;p=SugarCubes.git

updates on dpat

a few more updates, also added midi buttons for boom and flash on the
apc40
---

diff --git a/DanHorwitz.pde b/DanHorwitz.pde
index d73b6c4..a51f0a4 100755
--- a/DanHorwitz.pde
+++ b/DanHorwitz.pde
@@ -2,7 +2,8 @@
 public class Pong extends DPat {
 	SinLFO x,y,z,dx,dy,dz; 
 	float cRad;	DParam pSize;
-	Pick  pChoose;
+	Pick 	pChoose;
+	xyz 	v = new xyz(), vMir =  new xyz();
 
 	Pong(GLucose glucose) {
 		super(glucose);
@@ -19,14 +20,16 @@ public class Pong extends DPat {
 
 	void  	StartRun(double deltaMs) 	{ cRad = xdMax*pSize.Val()/6; }
 	color	CalcPoint(xyz p) 	  	{
-		xyz v = new xyz(x.getValuef(), y.getValuef(), z.getValuef());
+		v.set(x.getValuef(), y.getValuef(), z.getValuef());
 		switch(pChoose.Cur()) {
-		case 0: return color(0,0,c1c(1 - min(v.distance(p), v.distance(xyzdMax.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(xdMax/2,0,zdMax/2)) * max(.02,.45-pSize.Val())));  // spot
+		case 0: vMir.set(xyzdMax); vMir.subtract(p);
+				return color(0,0,c1c(1 - min(v.distance(p), v.distance(vMir))*.5/cRad));	// balls
+		case 1: return color(0,0,c1c(1 - v.distance(p)*.5/cRad));							// ball
+		case 2: vMir.set(xdMax/2,0,zdMax/2);
+				return color(0,0,c1c(1 - CalcCone(p,v,vMir) * max(.02,.45-pSize.Val())));  	// spot
 		}
 		return color(0,0,0);
-	}		
+	}
 }
 //----------------------------------------------------------------------------------------------------------------------------------
 public class NDat {
@@ -80,19 +83,19 @@ public class Noise extends DPat
 			
 			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 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
+					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
+					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
+					N[3].set(60 ,1  ,100,100,2  ,15 ,1.5,270); pSharp.set(.5); break; // spark
 			}
 
 			DG.UpdateLights();
@@ -133,10 +136,17 @@ public class Play extends DPat
 	int		nBeats	=  	0;
 	DParam 	pAmp, pRad;
 	DParam	pRotX, pRotY, pRotZ;
-	xyz		Theta 	= new xyz();
-	xyz		TSin	= new xyz();
-	xyz		TCos	= new xyz();
-	
+
+	float 	t,amp;
+	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;
+
+
 	Pick	pTimePattern, pTempoMult, pShape, pForm;
 	int		RandCube;
 
@@ -149,19 +159,14 @@ public class Play extends DPat
 	    pRad		= addParam("Rad" 	, .1  		);
 		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",
+		pShape	 	= addPick ("Shape"	, 4 , 10	, new String[] {"Line", "Tap", "V", "RandV", "Pyramid",
 																	"Wings", "W2", "Sphere", "Cone", "Noise" } 	);
 		pForm	 	= addPick ("Form"	, 0 , 3		, new String[] {"Bar", "Volume", "Fade"					}	);
 	}
 
-	float 	t,a;
-	xyz		cPrev = new xyz(), cCur = new xyz(), cMid = new xyz(), cMidNorm;
-	float	LastBeat=3, LastMeasure=3;
-	int		CurRandTempo = 1, CurRandTPat = 1;
-
 	void StartRun(double deltaMs) {
-		t = lx.tempo.rampf();
-		a = pAmp.Val();
+		t 	= lx.tempo.rampf();
+		amp = pAmp.Val();
 
 		Theta	.set(pRotX.Val()*PI*2, pRotY.Val()*PI*2, pRotZ.Val()*PI*2);
 		TSin	.set(sin(Theta.x), sin(Theta.y), sin(Theta.z));
@@ -183,7 +188,7 @@ public class Play extends DPat
 			case 4: 	t = (t*16.)%1.;						break;
 		}
 
-		if (t<LastBeat) { cPrev = cCur; cCur = cCur.setRand(); } LastBeat = t;
+		if (t<LastBeat) { cPrev.set(cRand); cRand.setRand(); } LastBeat = t;
 
 		switch (nTPat) {
 			case 0: 	t = sin(PI*t);						break;
@@ -192,54 +197,54 @@ public class Play extends DPat
 			case 3: 	t = constrain(int(t*8)/7.,0,1);		break;
 			case 4: 	t = t*t*t;							break;
 		}
-
 		
-		cMid 				= cPrev.interpolate(t,cCur);
-		cMidNorm 			= cMid.setNorm();
+		cMid.set		(cPrev);	cMid.interpolate	(t,cRand);
+		cMidNorm.set	(cMid);		cMidNorm.setNorm();
 	}
 
 	color CalcPoint(xyz Px) {
-		xyz V 		= 			new xyz();
-		xyz P 		= 			Px.setNorm();
-		if (Theta.x != 0)		P.RotateX(xyzHalf, TSin.x, TCos.x);
-		if (Theta.y != 0)		P.RotateY(xyzHalf, TSin.y, TCos.y);
-		if (Theta.z != 0)		P.RotateZ(xyzHalf, TSin.z, TCos.z);
+		Px.zoomX(1.3);
+		
+		Pn.set(Px); Pn.setNorm();
+		if (Theta.x != 0)		Pn.RotateX(xyzHalf, TSin.x, TCos.x);
+		if (Theta.y != 0)		Pn.RotateY(xyzHalf, TSin.y, TCos.y);
+		if (Theta.z != 0)		Pn.RotateZ(xyzHalf, TSin.z, TCos.z);
 
-		float mp	= min(P.x, P.z);
-		float yt 	= map(t,0,1,.5-a/2,.5+a/2);
+		float mp	= min(Pn.x, Pn.z);
+		float yt 	= map(t,0,1,.5-amp/2,.5+amp/2);
 
 		switch (pShape.Cur()) {
-			case 0:		V.set(P.x, yt							  , P.z); 							break;	// bouncing line
-			case 1:		V.set(P.x, map(cos(PI*t * P.x),-1,1,0,1)  , P.z); 							break;	// top tap
-			case 2:		V.set(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.set(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 4:		V.set(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.set(P.x, a*map((P.x-.5)*(P.x-.5),0,.25,0,t-.5)+.5, P.z);					break;	// wings
-			case 6:		V.set(P.x, a*map((mp -.5)*(mp -.5),0,.25,0,t-.5)+.5, P.z);					break;	// wings
-
-			case 7:		V.set(cMid.x,cMid.y,cMid.z);
-						return color(0,0,c1c(1 - (V.distance(Px) > (pRad.getValuef()+.1)*150?1:0)) );		// sphere
-
-			case 8:		V.set(cMid.x,cMid.y,cMid.z);
-						return color(0,0,c1c(1 - CalcCone(Px,V,xyzMid) * 0.02 > .5?1:0));  					// cone
-
-			case 9:		return color(100 + noise(P.x,P.y,P.z + (NoiseMove+50000)/1000.)*200,
-							85,c1c(P.y < noise(P.x + NoiseMove/2000.,P.z)*(1+a)-a/2.-.1 ? 1 : 0));			//
+			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, amp*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, amp*map((Pn.x-.5)*(Pn.x-.5),0,.25,0,t-.5)+.5, Pn.z);				break;	// wings
+			case 6:	V.set(Pn.x, amp*map((mp -.5)*(mp -.5),0,.25,0,t-.5)+.5, Pn.z);					break;	// wings
+
+			case 7:	V.set(cMid); return color(0,0,c1c(1 - (V.distance(Px) > (pRad.getValuef()+.1)*150?1:0)) );	// sphere
+			case 8:	V.set(cMid); return color(0,0,c1c(1 - CalcCone(Px,V,xyzMid) * 0.02 > .5?1:0));  			// cone
+			case 9:	
+				
+				
+			case 10:	return color(100 + 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
+			default:	return color(0,0,0);
 		}
 
 
 		switch (pForm.Cur()) {
-			case 0:		return color(0,0,c1c(1 - V.distance(P)/pRad.getValuef() > .5?1:0));
-			case 1:		return color(0,0,c1c(P.y < V.y ?1:0));
-			case 2:		return color(0,0,c1c(1 - V.distance(P)/pRad.getValuef()));
+			case 0:		return color(0,0,c1c(1 - V.distance(Pn)/pRad.getValuef() > .5?1:0));
+			case 1:		return color(0,0,c1c(Pn.y < V.y ?1:0));
+			case 2:		return color(0,0,c1c(1 - V.distance(Pn)/pRad.getValuef()));
 
-			default:	return color(0,0,c1c(P.y < V.y ?1:0));
+			default:	return color(0,0,c1c(Pn.y < V.y ?1:0));
 		}
 	}
 }
diff --git a/DanUtil.pde b/DanUtil.pde
index e9c3663..c098524 100644
--- a/DanUtil.pde
+++ b/DanUtil.pde
@@ -7,12 +7,7 @@ boolean btwn  (int 		a,int 	 b,int 		c)		{ return a >= b && a <= c; 	}
 boolean btwn  (double 	a,double b,double 	c)		{ return a >= b && a <= c; 	}
 
 public class Pick {
-	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	,
+	int 	NumPicks, Default	,	CurRow	, CurCol	,
 			StartRow, EndRow	;
 	String  tag		, Desc[]	;
 	
@@ -22,6 +17,16 @@ public class Pick {
 		tag			= label; 	Desc 	= d;
 		reset();
 	}
+
+	int		Cur() 	 		{ return (CurRow-StartRow)*NumApcCols + CurCol;					}
+	String	CurDesc() 		{ return Desc[Cur()]; }
+	void	reset() 		{ CurCol = Default % NumApcCols; CurRow	= StartRow + Default / NumApcCols; }
+
+	boolean set(int r, int c)	{
+		if (!btwn(r,StartRow,EndRow) || !btwn(c,0,NumApcCols-1) ||
+			!btwn((r-StartRow)*NumApcCols + c,0,NumPicks-1)) 	return false;
+		CurRow=r; CurCol=c; 									return true;
+	}
 }
 
 public class DBool {
@@ -29,6 +34,7 @@ public class DBool {
 	String	tag;
 	int		row, col;
 	void 	reset() { b = def; }
+	boolean set	(int r, int c, boolean val) { if (r != row || c != col) return false; b = val; return true; }
 	DBool(String _tag, boolean _def, int _row, int _col) {
 		def = _def; b = _def; tag = _tag; row = _row; col = _col;
 	}
@@ -37,7 +43,7 @@ public class DBool {
 public class DParam extends BasicParameter {
 	double  dflt;
 	DParam	(String label, double value) 		{ super(label,value); dflt=value;		}
-	void 	Set			(double value) 			{ super.setValue(value);				}
+	void 	set			(double value) 			{ super.setValue(value);				}
 	void 	reset		() 						{ super.setValue(dflt);					}
 	float 	Val			() 						{ return getValuef();					}
 }
@@ -47,12 +53,17 @@ public class xyz {	float x,y,z;
 			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(Point p					  ) {x=p.fx	; y=p.fy; z=p.fz;}
+	void	set(xyz p					  ) {x=p.x	; y=p.y ; z=p.z ;}
 	void	set(float _x,float _y,float _z) {x=_x	; y=_y	; z=_z	;}
+
+	void	zoomX	(float zx) 				{x = x*zx - xdMax*(zx-1)/2;				}
+	void	zoomY	(float zy) 				{y = y*zy - ydMax*(zy-1)/2;				}
+
 	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);  	}
 	void	add		(xyz b)					{x += b.x; y += b.y; z += b.z;			}
 	void	add		(float b)				{x += b  ; y += b  ; z += b  ;			}
+	void	subtract(xyz b)					{x -= b.x; y -= b.y; z -= b.z;			}
 
 	void	RotateZ	  (xyz o, float nSin, float nCos) {
 		float nX = nCos*(x-o.x) - nSin*(y-o.y) + o.x;
@@ -72,11 +83,12 @@ public class xyz {	float x,y,z;
 		z = nZ; x = nX;
 	}
 
-	xyz		setRand	()						{ return new xyz ( random(xdMax), random(ydMax), random(zdMax)); 		}
-	xyz		setNorm	() 						{ return new xyz ( x / xdMax, y / ydMax, z / zdMax); 					}
+	void	setRand	()						{ x = random(xdMax); y = random(ydMax); z = random(zdMax); 	}
+	void	setNorm	() 						{ x /= xdMax; y /= ydMax; z /= zdMax; 						}
 	
 	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)); }
+
+	void	interpolate(float i, xyz d)		{ x = interp(i,x,d.x); y = interp(i,y,d.y); z = interp(i,z,d.z); }
 }
 //----------------------------------------------------------------------------------------------------------------------------------
 public class DGlobals {
@@ -87,32 +99,30 @@ public class DGlobals {
 
 	float		Sliders[] 		= new float [] {1,0,0,0,0,0,0,0};
 	String  	SliderText[]	= new String[] {"Level", "SpinHue", "Spark", "Wiggle", "Trails", "??", "??", "??"};
+	
+	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); 	}
+	void 		SetKnob	 	(int cc , int c  , int v  ){ if (APCOut != null) APCOut.sendController	(cc , c, v); 		}
 
-	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 c  , int v  ){ if (APCOut != null) APCOut.sendController(cc , c, v); }
-
-	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); }
+	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]; }
+	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		() {
+	void		Init		() {
 		if (bInit) return; bInit=true;
 	    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;}}
 	}
 	
-	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) {
+	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) {
 		CurPat = p;
 		while (lx.tempo.bpm() > 40) lx.tempo.setBpm(lx.tempo.bpm()/2);
 		for (int i=0; i<p.params.size(); i++) GetParam(i).reset();
@@ -121,7 +131,7 @@ public class DGlobals {
 		UpdateLights();
 	}
 
-	void SetText() {
+	void 	SetText() {
 		if (!isFocused()) return;
 		String Text1="", Text2="";
 		for (int i=0; i<CurPat.bools.size(); i++) if (GetBool(i).b) Text1 += " " + GetBool(i).tag       + "   ";
@@ -131,56 +141,33 @@ public class DGlobals {
 	}
 
 	void 	UpdateLights() {
-		if (!isFocused()) return;
-		for (int i=0; i<NumApcRows	; i++) for (int j=0; j<NumApcCols; j++) SetLight(i, j, 0);
-		for (int i=48;i< 56		; i++) SetKnob(0, i, 0);
-		for (int i=16;i< 20		; i++) SetKnob(0, i, 0);
-
-		for (int i=0; i<CurPat.picks.size()	; i++) SetLight	(GetPick(i).CurRow, GetPick(i).CurCol, 3);
-		for (int i=0; i<CurPat.bools.size()	; i++) SetLight	(GetBool(i).row, GetBool(i).col, GetBool(i).b ? 3 : 0);
-		for (int i=0; i<CurPat.params.size(); i++) SetKnob	( 0, i<=55 ? 48+i : 16 + i - 8, int(GetParam(i).Val()*127) );
+		if (!isFocused() || APCOut == null) return;
+		for (int i=53;i< 58; i++) for (int j=0; j<NumApcCols; j++) SetNoteOn(i, j, 0);
+		for (int i=48;i< 56; i++) SetKnob(0, i, 0);
+		for (int i=16;i< 20; i++) SetKnob(0, i, 0);
+
+		for (int i=0; i<CurPat.params.size(); i++) SetKnob		( 0, i<8 ? 48+i : 16 + i - 8, int(GetParam(i).Val()*127) );
+		for (int i=0; i<CurPat.picks .size(); i++) SetNoteOn	(GetPick(i).CurRow, GetPick(i).CurCol, 3);
+		for (int i=0; i<CurPat.bools .size(); i++) if (GetBool(i).b) 	SetNoteOn	(GetBool(i).row, GetBool(i).col, 1);
+													else				SetNoteOff	(GetBool(i).row, GetBool(i).col, 0);
 	}
-	
+
 	void 	controllerChangeReceived(rwmidi.Controller cc) {
 		if (cc.getCC() == 7 && btwn(cc.getChannel(),0,7)) { Sliders[cc.getChannel()] = 1.*cc.getValue()/127.; }
 	}
 
-	double Tap1 = 0;
-	double getNow() { return millis() + 1000*second() + 60*1000*minute() + 3600*1000*hour(); }
-
-	void noteOffReceived(Note note) {
-		if (!isFocused()) return;
-		int row = mapRow(note.getPitch()), col = note.getChannel();
-
-		if (row == 50 && col == 0 && btwn(getNow() - Tap1,5000,300*1000)) {	// hackish tapping mechanism
-			double bpm = 32.*60000./(getNow()-Tap1);
-			while (bpm < 20) bpm*=2;
-			while (bpm > 40) bpm/=2;
-			lx.tempo.setBpm(bpm); lx.tempo.trigger(); Tap1=0; println("Tap Set - " + bpm + " bpm");
-		}
-
+	void noteOffReceived(Note note) { if (!isFocused()) return;
+		int row = note.getPitch(), col = note.getChannel();
+		for (int i=0; i<CurPat.bools.size(); i++) if (GetBool(i).set(row, col, false)) return;
 		UpdateLights();
 	}
 
-	void noteOnReceived (Note note) {
-		if (!isFocused()) return;
-		int row = mapRow(note.getPitch()), col = note.getChannel();
-		
-		if (row == 50 && col == 0) 	{ lx.tempo.trigger(); Tap1 = getNow(); return; }
-		
-		for (int i=0; i<CurPat.picks.size(); i++) { Pick P = GetPick(i);
-			if (!btwn(row,P.StartRow,P.EndRow)							) continue;
-			if (!btwn(col,0,NumApcCols-1) 								) continue;
-			if (!btwn((row-P.StartRow)*NumApcCols + col,0,P.NumPicks-1)	) continue;
-			P.CurRow=row; P.CurCol=col; return;
-		}
-		
-		for (int i=0; i<CurPat.bools.size(); i++) { DBool B = GetBool(i);
-			if (row == GetBool(i).row && col == B.col) 	{ B.b = !B.b; return; }
-		}
+	void noteOnReceived (Note note) { if (!isFocused()) return;
+		int row = note.getPitch(), col = note.getChannel();
+		for (int i=0; i<CurPat.picks.size(); i++) if (GetPick(i).set(row, col)) 	  return;
+		for (int i=0; i<CurPat.bools.size(); i++) if (GetBool(i).set(row, col, true)) return;
+		println("row: " + row + "  col:   " + col);
 	}
-	
-	
 }
 //----------------------------------------------------------------------------------------------------------------------------------
 public class DPat extends SCPattern
@@ -188,7 +175,7 @@ public class DPat extends SCPattern
 	ArrayList 	picks	 	= new ArrayList();
 	ArrayList 	params 		= new ArrayList();
 	ArrayList 	bools		= new ArrayList();
-	int			nMaxRow  	= 0;
+	int			nMaxRow  	= 53;
 	float		zSpinHue 	= 0;
 	float		LastQuant	= -1, LastJog = -1;
 	int 		nPoint	, nPoints;
@@ -202,8 +189,9 @@ public class DPat extends SCPattern
 	DBool		pXsym, pYsym, pZsym, pJog;
 	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));			}
-	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))) ) ));	}
+	float 		CalcCone (xyz v1, xyz v2, xyz c) 	{	v1.subtract(c); v2.subtract(c);
+														return degrees( acos ( v1.dot(v2) /
+															(sqrt(v1.dot(v1)) * sqrt(v2.dot(v2)) ) ));	}
 	void  		StartRun(double deltaMs) 			{								}
 	color		CalcPoint(xyz p) 					{ return color(0,0,0); 			}
 	boolean		IsActive()							{ return this == DG.CurPat;												}
@@ -224,7 +212,7 @@ public class DPat extends SCPattern
 		picks.add(P);
 		return P;
 	}
-	
+
 	DPat(GLucose glucose) {
 		super(glucose);
 		DG.Init();
@@ -239,10 +227,10 @@ public class DPat extends SCPattern
 		xyzdMax 	=  new xyz(xdMax,ydMax,zdMax);
 		xyzMid		=  new xyz(xdMax/2, ydMax/2, zdMax/2);
 		
-		bools.add(pXsym 	= new DBool("X-SYM", false, 82, 0));
-		bools.add(pYsym 	= new DBool("Y-SYM", false, 83, 0));
-		bools.add(pZsym 	= new DBool("Z-SYM", false, 84, 0));
-		bools.add(pJog		= new DBool("JOGGER",false, 85, 0));
+		bools.add(pXsym 	= new DBool("X-SYM", false, 49, 0));
+		bools.add(pYsym 	= new DBool("Y-SYM", false, 49, 1));
+		bools.add(pZsym 	= new DBool("Z-SYM", false, 49, 2));
+		bools.add(pJog		= new DBool("JOGGER",false, 49, 3));
 	}
 
 	void run(double deltaMs)
@@ -251,7 +239,7 @@ public class DPat extends SCPattern
 		NoiseMove   	+= deltaMs;
 		StartRun		(deltaMs);
 		zSpinHue 		+= DG._SpinHue ()*deltaMs*.05;
-		xyz P 			= new xyz();
+		xyz P 			= new xyz(), tP = new xyz(), pSave = new xyz();
 		float fSharp 	= 1/(1.0001-pSharp.Val());
 		float fQuant	= pQuantize.Val();
 		float fSaturate	= pSaturate.Val();
@@ -280,12 +268,12 @@ public class DPat extends SCPattern
 			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);
+			color cOld = colors[p.index]; pSave.set(P);
+			color cNew = CalcPoint(P);
 
- 			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);
+ 			if (pXsym.b)	{ P.set(pSave); tP.set(xdMax-P.x,P.y,P.z); cNew = blendColor(cNew, CalcPoint(tP), ADD); }
+			if (pYsym.b) 	{ P.set(pSave); tP.set(P.x,ydMax-P.y,P.z); cNew = blendColor(cNew, CalcPoint(tP), ADD); }
+			if (pZsym.b) 	{ P.set(pSave); tP.set(P.x,P.y,zdMax-P.z); cNew = blendColor(cNew, CalcPoint(tP), ADD); }
 
 			float 								b = brightness(cNew)/100.;
 
diff --git a/SugarCubes.pde b/SugarCubes.pde
index 5ce6927..ef89237 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -26,7 +26,7 @@
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
     
-    // Slee
+   // Slee
     new Flitters(glucose),
     new Swarm(glucose),
     new SpaceTime(glucose),
@@ -41,7 +41,7 @@ LXPattern[] patterns(GLucose glucose) {
     new CubeEQ(glucose).setEligible(false),
     new PianoKeyPattern(glucose).setEligible(false),
 
-    // DanH
+     // DanH
     new Noise(glucose),
     new Play(glucose),
     new Pong(glucose),
@@ -122,12 +122,13 @@ LXTransition[] transitions(GLucose glucose) {
 }
 
 // Handles to globally triggerable effects 
-BoomEffect boom;
+BoomEffect 	EFF_boom;
+FlashEffect EFF_flash;
 
 LXEffect[] effects(GLucose glucose) {
   return new LXEffect[] {
-    new FlashEffect(lx),
-    boom = new BoomEffect(glucose),
+    EFF_flash	= new FlashEffect(lx),
+    EFF_boom 	= new BoomEffect(glucose),
     new BlurEffect(glucose),
     new DesaturationEffect(lx),
     new ColorFuckerEffect(glucose),
diff --git a/_Internals.pde b/_Internals.pde
index 0b8949d..091bde4 100644
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -412,7 +412,7 @@ void keyPressed() {
       frameRate(++targetFramerate);
       break; 
     case 'b':
-      boom.trigger();
+      EFF_boom.trigger();
       break;    
     case 'd':
       if (!midiEngine.isQwertyEnabled()) {
diff --git a/_MIDI.pde b/_MIDI.pde
index d2fb69b..623b2c0 100644
--- a/_MIDI.pde
+++ b/_MIDI.pde
@@ -349,8 +349,20 @@ public class APC40MidiInput extends SCMidiInput {
     }
   }
 
+  
+
+	private double Tap1 = 0;
+	private double  getNow() { return millis() + 1000*second() + 60*1000*minute() + 3600*1000*hour(); }
+	private boolean dbtwn  	(double 	a,double b,double 	c)		{ return a >= b && a <= c; 	}
+
   protected void handleNoteOn(Note note) {
-    switch (note.getPitch()) {
+	int nPitch = note.getPitch(), nChan = note.getChannel();
+    switch (nPitch) {
+		
+	case 82:	EFF_boom	.trigger(); 				break;	// BOOM!
+	case 83:	EFF_flash	.trigger(); 				break;	// Flash
+		
+	case 90:	lx.tempo.trigger(); Tap1 = getNow(); 	break;	// dan's dirty tapping mechanism
     case 94: // right bank
       midiEngine.setFocusedDeck(1);
       break;
@@ -403,7 +415,17 @@ public class APC40MidiInput extends SCMidiInput {
   }
 
   protected void handleNoteOff(Note note) {
-    switch (note.getPitch()) {
+	int nPitch = note.getPitch(), nChan = note.getChannel();
+    switch (nPitch) {
+	case 90:
+		if (dbtwn(getNow() - Tap1,5000,300*1000)) {	// hackish tapping mechanism
+			double bpm = 32.*60000./(getNow()-Tap1);
+			while (bpm < 20) bpm*=2;
+			while (bpm > 40) bpm/=2;
+			lx.tempo.setBpm(bpm); lx.tempo.trigger(); Tap1=0; println("Tap Set - " + bpm + " bpm");
+		}
+		break;
+
     case 93: // rec
       if (releaseEffect != null) {
         if (releaseEffect.isMomentary()) {