X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=DanHorwitz.pde;h=3744086f2a9a5ab84e5eaeb1f0cc620f75cd72bd;hb=c9e7c4564f51ca617bdadd37d70b0992d86cfc51;hp=64991c21b16ca8716034f96c2c9ed66245527c27;hpb=54521a391e9fac72b19c35ed1f20e055c79f2bb1;p=SugarCubes.git

diff --git a/DanHorwitz.pde b/DanHorwitz.pde
old mode 100644
new mode 100755
index 64991c2..3744086
--- a/DanHorwitz.pde
+++ b/DanHorwitz.pde
@@ -1,116 +1,241 @@
-public class _P extends BasicParameter {
-	_P(String label, double value) 					{ super(label,value); 							}
-	public void 	updateValue	(double value) 		{ super.updateValue(value);						}
-	public float 	Val			() 					{ return getValuef();							}
-	public int		Pick		(int b) 			{ return int(Val())==1 ? b-1 : int(b*Val());	} 
-}
-
-float 	c1c			(float a) 	{ return 100*constrain(a,0,1); }
-float 	CalcCone	(float x1, float y1, float z1, float x2, float y2, float z2) {
-						return degrees( acos ( ( x1*x2 + y1*y2 + z1*z2 ) / (sqrt(x1*x1+y1*y1+z1*z1) * sqrt(x2*x2+y2*y2+z2*z2)) ) );}
-float		xMax,yMax,zMax;
-float 		zTime   = random(10000);
-_P 			pChoose = new _P("ANIM", 0);
-//----------------------------------------------------------------------------------------------------------------------------------
-class Pong extends SCPattern {
-	SinLFO x,y,z,dx,dy,dz; 
-	float cRad;	_P size;
-
-	Pong(GLucose glucose) {
-		super(glucose);
-		xMax = model.xMax; yMax = model.yMax; zMax = model.zMax;
-		cRad = xMax/15;
-		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(pChoose);
-	    addParameter(size = new _P("SIZE", 0.4));
-	}
-
-	color Calc(float px, float py, float pz, float vx, float vy, float vz) {
-		switch(pChoose.Pick(3)) {
-		/*spot*/	case 0: return color(0,0,c1c(1 - CalcCone(vx-xMax/2, vy, vz-zMax/2, px-xMax/2, py, pz-zMax/2)*max(.02,.45-size.Val())));
-		/*ball*/	case 1: return color(0,0,c1c(1 - dist(vx,vy,vz,px,py,pz)*.5/cRad));
-		/*ballz*/	default:return color(0,0,c1c(1 - min(	dist(vx,vy,vz,px,py,pz),
-															dist(vx,vy,vz,xMax-px,yMax-py,zMax-pz))*.5/cRad)); 
-		}		
-	}
-
-	public void run(int deltaMs) {
-		cRad = xMax*size.Val()/6;
-		for (Point p : model.points) {
-			colors[p.index] = Calc(p.fx, p.fy, p.fz, x.getValuef(), y.getValuef(), z.getValuef());
-		}
-	}
-}
-//----------------------------------------------------------------------------------------------------------------------------------
-class NDat {
-	float xz, yz, zz, hue, sat, speed, dir, den, contrast;
-	float xoff,yoff,zoff;
-	NDat (float _hue, float _sat, float _xz, float _yz, float _zz, float _con, float _den, float _speed, float _dir) {
-		hue=_hue; sat=_sat; xz=_xz; yz=_yz; zz =_zz; contrast=_con; den=_den; speed=_speed; dir=_dir;
-		xoff = random(100e3); yoff = random(100e3); zoff = random(100e3);
-	}
-}
-
-class Noise extends SCPattern
-{
-	int 	CurAnim = 	-1	;
-	ArrayList noises = new ArrayList();
-	_P pSpeed, pMir, pBright, pContrast, pDensity, pDir;
-
-	Noise(GLucose glucose) {
-		super(glucose);									 addParameter(pChoose	);
-		addParameter(pSpeed		= new _P("MPH" 	, .55)); addParameter(pMir		= new _P("MIR" 	, 0	));
-		addParameter(pBright	= new _P("BRTE" ,  1 )); addParameter(pDir		= new _P("DIR" 	, 0 ));
-		addParameter(pContrast	= new _P("CNTR" ,  .5)); addParameter(pDensity	= new _P("DENS" , .5));
-	}
-
-	public void run(int deltaMs) {
-		zTime += deltaMs*(pSpeed.Val()-.5)*.002;
-		int anim = pChoose.Pick(6);
-		if (anim != CurAnim) {
-			noises.clear(); CurAnim = anim; switch(anim) {
-			//_hue, _sat, _xz, _yz, _zz, _con, _den, _speed, _dir
-			case 0: noises.add(new NDat(0  ,0  ,100,100,200,0  ,40 ,3  ,2)); break;	// clouds
-			case 1: noises.add(new NDat(0  ,0  ,75 ,75 ,150,1  ,45 ,3  ,0)); break; // drip
-			case 2: noises.add(new NDat(0  ,0  ,2  ,400,2  ,1  ,40 ,3  ,0)); break;	// rain
-			case 3: noises.add(new NDat(40 ,100,100,100,200,0  ,20 ,1  ,2)); 
-					noises.add(new NDat(0  ,100,100,100,200,0  ,20 ,5   ,2)); break;	// fire 1
-			case 4: noises.add(new NDat(0  ,100,40 ,40 ,40 ,.5 ,25 ,2.5 ,2));
-					noises.add(new NDat(20 ,100,40 ,40 ,40 ,.5 ,25 ,4   ,0));
-					noises.add(new NDat(40 ,100,40 ,40 ,40 ,.5 ,25 ,2   ,1));
-					noises.add(new NDat(60 ,100,40 ,40 ,40 ,.5 ,25 ,3   ,3)); break; 	// machine
-			case 5: noises.add(new NDat(0  ,100,400,100,2  ,1  ,20 ,3   ,2));
-					noises.add(new NDat(20 ,100,400,100,2  ,1  ,20 ,2.5 ,0));
-					noises.add(new NDat(40 ,400,100,100,2  ,1  ,20 ,2   ,1));
-					noises.add(new NDat(60 ,400,100,100,2  ,1  ,20 ,1.5 ,3)); break; 	// spark
-			default: break;
-			}
-		}
-
-		for (Point p : model.points) {
-			color c = color(0,0,0);
-			int mir = pMir.Pick(5);
-
-			for (int i=0;i<noises.size(); i++) { NDat n = (NDat) noises.get(i);
-				float vx=p.fx, vy=p.fy, vz=p.fz;
-//				if (vx > xMax/2 && (mir == 1 || mir == 3 || mir == 4)) { vx = xMax-vx; }
-				if (vy > yMax/2 && (mir == 2 || mir == 3 || mir == 4)) { vy = yMax-vy; }
-//				if (vz > zMax/2 && (						mir == 4)) { vz = zMax-vz; }
-				float deg = radians(90*(n.dir + pDir.Pick(4)));
-				float zx  = zTime * n.speed * sin(deg);
-				float zy  = zTime * n.speed * cos(deg);
-				float b   = noise(vx/n.xz+zx+n.xoff,vy/n.yz+zy+n.yoff,vz/n.zz+n.zoff)*1.6-.3 + n.den/100 + pDensity.Val() -1;
-				float con = 1/constrain(2-n.contrast - 2*pContrast.Val(),0,1);
-				b = b < .5 ? pow(b,con) : 1-pow(1-b,con);
-				c = blendColor(c,color(n.hue,n.sat,c1c(b * pBright.Val())),ADD);
-			}
-			colors[p.index] = c;
-		}
-	}
-}
-//----------------------------------------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------------------------------------------
+public class Pong extends DPat {
+	SinLFO x,y,z,dx,dy,dz; 
+	float cRad;	_DhP pSize;
+	Pick  pChoose;
+
+	Pong(GLucose glucose) {
+		super(glucose);
+		cRad = xdMax/15;
+		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, xdMax - cRad, 0)).trigger();	x.modulateDurationBy(dx);
+		addModulator(y  = new SinLFO(cRad, ydMax - cRad, 0)).trigger();	y.modulateDurationBy(dy);
+		addModulator(z  = new SinLFO(cRad, zdMax - cRad, 0)).trigger();	z.modulateDurationBy(dz);
+	    pSize	= addParam	("Size"			, 0.4	);
+	    pChoose = addPick	("Animiation"	, 0	, 3, new String[] {"Pong", "Ball", "Cone"}	);
+	}
+
+	void  	StartRun(double deltaMs) 	{ cRad = xdMax*pSize.Val()/6; }
+	color	CalcPoint(xyz p) 	  	{
+		xyz v = new xyz(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
+		}
+		return color(0,0,0);
+	}		
+}
+//----------------------------------------------------------------------------------------------------------------------------------
+public class NDat {
+	float 	xz, yz, zz, hue, sat, 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) {
+		isActive = true;
+		hue=_hue; sat=_sat; 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, iSymm;
+	int 		XSym=1,YSym=2,RadSym=3;
+	float 		zTime 	= random(10000), zTheta=0, zSin, zCos;
+	float		rtime	= 0, ttime	= 0, transAdd=0;
+	_DhP 		pSpeed , pDensity, pRotZ;
+	Pick 		pChoose, pSymm;
+	int			_ND = 4;
+	NDat		N[] = new NDat[_ND];
+
+	Noise(GLucose glucose) {
+		super(glucose);
+		pRotZ	= addParam("RotZ"	 , .5 );	pSpeed		= addParam("Fast", .55);
+		pDensity= addParam("Dens" 	 , .5);
+		pSymm 	= addPick("Symmetry" , 0, 4, new String[] {"None", "X", "Y", "Radial"}	);
+		pChoose = addPick("Animation", 1, 6, new String[] {"Drip", "Cloud", "Rain", "Fire", "Machine", "Spark"}	);
+		for (int i=0; i<_ND; i++) N[i] = new NDat();
+	}
+
+	void StartRun(double deltaMs) {
+		zTime 	+= deltaMs*(pSpeed.Val()-.5)*.002	;
+		zTheta	+= deltaMs*(pRotZ .Val()-.5)*.01	;
+		rtime	+= deltaMs;
+		iSymm	 = pSymm.Cur();
+		transAdd = 1*(1 - constrain(rtime - ttime,0,1000)/1000);
+		zSin	= sin(zTheta);
+		zCos	= cos(zTheta);
+
+		if (pChoose.Cur() != CurAnim) {
+			CurAnim = pChoose.Cur(); ttime = rtime;
+			pRotZ		.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  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
+			}
+
+			DG.UpdateLights();
+		}
+		
+		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(xyz P) {
+		color c = 0;
+		P.RotateZ(xyzMid, zSin, zCos);
+		
+		if (iSymm == XSym && P.x > xdMax/2) P.x = xdMax-P.x;
+		if (iSymm == YSym && P.y > ydMax/2) P.y = ydMax-P.y;
+
+		for (int i=0;i<_ND; i++) if (N[i].Active()) {
+			NDat  n     = N[i];
+			float zx    = zTime * n.speed * n.sinAngle,
+				  zy    = zTime * n.speed * n.cosAngle;
+			
+			float b     = (iSymm==RadSym ? noise(zTime*n.speed+n.xoff-Dist(P,xyzMid)/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);
+		}
+		return c;
+	}
+}
+//----------------------------------------------------------------------------------------------------------------------------------
+public class Play extends DPat
+{
+	int		nBeats	=  	0;
+	_DhP 	pAmp, pRad;
+	_DhP 	pRotX, pRotY, pRotZ;
+	xyz		Theta 	= new xyz();
+	xyz		TSin	= new xyz();
+	xyz		TCos	= new xyz();
+	
+	Pick	pTimePattern, pTempoMult, pShape, pForm;
+	int		RandCube;
+
+	Play(GLucose glucose) {
+		super(glucose);
+		pRotX 		= addParam("RotX", .5);
+		pRotY 		= addParam("RotY", .5);
+		pRotZ 		= addParam("RotZ", .5);
+	    pAmp  		= addParam("Amp" , .2);
+	    pRad		= addParam("Rad" 	, .1  		);
+		pTempoMult 	= addPick ("TMult"	, 0 , 6		, new String[] {"1x", "2x", "4x", "8x", "16x", "Rand"	}	);
+		pTimePattern= addPick ("TPat"	, 0 , 5		, new String[] {"Bounce", "Sin", "Roll", "Quant", "Accel"	}	);
+		pShape	 	= addPick ("Shape"	, 0 , 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;
+
+	void StartRun(double deltaMs) {
+		t = lx.tempo.rampf();
+		a = 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));
+		TCos	.set(cos(Theta.x), cos(Theta.y), cos(Theta.z));
+
+		if (t<LastMeasure) { CurRandTempo = int(random(4)); } LastMeasure = t;
+
+		switch (pTempoMult.Cur()) {
+			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;
+		}
+
+		
+		cMid 				= cPrev.interpolate(t,cCur);
+		cMidNorm 			= cMid.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);
+
+		float mp	= min(P.x, P.z);
+		float yt 	= map(t,0,1,.5-a/2,.5+a/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));			//
+		}
+
+
+		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()));
+
+			default:	return color(0,0,c1c(P.y < V.y ?1:0));
+		}
+	}
+}
+//----------------------------------------------------------------------------------------------------------------------------------