X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=BenMorrow.pde;h=51945a8de70b68902a180e0979a8996d43a43cbb;hb=1a92d73ad74318a7f0bbd6581ebfc12721a48487;hp=87b22be2ad785a4db8369a91b375fa388fe976de;hpb=d33c2d1d64234dd5f54942a9b76afaec3833c206;p=SugarCubes.git

diff --git a/BenMorrow.pde b/BenMorrow.pde
old mode 100755
new mode 100644
index 87b22be..51945a8
--- a/BenMorrow.pde
+++ b/BenMorrow.pde
@@ -50,21 +50,20 @@ class TowerParams extends SCPattern
 		}
 		towerSize = model.towers.size();
 		colorSpan = 255 / towerSize;
-		println("towers "+towerSize);
 	}
 
-	void run(int deltaMs)
+	void run(double deltaMs)
 	{
 		clearALL();
 		Tower t;
 		for(int i=0; i<towerSize ;i++)
 		{	
 			t= model.towers.get(i);
-			for(Point p : t.points)
+			for(LXPoint p : t.points)
 			{
 				if(p.y<towerParams.get(i).getValuef()*200)
 				{
-					colors[p.index]=color(255 * hueoff.getValuef()+colorSpan * hueSpan.getValuef() * i, 255, 255);
+					colors[p.index]=lx.hsb(255 * hueoff.getValuef()+colorSpan * hueSpan.getValuef() * i, 255, 255);
 				}
 			}
 		}
@@ -73,7 +72,7 @@ class TowerParams extends SCPattern
 
 	public void clearALL()
 	{
-		for(Point p : model.points)
+		for(LXPoint p : model.points)
 		{
 			colors[p.index] = 0;
 		}
@@ -101,14 +100,14 @@ class Sandbox extends SCPattern
 		println("towers "+towerrange);
 	}
 	
-	public void run(int deltaMs) {
+	public void run(double deltaMs) {
 		
 
 		if(counter % 10 ==0)
 		{
 			doDraw(c,0);
 			c = (c + 1) % towerrange;
-			long col = color(Math.round(Math.random()*255),255,255) ;
+			long col = lx.hsb(Math.round(Math.random()*255),255,255) ;
 			doDraw(c,col);
 		}
 		counter++;
@@ -118,7 +117,7 @@ class Sandbox extends SCPattern
 	public void doDraw(int c,long col)
 	{
 			Tower t= model.towers.get((int) c);
-			for(Point p : t.points)
+			for(LXPoint p : t.points)
 			{
 				colors[p.index] = (int) col;
 			}
@@ -137,7 +136,7 @@ class GranimTestPattern extends GranimPattern
 		getGraphicByName("myOtherColors").position=100;
 	}
 	int counter=0;
-	public void run(int deltaMs) 
+	public void run(double deltaMs) 
 	{
 		clearALL();
 		super.run(deltaMs);
@@ -177,7 +176,7 @@ class GranimTestPattern2 extends GranimPattern
 	}
 	int counter=0;
 	float count=0;
-	public void run(int deltaMs) 
+	public void run(double deltaMs) 
 	{
 		clearALL();
 		super.run(deltaMs);
@@ -187,7 +186,7 @@ class GranimTestPattern2 extends GranimPattern
 	}
 	public void clearALL()
 	{
-		for(Point p : model.points)
+		for(LXPoint p : model.points)
 		{
 			colors[p.index] = 0;
 		}