Update to new HeronLX packaging for LXParameter stuff

[SugarCubes.git] / AlexGreen.pde

diff --git a/AlexGreen.pde b/AlexGreen.pde
index 488d04b6fcb6bd3b0ff53f9d41e57b4a3221fe70..e8b55cec34a6794de908f1fbacae0a0f4b8d7a7d 100644 (file)
--- a/AlexGreen.pde
+++ b/AlexGreen.pde
@@ -1,7 +1,9 @@
-class SineSphere extends DPat {
+class SineSphere extends SCPattern {
+  private SinLFO yrot = new SinLFO(0, TWO_PI, 2000);
+  public final LXProjection sinespin; 
  float modelrad = sqrt((model.xMax)*(model.xMax) + (model.yMax)*(model.yMax) + (model.zMax)*(model.zMax));
- //PVector modelcenter = new PVector(model.xMax, model.yMax, model.zMax);
   Pick Sshape; 
+  public final PVector P = new PVector();
 
   class Sphery {
   float f1xcenter, f1ycenter, f1zcenter, f2xcenter , f2ycenter, f2zcenter; //second three are for an ellipse with two foci
@@ -16,8 +18,6 @@ class SineSphere extends DPat {
   public BasicParameter huespread;
   public BasicParameter bouncerate;
   public BasicParameter bounceamp;
-  
-  
  
   public Sphery(float f1xcenter, float f1ycenter, float f1zcenter, float vibration_min, float vibration_max, float vperiod) 
   {
@@ -31,14 +31,14 @@ class SineSphere extends DPat {
    addParameter(bouncerate = new BasicParameter("Rate", .5));  //ybounce.modulateDurationBy(bouncerate);
    addParameter(widthparameter = new BasicParameter("Width", .1));
    addParameter(huespread = new BasicParameter("Hue", .2));
-  
+   
    addModulator( vx = new SinLFO(-4000, 10000, 100000)).trigger() ;
    //addModulator(xbounce = new SinLFO(model.xMax/3, 2*model.yMax/3, 2000)).trigger(); 
    addModulator(ybounce= new SinLFO(model.yMax/3, 2*model.yMax/3, 240000./lx.tempo.bpm())).trigger(); //ybounce.modulateDurationBy
     
    //addModulator(bounceamp); //ybounce.setMagnitude(bouncerate);
    addModulator( vibration = new SinLFO(vibration_min , vibration_max, 240000./lx.tempo.bpm())).trigger(); //vibration.modulateDurationBy(vx);
-   
+      
   }
  public Sphery(float f1xcenter, float f1ycenter, float f1zcenter, float f2xcenter, float f2ycenter, float f2zcenter, 
   float vibration_min, float vibration_max, float vperiod)  
@@ -86,8 +86,11 @@ float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, f
       - 1.2*vibration.getValuef() ) ) ) ; 
   }
 
-
-   void run(int deltaMS) { };
+void run(double deltaMs) {
+      float vv = vibration.getValuef();
+      float ybv = ybounce.getValuef();
+      
+    }
   
 }  
 
@@ -96,6 +99,8 @@ final Sphery[] spherys;
   SineSphere(GLucose glucose) 
   {
     super(glucose);
+    sinespin = new LXProjection(model);
+    addModulator(yrot).trigger();
     //Sshape = addPick("Shape", , 1);
     spherys = new Sphery[] {
       new Sphery(model.xMax/4, model.yMax/2, model.zMax/2, modelrad/16, modelrad/8, 3000),
@@ -125,14 +130,32 @@ final Sphery[] spherys;
 //     }
 //   }
 
-     void StartRun(int deltaMs) {
+     void run( double deltaMs) {
      float t = lx.tempo.rampf();
      float bpm = lx.tempo.bpmf();
      //spherys[1].run(deltaMs);
      //spherys[2].run(deltaMs);
-     //spherys[3].run(deltaMs);
-  
-       
+     //spherys[3].run(deltaMs);]
+     sinespin.reset()
+
+     // Translate so the center of the car is the origin, offset by yPos
+      .center()
+
+      // Rotate around the origin (now the center of the car) about an X-vector
+      .rotate(yrot.getValuef(), 0, 1, 0);
+
+
+
+     for (LXPoint p : model.points){
+    color c = 0;
+    c = blendColor(c, spherys[1].spheryvalue(p.x, p.y, p.z, .75*model.xMax, model.yMax/2, model.zMax/2), ADD);
+    c = blendColor(c, spherys[0].spheryvalue(p.x, p.y, p.z, model.xMax/4, model.yMax/4, model.zMax/2), ADD);
+    c = blendColor(c, spherys[2].spheryvalue(p.x, p.y, p.z, model.xMax/2, model.yMax/2, model.zMax/2),ADD);
+     
+      colors[p.index] = lx.hsb(lx.h(c), lx.s(c), lx.b(c));
+
+               }
+      
 
 
   }
@@ -142,15 +165,11 @@ final Sphery[] spherys;
    //   spheremode++;
    //     }
 
-  color CalcPoint(PVector Px) 
-  { 
-       // if (spheremode == 0 )
+  // color CalcPoint(PVector Px) 
+  // { 
+  //      // if (spheremode == 0 )
               //{
-             color c = 0;
-             c = blendColor(c, spherys[1].spheryvalue(Px.x, Px.y, Px.z, .75*model.xMax, model.yMax/2, model.zMax/2), ADD);
-             c = blendColor(c, spherys[0].spheryvalue(Px.x, Px.y, Px.z, model.xMax/4, model.yMax/4, model.zMax/2), ADD);
-             c = blendColor(c, spherys[2].spheryvalue(Px.x, Px.y, Px.z, model.xMax/2, model.yMax/2, model.zMax/2),ADD);
-             return c;
+            
              //}
       //   else if (spheremode == 1)
       // {
@@ -167,7 +186,7 @@ final Sphery[] spherys;
        // }
 
   
-          } 
+       //   } 
         
   }
 
@@ -223,7 +242,7 @@ float cfloor = c.y;
 
 // if (i%3 == 0){
 
-// for (Point p : c.points ){
+// for (LXPoint p : c.points ){
 //  // colors[p.index]=color(0,0,0);
 //   //float dif = (p.y - c.y);
 //   //colors[p.index] = color( bg.getValuef() , 80 , dif < curl.getValuef() ? 80 : 0, ADD);
@@ -232,7 +251,7 @@ float cfloor = c.y;
 
 // else if (i%3 == 1) {
   
-//  for (Point p: c.points){
+//  for (LXPoint p: c.points){
 //   colors[p.index]=color(0,0,0);
 //   float dif = (p.y - c.y);
 //   // colors[p.index] = 
@@ -243,7 +262,7 @@ float cfloor = c.y;
 //     }
 // else if (i%3 == 2){
  // centerlist[i].sub(cubeorigin(i);
-   for (Point p: c.points) {
+   for (LXPoint p: c.points) {
     PVector pv = new PVector(p.x, p.y, p.z);
      colors[p.index] =color( constrain(4* pv.dist(centerlist.get(i)), 0, 360)  , 50, 100 );
    // colors[p.index] =color(constrain(centerlist[i].x, 0, 360), constrain(centerlist[i].y, 0, 100),  );
@@ -271,7 +290,7 @@ HueTestHSB(GLucose glucose) {
 }
   void run(double deltaMs){
 
-  for (Point p : model.points) {
+  for (LXPoint p : model.points) {
     color c = 0;
     c = blendColor(c, lx.hsb(360*HueT.getValuef(), 100*SatT.getValuef(), 100*BriT.getValuef()), ADD);
     colors[p.index]= c;