X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=AlexGreen.pde;h=91677db78efd90e70327392cd6bafc857a3f4c45;hb=ef7118ad30ec90ed1a3e6d3f5d9fdb0a21a03fe9;hp=6b076f63f03f1c0ec3d4c3d18bd58ded14c0249e;hpb=f1370a0bca7f37bcb607734f3622358fd8efb023;p=SugarCubes.git

diff --git a/AlexGreen.pde b/AlexGreen.pde
old mode 100755
new mode 100644
index 6b076f6..91677db
--- 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 Projection 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)  
@@ -72,22 +72,25 @@ float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, f
  color spheryvalue (float px, float py, float pz , float f1xc, float f1yc, float f1zc) 
  {
 //switch(sShpape.cur() ) {}  
-   return color(constrain(huespread.getValuef()*5*px, 0, 360) , dist(px, py, pz, f1xc, f1yc, f1zc) , 
+   return lx.hsb(constrain(huespread.getValuef()*5*px, 0, 360) , dist(px, py, pz, f1xc, f1yc, f1zc) , 
     max(0, 100 - 100*widthparameter.getValuef()*abs(dist(px, py, pz, f1xcenter, ybounce.getValuef(), f1zcenter)
       - vibration.getValuef() ) ) ); 
  }
  color ellipsevalue(float px, float py, float pz , float f1xc, float f1yc, float f1zc, float f2xc, float f2yc, float f2zc)
   {
 //switch(sShpape.cur() ) {}  
-   return color(huespread.getValuef()*5*px, dist(model.xMax-px, model.yMax-py, model.zMax-pz, f1xc, f1yc, f1zc) , 
+   return lx.hsb(huespread.getValuef()*5*px, dist(model.xMax-px, model.yMax-py, model.zMax-pz, f1xc, f1yc, f1zc) , 
     max(0, 100 - 100*widthparameter.getValuef() *
       abs( (dist(px, py, pz, f1xc, ybounce.getValuef(), f1zc) + 
         (dist(px, py , pz, f2xc, ybounce.getValuef(), f2zc) ) )/2  
       - 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 Projection(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(model)
+
+     // Translate so the center of the car is the origin, offset by yPos
+      .translateCenter(model, 0, 0, 0)
+
+      // Rotate around the origin (now the center of the car) about an X-vector
+      .rotate(yrot.getValuef(), 0, 1, 0);
+
+
+
+     for (Point 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(xyz 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)
       // {
@@ -159,15 +178,15 @@ final Sphery[] spherys;
       //   c = blendColor(c, spherys[3].ellipsevalue(Px.x, Px.y, Px.z, model.xMax/4, model.yMax/4, model.zMax/4, 3*model.xMax/4, 3*model.yMax/4, 3*model.zMax/4),ADD);
       //   return c; 
       // }
-      // return color(0,0,0);
+      // return lx.hsb(0,0,0);
       //  // else if(spheremode ==2)
        // { color c = 0;
-       //   return color(CalcCone( (xyz by = new xyz(0,spherys[2].ybounce.getValuef(),0) ), Px, mid) );
+       //   return lx.hsb(CalcCone( (xyz by = new xyz(0,spherys[2].ybounce.getValuef(),0) ), Px, mid) );
 
        // }
 
   
-          } 
+       //   } 
         
   }
 
@@ -273,7 +292,7 @@ HueTestHSB(GLucose glucose) {
 
   for (Point p : model.points) {
     color c = 0;
-    c = blendColor(c, color(360*HueT.getValuef(), 100*SatT.getValuef(), 100*BriT.getValuef()), ADD);
+    c = blendColor(c, lx.hsb(360*HueT.getValuef(), 100*SatT.getValuef(), 100*BriT.getValuef()), ADD);
     colors[p.index]= c;
   }
    int now= millis();
@@ -283,4 +302,4 @@ HueTestHSB(GLucose glucose) {
    }
   }
 
- }
\ No newline at end of file
+ }