X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=blobdiff_plain;f=DanUtil.pde;h=382cf975c8a36740b4f15079783f657a52e720f1;hp=e475059b3082937da86d867acd9ed2659cfd770d;hb=8f4e6c99775f2724edf3cec488860eb68b06491c;hpb=ee1206f686f25042133c6458f2ccc59549382a7d

diff --git a/DanUtil.pde b/DanUtil.pde
index e475059..382cf97 100644
--- a/DanUtil.pde
+++ b/DanUtil.pde
@@ -1,15 +1,14 @@
 //----------------------------------------------------------------------------------------------------------------------------------
-xyz			mMax, mCtr, mHalf;
-int			NumApcRows = 5, NumApcCols = 8;
-DGlobals 	DG = new DGlobals();
+int			NumApcRows=4, NumApcCols=8;
 
 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; 	}
 float	interp 	(float a, float b, float c) { return (1-a)*b + a*c; }
 float	randctr	(float a) { return random(a) - a*.5; }
-float	min		(float a, float b, float c, float d) { return min(min(a,b),min(c,d)); }
-
-float 	distToSeg	(float x, float y, float x1, float y1, float x2, float y2) {
+float	min		(float a, float b, float c, float d) { return min(min(a,b),min(c,d)); 	}
+float   pointDist(LXPoint p1, LXPoint p2) { return dist(p1.x,p1.y,p1.z,p2.x,p2.y,p2.z); 	}
+float   xyDist   (LXPoint p1, LXPoint p2) { return dist(p1.x,p1.y,p2.x,p2.y); 				}
+float 	distToSeg(float x, float y, float x1, float y1, float x2, float y2) {
 	float A 			= x - x1, B = y - y1, C = x2 - x1, D = y2 - y1;
 	float dot 			= A * C + B * D, len_sq	= C * C + D * D;
 	float xx, yy,param 	= dot / len_sq;
@@ -22,12 +21,12 @@ float 	distToSeg	(float x, float y, float x1, float y1, float x2, float y2) {
 	return sqrt(dx * dx + dy * dy);
 }
 
-
 public class Pick {
-	int 	NumPicks, Default	,	CurRow	, CurCol	,
+	int 	NumPicks, Default	,	
+			CurRow	, CurCol	,
 			StartRow, EndRow	;
 	String  tag		, Desc[]	;
-	
+
 	Pick	(String label, int _Def, int _Num, 	int nStart, String d[])	{
 		NumPicks 	= _Num; 	Default = _Def; 
 		StartRow 	= nStart;	EndRow	= StartRow + floor((NumPicks-1) / NumApcCols);
@@ -56,202 +55,80 @@ public class DBool {
 		def = _def; b = _def; tag = _tag; row = _row; col = _col;
 	}
 }
-
-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 	reset		() 						{ super.setValue(dflt);					}
-	float 	Val			() 						{ return getValuef();					}
-}
-//----------------------------------------------------------------------------------------------------------------------------------
-public class xyz {	float x,y,z;	// extends pVector; eliminate half of the functions
-			xyz() {x=y=z=0;}
-			xyz(Point p					  ) {x=p.x	; y=p.y; z=p.z;}
-			xyz(xyz p					  ) {set(p);				 }
-			xyz(float _x,float _y,float _z) {x=_x	; y=_y	; z=_z	;}
-	void	set(Point p					  ) {x=p.x	; y=p.y; z=p.z;}
-	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 - mMax.x*(zx-1)/2;				}
-	void	zoomY	(float zy) 				{y = y*zy - mMax.y*(zy-1)/2;				}
-
-	float	distance(xyz b)					{return dist(x,y,z,b.x,b.y,b.z); 	 	}
-	float	distance(float _x, float _y)	{return dist(x,y,_x,_y); 	 			}
-	float	dot     (xyz b)					{return 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	scale	(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;
-		float nY = nSin*(x-o.x) + nCos*(y-o.y) + o.y;
-		x = nX; y = nY;
-	}
-
-	void	RotateX	  (xyz o, float nSin, float nCos) {
-		float nY = nCos*(y-o.y) - nSin*(z-o.z) + o.y;
-		float nZ = nSin*(y-o.y) + nCos*(z-o.z) + o.z;
-		y = nY; z = nZ;
-	}
-
-	void	RotateY	  (xyz o, float nSin, float nCos) {
-		float nZ = nCos*(z-o.z) - nSin*(x-o.x) + o.z;
-		float nX = nSin*(z-o.z) + nCos*(x-o.x) + o.x;
-		z = nZ; x = nX;
-	}
-
-	void	setRand	()						{ x = random(mMax.x); y = random(mMax.y); z = random(mMax.z); 	}
-	void	setNorm	() 						{ x /= mMax.x; y /= mMax.y; z /= mMax.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 {
-	boolean		bInit			= false;
-	MidiOutput 	APCOut			= null;
-	MidiInput	APCIn			= null,		OxygenIn		= null;
-	DPat		CurPat			= null;
-	int			KeyPressed		= -1;
-	boolean		bSustain 		= false;
-
-	
-	float		Sliders[] 		= new float [] {1,0,0,0,0,0,0,0};
-	String  	SliderText[]	= new String[] {"Level", "SpinHue", "Spark", "Xwave", "Ywave", "Trails", "Quant", "??", "??"};
-	
-	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); 		}
-
-	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		_Level		()						{ return Sliders[0]; }
-	float		_SpinHue	()						{ return Sliders[1]; }
-	float		_Spark		()						{ return Sliders[2]; }
-	float		_XWave		()						{ return Sliders[3]; }
-	float		_YWave		()						{ return Sliders[4]; }
-	float		_Trails		()						{ return Sliders[5]; }
-	float		_Quantize	()						{ return Sliders[6]; }
-
-	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) {
-		bSustain = false;
-		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();
-		for (int i=0; i<p.bools .size(); i++) GetBool (i).reset();
-		for (int i=0; i<p.picks .size(); i++) GetPick (i).reset();
-		UpdateLights();
-	}
-
-	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       + "   ";
-		for (int i=0; i<CurPat.picks.size(); i++) Text1 += GetPick(i).tag + ": " + GetPick(i).CurDesc() + "   ";
-		for (int i=0; i<8; i++) 				  Text2 += SliderText[i]  + ": " + round(100*Sliders[i])  + "   ";
-		uiDebugText.setText(Text1, Text2);
-	}
-
-	void 	UpdateLights() {
-		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);
+public class DPat extends SCPattern
+{
+	ArrayList<Pick>   picks  = new ArrayList<Pick>  ();
+	ArrayList<DBool>  bools  = new ArrayList<DBool> ();
 
-		for (int i=0; i<CurPat.params.size(); i++) SetKnob		( 0, i<8 ? 48+i : 16 + i - 8, round(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);
-	}
+	PVector		mMax, mCtr, mHalf;
 
-	void 	controllerChangeReceived(rwmidi.Controller cc) {
-		if (cc.getCC() == 7 && btwn(cc.getChannel(),0,7)) { Sliders[cc.getChannel()] = 1.*cc.getValue()/127.; }
+	MidiOutput  APCOut;
+	int			nMaxRow  	= 53;
+	float		LastJog = -1;
+	float[]		xWaveNz, yWaveNz;
+	int 		nPoint	, nPoints;
+	PVector		xyzJog = new PVector(), modmin;
+
+	float			NoiseMove	= random(10000);
+	BasicParameter	pSpark, pWave, pRotX, pRotY, pRotZ, pSpin, pTransX, pTransY;
+	DBool			pXsym, pYsym, pRsym, pXdup, pXtrip, pJog, pGrey;
+
+	float		lxh		() 									{ return lx.getBaseHuef(); 											}
+	int			c1c		 (float a) 							{ return round(100*constrain(a,0,1));								}
+	float 		interpWv(float i, float[] vals) 			{ return interp(i-floor(i), vals[floor(i)], vals[ceil(i)]); 		}
+	void 		setNorm (PVector vec)						{ vec.set(vec.x/mMax.x, vec.y/mMax.y, vec.z/mMax.z); 				}
+	void		setRand	(PVector vec)						{ vec.set(random(mMax.x), random(mMax.y), random(mMax.z)); 			}
+	void		setVec 	(PVector vec, LXPoint p)				{ vec.set(p.x, p.y, p.z);  											}
+	void		interpolate(float i, PVector a, PVector b)	{ a.set(interp(i,a.x,b.x), interp(i,a.y,b.y), interp(i,a.z,b.z)); 	}
+	void  		StartRun(double deltaMs) 					{ }
+	float 		val		(BasicParameter p) 					{ return p.getValuef();												}
+	color		CalcPoint(PVector p) 						{ return lx.hsb(0,0,0); 											}
+	color		blend3(color c1, color c2, color c3)		{ return blendColor(c1,blendColor(c2,c3,ADD),ADD); 					}
+
+	void	rotateZ (PVector p, PVector o, float nSin, float nCos) { p.set(    nCos*(p.x-o.x) - nSin*(p.y-o.y) + o.x    , nSin*(p.x-o.x) + nCos*(p.y-o.y) + o.y,p.z); }
+	void	rotateX (PVector p, PVector o, float nSin, float nCos) { p.set(p.x,nCos*(p.y-o.y) - nSin*(p.z-o.z) + o.y    , nSin*(p.y-o.y) + nCos*(p.z-o.z) + o.z    ); }
+	void	rotateY (PVector p, PVector o, float nSin, float nCos) { p.set(    nSin*(p.z-o.z) + nCos*(p.x-o.x) + o.x,p.y, nCos*(p.z-o.z) - nSin*(p.x-o.x) + o.z    ); }
+
+	BasicParameter	addParam(String label, double value) 	{ BasicParameter p = new BasicParameter(label, value); addParameter(p); return p; }
+
+	PVector 	vT1 = new PVector(), vT2 = new PVector();
+	float 		calcCone (PVector v1, PVector v2, PVector c) 	{	vT1.set(v1); vT2.set(v2); vT1.sub(c); vT2.sub(c);
+																	return degrees(PVector.angleBetween(vT1,vT2)); }
+
+	Pick 		addPick(String name, int def, int _max, String[] desc) {
+		Pick P 		= new Pick(name, def, _max+1, nMaxRow, desc); 
+		nMaxRow		= P.EndRow + 1;
+		picks.add(P);
+		return P;
 	}
 
-	void noteOffReceived(Note note) { if (!isFocused()) return;
+    boolean 	noteOff(Note note) {
 		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();
-		bSustain=false;
+		for (int i=0; i<bools.size(); i++) if (bools.get(i).set(row, col, false)) { presetManager.dirty(this); return true; }
+		updateLights(); return false;
 	}
 
-	void noteOnReceived (Note note) { if (!isFocused()) return;
+    boolean 	noteOn(Note note) {
 		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;
-
-		if (row == 84 && col==0) { Activate(CurPat); CurPat.StartPattern(); return; }
-		if (row == 85 && col==0) { bSustain=true; return; }
-		
-		if (row == 52) { KeyPressed = col; return; }
-		println("row: " + row + "  col:   " + col);
+		for (int i=0; i<picks.size(); i++) if (picks.get(i).set(row, col)) 	  		{ presetManager.dirty(this); return true; }
+		for (int i=0; i<bools.size(); i++) if (bools.get(i).set(row, col, true)) 	{ presetManager.dirty(this); return true; }
+		println("row: " + row + "  col:   " + col); return false;
 	}
-}
-//----------------------------------------------------------------------------------------------------------------------------------
-public class DPat extends SCPattern
-{
-	ArrayList 	picks	 	= new ArrayList(); // should be ArrayList<Pick> picks = new ArrayList<Pick>();
-	ArrayList 	params 		= new ArrayList();
-	ArrayList 	bools		= new ArrayList();
-	int			nMaxRow  	= 53;
-	float		zSpinHue 	= 0;
-	float		LastQuant	= -1, LastJog = -1;
-	float[]		xWaveNz, yWaveNz;
-	int 		nPoint	, nPoints;
-	xyz			xyzJog = new xyz(), vT1 = new xyz(), vT2 = new xyz();
-	xyz			modmin;
 
-	float		NoiseMove	= random(10000);
-	DParam		pRotX, pRotY, pRotZ, pSpin, pSharp, pSaturate, pTransX, pTransY;
-	
-	DBool		pXsym, pYsym, pRsym, pXdup, pXtrip, pJog, pKey, pInvert;
-	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 round(100*constrain(a,0,1));		}
-	float 		interpWv(float i, float[] vals) 	{ return interp(i-floor(i), vals[floor(i)], vals[ceil(i)]); }
-
-	float 		CalcCone (xyz v1, xyz v2, xyz c) 	{ vT1.set(v1); vT2.set(v2); vT1.subtract(c); vT2.subtract(c);
-														return degrees( acos ( vT1.dot(vT2) / (sqrt(vT1.dot(vT1)) * sqrt(vT2.dot(vT2)) ) ));	}
-
-	void  		StartPattern() 						{								}
-	void  		StartRun(double deltaMs) 			{								}
-	color		CalcPoint(xyz p) 					{ return lx.hsb(0,0,0); 			}
-	boolean		IsActive()							{ return this == DG.CurPat;												}
-	boolean		IsFocused()							{ return midiEngine != null && midiEngine.getFocusedDeck() != null &&
-															 this == midiEngine.getFocusedDeck().getActivePattern();		}
-	void 		onInactive() 						{ UpdateState(); }
-	void 		onActive  () 						{ UpdateState(); StartPattern(); }
-	void 		UpdateState() 						{ if (IsFocused() != IsActive()) { if (IsFocused()) DG.Activate(this); else DG.Deactivate(this); } }
-	color		blend3(color c1, color c2, color c3){ return blendColor(c1,blendColor(c2,c3,ADD),ADD);						}
-
-	DParam		addParam(String label, double value) {
-		DParam P = new DParam(label, value);
-		super.addParameter(P);
-		params.add(P); return P;
-	}
-
-	Pick addPick(String name, int def, int _max, String[] desc) {
-		Pick P 		= new Pick(name, def, _max+1, nMaxRow, desc); 
-		nMaxRow		= P.EndRow + 1;
-		picks.add(P);
-		return P;
+	void 		onInactive() 			{ uiDebugText.setText(""); }
+	void 		onReset() 				{
+		for (int i=0; i<bools .size(); i++) bools.get(i).reset();
+		for (int i=0; i<picks .size(); i++) picks.get(i).reset();
+		presetManager.dirty(this); 
+		updateLights(); 
 	}
 
 	DPat(GLucose glucose) {
 		super(glucose);
 
-		pSharp		=	addParam("Shrp",  0);
-		pSaturate	=	addParam("Sat" , .5);
+		pSpark		=	addParam("Sprk",  0);
+		pWave		=	addParam("Wave",  0);
 		pTransX		=	addParam("TrnX", .5);
 		pTransY		=	addParam("TrnY", .5);
 		pRotX 		= 	addParam("RotX", .5);
@@ -260,46 +137,64 @@ public class DPat extends SCPattern
 		pSpin		= 	addParam("Spin", .5);
 
 		nPoints 	=	model.points.size();
-		pXsym 		=	new DBool("X-SYM", false, 49, 0);	bools.add(pXsym	);
-		pYsym 		=	new DBool("Y-SYM", false, 49, 1);	bools.add(pYsym	);
-		pRsym 		=	new DBool("R-SYM", false, 49, 2);	bools.add(pRsym );
-		pXdup		=	new DBool("X-DUP", false, 49, 3);	bools.add(pXdup );
-		pJog		=	new DBool("JOG"  ,false, 49,  4);	bools.add(pJog	);
-		pKey		=	new DBool("KBD"	 ,false, 49,  5);	bools.add(pKey	);
-		pInvert		=	new DBool("INVRT",false, 49,  6);	bools.add(pInvert);
-
-		modmin		=	new xyz(model.xMin, model.yMin, model.zMin);
-		mMax		= 	new xyz(model.xMax, model.yMax, model.zMax); mMax.subtract(modmin);
-		mCtr		= 	new xyz(mMax); mCtr.scale(.5);
-		mHalf		= 	new xyz(.5,.5,.5);
+		pXsym 		=	new DBool("X-SYM", false, 48, 0);	bools.add(pXsym	);
+		pYsym 		=	new DBool("Y-SYM", false, 48, 1);	bools.add(pYsym	);
+		pRsym 		=	new DBool("R-SYM", false, 48, 2);	bools.add(pRsym );
+		pXdup		=	new DBool("X-DUP", false, 48, 3);	bools.add(pXdup );
+		pJog		=	new DBool("JOG"  , false, 48, 4);	bools.add(pJog	);
+		pGrey		=	new DBool("GREY" , false, 48, 5);	bools.add(pGrey );
+
+		modmin		=	new PVector(model.xMin, model.yMin, model.zMin);
+		mMax		= 	new PVector(model.xMax, model.yMax, model.zMax); mMax.sub(modmin);
+		mCtr		= 	new PVector(); mCtr.set(mMax); mCtr.mult(.5);
+		mHalf		= 	new PVector(.5,.5,.5);
 		xWaveNz		=	new float[ceil(mMax.y)+1];
 		yWaveNz		=	new float[ceil(mMax.x)+1];
 
 		//println (model.xMin + " " + model.yMin + " " +  model.zMin);
 		//println (model.xMax + " " + model.yMax + " " +  model.zMax);
-		DG.Init();
+	  //for (MidiOutputDevice o: RWMidi.getOutputDevices()) { if (o.toString().contains("APC")) { APCOut = o.createOutput(); break;}}
+	}
+
+	float spin() {
+	  float raw = val(pSpin);
+	  if (raw <= 0.45) {
+	    return raw + 0.05;
+	  } else if (raw >= 0.55) {
+	    return raw - 0.05;
+    }
+    return 0.5;
+	}
+	
+	void setAPCOutput(MidiOutput output) {
+	  APCOut = output;
+	}
+
+	void updateLights() { if (APCOut == null) return;
+	    for (int i = 0; i < NumApcRows; ++i) 
+	    	for (int j = 0; j < 8; ++j) 		APCOut.sendNoteOn(j, 53+i,  0);
+		for (int i=0; i<picks .size(); i++) 	APCOut.sendNoteOn(picks.get(i).CurCol, picks.get(i).CurRow, 3);
+		for (int i=0; i<bools .size(); i++) 	if (bools.get(i).b) 	APCOut.sendNoteOn	(bools.get(i).col, bools.get(i).row, 1);
+												else					APCOut.sendNoteOff	(bools.get(i).col, bools.get(i).row, 0);
 	}
 
 	void run(double deltaMs)
 	{
-		UpdateState();
+		if (deltaMs > 100) return;
+
+		if (this == midiEngine.getFocusedDeck().getActivePattern()) {
+			String Text1="", Text2="";
+			for (int i=0; i<bools.size(); i++) if (bools.get(i).b) Text1 += " " + bools.get(i).tag       + "   ";
+			for (int i=0; i<picks.size(); i++) Text1 += picks.get(i).tag + ": " + picks.get(i).CurDesc() + "   ";
+			uiDebugText.setText(Text1, Text2);
+		}
+
 		NoiseMove   	+= deltaMs; NoiseMove = NoiseMove % 1e7;
 		StartRun		(deltaMs);
-		zSpinHue 		+= DG._SpinHue ()*deltaMs*.05; zSpinHue = zSpinHue % 5000.;
-		xyz P 			= new xyz(), tP = new xyz(), pSave = new xyz();
-		xyz pTrans 		= new xyz(pTransX.Val()*200-100, pTransY.Val()*100-50,0);
-		float fSharp 	= 1/(1.0001-pSharp.Val());
-		float fQuant	= DG._Quantize ();
-		float fSaturate	= pSaturate.Val();
-		
-		DG.SetText();
+		PVector P 		= new PVector(), tP = new PVector(), pSave = new PVector();
+		PVector pTrans 	= new PVector(val(pTransX)*200-100, val(pTransY)*100-50,0);
 		nPoint 	= 0;
 
-		if (fQuant > 0) {
-			float tRamp	= (lx.tempo.rampf() % (1./pow(2,floor((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(randctr(mMax.x*.2), randctr(mMax.y*.2), randctr(mMax.z*.2));
@@ -307,20 +202,22 @@ public class DPat extends SCPattern
 		}
 
 		// precalculate this stuff
-		float yWv = DG._YWave(), xWv = DG._XWave(), sprk = DG._Spark();
-		if (yWv > 0) for (int i=0; i<ceil(mMax.x)+1; i++)
-			yWaveNz[i] = yWv * (noise(i/(mMax.x*.3)-(2e3+NoiseMove)/1500.) - .5) * (mMax.y/2.);
-
-		if (xWv > 0) for (int i=0; i<ceil(mMax.y)+1; i++)
-			xWaveNz[i] = xWv * (noise(i/(mMax.y*.3)-(1e3+NoiseMove)/1500.) - .5) * (mMax.x/2.);
-			
-		for (Point p : model.points) { nPoint++;
-			P.set(p);
-			P.subtract(modmin);
-			P.subtract(pTrans);
-			if (sprk > 0) {	P.y += sprk*randctr(50); P.x += sprk*randctr(50); P.z += sprk*randctr(50); }
-			if (yWv > 0) 	P.y += interpWv(p.x-modmin.x, yWaveNz);
-			if (xWv > 0) 	P.x += interpWv(p.y-modmin.y, xWaveNz);
+		float wvAmp = val(pWave), sprk = val(pSpark);
+		if (wvAmp > 0) {
+			for (int i=0; i<ceil(mMax.x)+1; i++)
+				yWaveNz[i] = wvAmp * (noise(i/(mMax.x*.3)-(2e3+NoiseMove)/1500.) - .5) * (mMax.y/2.);
+
+			for (int i=0; i<ceil(mMax.y)+1; i++)
+				xWaveNz[i] = wvAmp * (noise(i/(mMax.y*.3)-(1e3+NoiseMove)/1500.) - .5) * (mMax.x/2.);
+		}
+
+		for (LXPoint p : model.points) { nPoint++;
+			setVec(P,p);
+			P.sub(modmin);
+			P.sub(pTrans);
+			if (sprk  > 0) {P.y += sprk*randctr(50); P.x += sprk*randctr(50); P.z += sprk*randctr(50); }
+			if (wvAmp > 0) 	P.y += interpWv(p.x-modmin.x, yWaveNz);
+			if (wvAmp > 0) 	P.x += interpWv(p.y-modmin.y, xWaveNz);
 			if (pJog.b)		P.add(xyzJog);
 
 
@@ -330,88 +227,71 @@ public class DPat extends SCPattern
 			if (pYsym.b) 	{ tP.set(P.x,mMax.y-P.y,P.z); 					cNew = blendColor(cNew, CalcPoint(tP), ADD);	}
 			if (pRsym.b) 	{ tP.set(mMax.x-P.x,mMax.y-P.y,mMax.z-P.z);		cNew = blendColor(cNew, CalcPoint(tP), ADD);	}
 			if (pXdup.b) 	{ tP.set((P.x+mMax.x*.5)%mMax.x,P.y,P.z);		cNew = blendColor(cNew, CalcPoint(tP), ADD);	}
-
-			float 								s =	lx.s(cNew) + 100*(fSaturate*2-1);
-			float 								b = lx.b(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) (lx.b(cOld)/100. - (1-DG._Trails()) * deltaMs/200.));
-			if (DG.bSustain == true) 			b = max(b, (float) (lx.b(cOld)/100.));
-
-			if (pInvert.b)	{ b = 1-b; s = 1-s; }
-
-			colors[p.index] = lx.hsb(
-				(lx.h(cNew) + zSpinHue) % 360,
-				s,
-				100 *  b * DG._Level()
-			);
-
-//			colors[p.index] = lx.hsb(0,0, p.x >= modmin.x && p.y >= modmin.y && p.z >= modmin.z &&
-//				p.x <= modmin.x+mMax.x && p.y <= modmin.y+mMax.y && p.z <= modmin.z+mMax.z ? 100 : 0); 
+			if (pGrey.b)	{ cNew = lx.hsb(0, 0, lx.b(cNew)); }
+			colors[p.index] = cNew;
 		}
 	}
 }
 //----------------------------------------------------------------------------------------------------------------------------------
 class dTurn { 
 	dVertex v; 
-	int pos0, pos1; 
+	int pos0, pos1;
 	dTurn(int _pos0, dVertex _v, int _pos1) { v = _v; pos0 = _pos0; pos1 = _pos1; }
 }
 
 class dVertex {
-	dVertex c0, c1, opp, same;
-	dTurn 	t0, t1;
-	dStrip  s;
-	int 	dir, ci;
-
-	dVertex(dStrip _s, Point _p) { s = _s; ci  = _p.index; }
-	Point 	getPoint(int i) 	 { return s.s.points.get(dir>0 ? i : 15-i);  }
+	dVertex c0, c1, c2, c3, 	// connections on the cube
+			opp, same;			// opp - same strip, opp direction
+								// same - same strut, diff strip, dir
+	dTurn 	t0, t1, t2, t3;
+	Strip   s;
+	int 	dir, ci;		// dir -- 1 or -1.
+							// ci  -- color index
+
+	dVertex(Strip _s, LXPoint _p)  { s = _s; ci  = _p.index; }
+	LXPoint 	getPoint(int i) 	 { return s.points.get(dir>0 ? i : 15-i);  }
 	void 	setOpp(dVertex _opp) { opp = _opp; dir = (ci < opp.ci ? 1 : -1); }
 }
-
-class dStrip  {
-	dVertex v0, v1;
-	int 	row, col;
-	Strip 	s;
-	String 	desc() { return "r:" + row + " c:" + col + "i:" + floor(v0.ci/16); }
-	dStrip(Strip _s, int _i, int _row, int _col)  { s = _s; row = _row; col = _col; }
-}
 //----------------------------------------------------------------------------------------------------------------------------------
-float PointDist(Point p1, Point p2) { return dist(p1.x,p1.y,p1.z,p2.x,p2.y,p2.z); }
-
-class dPixel   { dVertex v; int pos; dPixel(dVertex _v, int _pos) { v=_v; pos=_pos; }}
+class dPixel   { dVertex v; int pos; dPixel(dVertex _v, int _pos) { v=_v; pos=_pos; } }
 class dLattice {
-	private 	int iTowerStrips=0;
-
-	dStrip[] 	DS = new dStrip[glucose.model.strips.size()];
-	int[][]  	DQ = new int[NumBackTowers][MaxCubeHeight*2];
-	dStrip  GetStrip (int row, int col, int off) { 
-		return (!btwn(off,0,15) || !btwn(row,0,MaxCubeHeight*2-1) || !btwn(col,0,NumBackTowers-1) || DQ[col][row]<0) ? null : 
-				DS[DQ[col][row]+off]; 
-	}
-
-	void	addTurn(dVertex v0, int pos0, dVertex v1, int pos1) {	dTurn t = new dTurn(pos0, v1, pos1); if (v0.t0 == null) v0.t0=t; else v0.t1=t; }
-	float   Dist2	 (Strip s1, int pos1, Strip s2, int pos2) 	{ 	return PointDist(s1.points.get(pos1), s2.points.get(pos2)); }
-	boolean SameSame (Strip s1, Strip s2) 						{	return max(Dist2(s1, 0, s2, 0), Dist2(s1,15, s2,15)) < 5 ;	}
-	boolean SameOpp  (Strip s1, Strip s2) 						{	return max(Dist2(s1, 0, s2,15), Dist2(s1,15, s2,0 )) < 5 ;	}
-	boolean SameBar  (Strip s1, Strip s2) 						{	return SameSame(s1,s2) || SameOpp(s1,s2);					}
-	float   PD2 	 (Point p1, float x, float y, float z) 		{ 	return dist(p1.x,p1.y,p1.z,x,y,z); }
-	void 	AddJoint (dVertex v1, dVertex v2) {
+	void	addTurn  (dVertex v0, int pos0, dVertex v1, int pos1) {	dTurn t = new dTurn(pos0, v1, pos1); 
+																	if (v0.t0 == null) { v0.t0=t; return; }
+																	if (v0.t1 == null) { v0.t1=t; return; }
+																	if (v0.t2 == null) { v0.t2=t; return; }
+																	if (v0.t3 == null) { v0.t3=t; return; }
+																}
+	float   dist2	 (Strip s1, int pos1, Strip s2, int pos2) 	{ 	return pointDist(s1.points.get(pos1), s2.points.get(pos2)); }
+	float   pd2 	 (LXPoint p1, float x, float y, float z) 		{ 	return dist(p1.x,p1.y,p1.z,x,y,z); }
+	boolean sameSame (Strip s1, Strip s2) 						{	return max(dist2(s1, 0, s2, 0), dist2(s1,15, s2,15)) < 5 ;	}	// same strut, same direction
+	boolean sameOpp  (Strip s1, Strip s2) 						{	return max(dist2(s1, 0, s2,15), dist2(s1,15, s2,0 )) < 5 ;	}	// same strut, opp direction
+	boolean sameBar  (Strip s1, Strip s2) 						{	return sameSame(s1,s2) || sameOpp(s1,s2);					}	// 2 strips on same strut
+
+
+	void 	addJoint (dVertex v1, dVertex v2) {
 		// should probably replace parallel but further with the new one
-		if (v1.c0 != null && SameBar(v2.s.s, v1.c0.s.s)) return;
-		if (v1.c1 != null && SameBar(v2.s.s, v1.c1.s.s)) return;
+		if (v1.c0 != null && sameBar(v2.s, v1.c0.s)) return;
+		if (v1.c1 != null && sameBar(v2.s, v1.c1.s)) return;
+		if (v1.c2 != null && sameBar(v2.s, v1.c2.s)) return;
+		if (v1.c3 != null && sameBar(v2.s, v1.c3.s)) return;
+
 		if 		(v1.c0 == null) v1.c0 = v2; 
 		else if (v1.c1 == null) v1.c1 = v2; 
+		else if (v1.c2 == null) v1.c2 = v2; 
+		else if (v1.c3 == null) v1.c3 = v2;
 	}
 
-	dPixel getRand() 											{ 	return new dPixel(DS[floor(random(iTowerStrips))].v0,floor(random(15))); }
-	dPixel getClosest(xyz p) {
+	dVertex v0(Strip s) { return (dVertex)s.obj1; }
+	dVertex v1(Strip s) { return (dVertex)s.obj2; }
+
+	dPixel getClosest(PVector p) {
 		dVertex v = null; int pos=0; float d = 500;
-		for (int j=0; j<iTowerStrips; j++) {
-			dStrip s = DS[j];
-			float nd = PD2(s.s.points.get(0),p.x,p.y,p.z); if (nd < d) { v=s.v0; d=nd; pos=0; }
+
+		for (Strip s : glucose.model.strips) {
+			float nd = pd2(s.points.get(0),p.x,p.y,p.z); if (nd < d) { v=v0(s); d=nd; pos=0; }
 			if (nd > 30) continue;
 			for (int k=0; k<=15; k++) {
-				nd = PD2(s.s.points.get(k),p.x,p.y,p.z); if (nd < d) { v = s.v0; d=nd; pos=k; }
+				nd = pd2(s.points.get(k),p.x,p.y,p.z); if (nd < d) { v =v0(s); d=nd; pos=k; }
 			}
 		}
 		return random(2) < 1 ? new dPixel(v,pos) : new dPixel(v.opp,15-pos);
@@ -419,31 +299,24 @@ class dLattice {
 
 	dLattice() {
 		lattice=this;
-		for (int i=0;i<NumBackTowers;i++) for (int j=0;j<MaxCubeHeight*2;j++) DQ[i][j]=-1;
-
-		int   col = 0, row = -2, i=-1;
-		for (Strip strip : glucose.model.strips  ) { i++;
-			if (i % 16 == 0) row+=2;
-			if (row >= MaxCubeHeight*2-1) { col++; row = (col%2==1)?1:0; }	// only include lattice parts!
-			iTowerStrips++;
-			dStrip s = DS[iTowerStrips-1] = new dStrip(strip, iTowerStrips-1, row, col);
-			s.v0 = new dVertex(s,strip.points.get(0 ));
-			s.v1 = new dVertex(s,strip.points.get(15));
-			s.v0.setOpp(s.v1); s.v1.setOpp(s.v0);
-			if (col < NumBackTowers) DQ[col][row] = 16*floor((iTowerStrips-1)/16);
+
+		for (Strip s  : glucose.model.strips) {
+			dVertex vrtx0 = new dVertex(s,s.points.get(0 )); s.obj1=vrtx0;
+			dVertex vrtx1 = new dVertex(s,s.points.get(15)); s.obj2=vrtx1;
+			vrtx0.setOpp(vrtx1); vrtx1.setOpp(vrtx0);
 		}
 
-		for (int j=0; j<iTowerStrips; j++) { for (int k=j+1; k<iTowerStrips; k++) { 
-			dStrip s1 = DS[j], s2 = DS[k];
+		for (Strip s1 : glucose.model.strips) { for (Strip s2 : glucose.model.strips) {
+			if (s1.points.get(0).index < s2.points.get(0).index) continue;
 			int c=0;
-			if (SameSame(s1.s,s2.s)) {	s1.v0.same = s2.v0; s1.v1.same = s2.v1;
-										s2.v0.same = s1.v0; s2.v1.same = s1.v1; continue; } // parallel
-			if (SameOpp (s1.s,s2.s)) {	s1.v0.same = s2.v1; s1.v1.same = s2.v0;
-										s2.v0.same = s1.v1; s2.v1.same = s1.v0; continue; } // parallel
-			if (Dist2(s1.s, 0, s2.s, 0) < 5) { c++; AddJoint(s1.v1, s2.v0); AddJoint(s2.v1, s1.v0); }
-			if (Dist2(s1.s, 0, s2.s,15) < 5) { c++; AddJoint(s1.v1, s2.v1); AddJoint(s2.v0, s1.v0); }
-			if (Dist2(s1.s,15, s2.s, 0) < 5) { c++; AddJoint(s1.v0, s2.v0); AddJoint(s2.v1, s1.v1); }
-			if (Dist2(s1.s,15, s2.s,15) < 5) { c++; AddJoint(s1.v0, s2.v1); AddJoint(s2.v0, s1.v1); }
+			if (sameSame(s1,s2)) 	{	v0(s1).same = v0(s2); v1(s1).same = v1(s2);
+										v0(s2).same = v0(s1); v1(s2).same = v1(s1); continue; } // parallel
+			if (sameOpp (s1,s2)) 	{	v0(s1).same = v1(s2); v1(s1).same = v0(s2);
+										v0(s2).same = v1(s1); v1(s2).same = v0(s1); continue; } // parallel
+			if (dist2(s1, 0, s2, 0) < 5) { c++; addJoint(v1(s1), v0(s2)); addJoint(v1(s2), v0(s1)); }
+			if (dist2(s1, 0, s2,15) < 5) { c++; addJoint(v1(s1), v1(s2)); addJoint(v0(s2), v0(s1)); }
+			if (dist2(s1,15, s2, 0) < 5) { c++; addJoint(v0(s1), v0(s2)); addJoint(v1(s2), v1(s1)); }
+			if (dist2(s1,15, s2,15) < 5) { c++; addJoint(v0(s1), v1(s2)); addJoint(v0(s2), v1(s1)); }
 			if (c>0) continue;
 
 			// Are they touching at all?
@@ -451,15 +324,14 @@ class dLattice {
 
 			while (pos1 < 15 || pos2 < 15) {
 				float oldD = d;
-				if (pos1<15) { float d2 = Dist2(s1.s, pos1+1, s2.s, pos2+0); if (d2 < d) { d=d2; pos1++; } }
-				if (pos2<15) { float d2 = Dist2(s1.s, pos1+0, s2.s, pos2+1); if (d2 < d) { d=d2; pos2++; } }
+				if (pos1<15) { float d2 = dist2(s1, pos1+1, s2, pos2+0); if (d2 < d) { d=d2; pos1++; } }
+				if (pos2<15) { float d2 = dist2(s1, pos1+0, s2, pos2+1); if (d2 < d) { d=d2; pos2++; } }
 				if (d > 50  || oldD == d) break ;
 			}
 
 			if (d>5) continue;
-			addTurn(s1.v0, pos1, s2.v0, pos2); addTurn(s1.v1, 15-pos1, s2.v0, pos2); 
-			addTurn(s2.v0, pos2, s1.v0, pos1); addTurn(s2.v1, 15-pos2, s1.v0, pos1);
-
+			addTurn(v0(s1), pos1, v0(s2), pos2); addTurn(v1(s1), 15-pos1, v0(s2), pos2); 
+			addTurn(v0(s2), pos2, v0(s1), pos1); addTurn(v1(s2), 15-pos2, v0(s1), pos1);
 		}}
 	}
 }