weird merge shit

[SugarCubes.git] / AlexGreen.pde

diff --git a/AlexGreen.pde b/AlexGreen.pde
index 2ea6fde0652c49857a01b4f1e6e20982672ca8b5..f049c299455d6d3ddb2e469638acbbdf1a007b95 100644 (file)
--- a/AlexGreen.pde
+++ b/AlexGreen.pde
@@ -195,9 +195,9 @@ boolean noteOn(Note note) {
 //public grid
 final Sphery[] spherys;
  
-  SineSphere(GLucose glucose) 
+  SineSphere(LX lx) 
   {
-    super(glucose);
+    super(lx);
     println("modelrad  " + modelrad);   
     sinespin = new LXProjection(model);
     sinespin2 = new LXProjection(model);
@@ -451,8 +451,8 @@ public class APat extends SCPattern
     updateLights(); 
   }
 
-  APat(GLucose glucose) {
-    super(glucose);
+  APat(LX lx) {
+    super(lx);
 
     
 
@@ -521,8 +521,8 @@ private SinLFO curl = new SinLFO(0, Cube.EDGE_HEIGHT, 5000 );
 
 private SinLFO bg = new SinLFO(180, 220, 3000);
 
-CubeCurl(GLucose glucose){
-super(glucose);
+CubeCurl(LX lx){
+super(lx);
 addModulator(curl).trigger();
 addModulator(bg).trigger();
  this.CH = Cube.EDGE_HEIGHT;
@@ -606,8 +606,8 @@ float cfloor = c.y;
   BasicParameter SatT = new BasicParameter("Sat", .5);
   BasicParameter BriT = new BasicParameter("Bright", .5);
 
-HueTestHSB(GLucose glucose) {
-  super(glucose);
+HueTestHSB(LX lx) {
+  super(lx);
   addParameter(HueT);
   addParameter(SatT);
   addParameter(BriT);