SCPattern moved out of GLucose

[SugarCubes.git] / AlexGreen.pde

diff --git a/AlexGreen.pde b/AlexGreen.pde
index 99a71df8815353bb45c9ee795c25e7d720d45dee..db7e0af8942c1e9ea3d5e4f795a80a7979a659a4 100644 (file)
--- a/AlexGreen.pde
+++ b/AlexGreen.pde
@@ -61,7 +61,7 @@ class SineSphere extends SCPattern {
    addModulator(ybounce= new SinLFO(model.yMax/3, 2*model.yMax/3, 240000)).trigger(); //bounce.modulateDurationBy
     
    //addModulator(bounceamp); //ybounce.setMagnitude(bouncerate);
-   addModulator( vibration = new SinLFO( modelrad/10 - vibration_magnitude , modelrad/10 + vibration_magnitude, vperiod)).trigger(); //vibration.setPeriod(240000/lx.tempo.bpm());
+   addModulator( vibration = new SinLFO( modelrad/15 - vibration_magnitude , modelrad/15 + vibration_magnitude, vperiod)).trigger(); //vibration.setPeriod(240000/lx.tempo.bpm());
 
       
   }
@@ -100,7 +100,7 @@ class SineSphere extends SCPattern {
   
 // }
  
-
+public int     c1c    (float a)              { return round(100*constrain(a,0,1));               }
 
 void setVibrationPeriod(double period){
 // to-do:  make this conditional upon time signature
@@ -129,6 +129,13 @@ float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, f
   //if (q.x > f1xcenter ) {return 140 ;}
     //else  {return 250;}  
  }
+
+ // float noisesat(PVector q) {
+   
+
+ //  return noise()
+
+ // }
  color spheryvalue (PVector p) {
    circlecenter.set(this.f1xcenter, this.f1ycenter, this.f1zcenter); 
 
@@ -191,9 +198,9 @@ return true;
 //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);
@@ -379,8 +386,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;
@@ -453,8 +460,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);