Merge branch 'master' of https://github.com/sugarcubes/SugarCubes into alexgreen

[SugarCubes.git] / AlexGreen.pde

diff --git a/AlexGreen.pde b/AlexGreen.pde
index 910371a4c2dac3c2ea7eba695e8fe6286ea4b2f9..992510df8d7b0c0ca82cff5c07d734ce271c3af1 100644 (file)
--- a/AlexGreen.pde
+++ b/AlexGreen.pde
@@ -1,9 +1,12 @@
-class SineSphere extends DPat {
+class SineSphere extends SCPattern {
   private SawLFO yrot = new SawLFO(0, TWO_PI, 3000);
-  public final Projection sinespin; 
+  private SawLFO yrot2 = new SawLFO(0, -TWO_PI,  8000);
+  public final Projection sinespin;
+  public final Projection sinespin2; 
   private BasicParameter rotation = new BasicParameter("rotation", 0);
  float modelrad = sqrt((model.xMax)*(model.xMax) + (model.yMax)*(model.yMax) + (model.zMax)*(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
@@ -18,9 +21,7 @@ class SineSphere extends DPat {
   public BasicParameter huespread;
   public BasicParameter bouncerate;
   public BasicParameter bounceamp;
-  public PVector circlecenter; 
-  
-  
+  public final PVector circlecenter = new PVector(); 
  
   public Sphery(float f1xcenter, float f1ycenter, float f1zcenter, float vibration_min, float vibration_max, float vperiod) 
   {
@@ -33,7 +34,7 @@ class SineSphere extends DPat {
    //addParameter(bounceamp = new BasicParameter("Amp", .5));
    //addParameter(bouncerate = new BasicParameter("Rate", .5));  //ybounce.modulateDurationBy(bouncerate);
    addParameter(widthparameter = new BasicParameter("Width", .1));
-   addParameter(huespread = new BasicParameter("Hue", .2));
+   addParameter(huespread = new BasicParameter("Hue", .5, 10));
    
    addModulator( vx = new SinLFO(-4000, 10000, 100000)).trigger() ;
    //addModulator(xbounce = new SinLFO(model.xMax/3, 2*model.yMax/3, 2000)).trigger(); 
@@ -41,7 +42,7 @@ class SineSphere extends DPat {
     
    //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)  
@@ -74,21 +75,32 @@ float distfromcirclecenter(float px, float py, float pz, float f1x, float f1y, f
     }
  //void updatespherey(deltaMs, )
 
- int quadrant(PVector q) {
-   //float theta =  
-  if (q.x > f1xcenter ) {return 140;}
-    else  {return 250;}
-
-
+ float quadrant(PVector q) {
+   float qtheta = atan2(  (q.x-f1xcenter) , (q.z - f1zcenter) ); 
+   //println( "qtheta  " + qtheta);
 
+    return map(qtheta, -PI/2, PI/2, 140, 240);
+  //if (q.x > f1xcenter ) {return 140 ;}
+    //else  {return 250;}  
  }
- color spheryvalue (PVector p, float f1xcenter, float f1ycenter, float f1zcenter) 
- {  circlecenter = new PVector(f1xcenter, f1ycenter, f1zcenter);
+ color spheryvalue (PVector p, float f1xcenter, float f1ycenter, float f1zcenter) {
+   circlecenter.set(f1xcenter, f1ycenter, f1zcenter); 
+
+  // circlecenter = new PVector(f1xcenter, f1ycenter, f1zcenter);
 //switch(sShpape.cur() ) {}  
-   return lx.hsb(constrain( huespread.getValuef()*5*quadrant(p), 0, 360) ,
-    PVector.dist(p,circlecenter) , 
-    max(0, 100 - 100*widthparameter.getValuef()*abs(PVector.dist(p, circlecenter)
-      - vibration.getValuef() ) ) ); 
+
+   float b = max(0, 100 - 100*widthparameter.getValuef()*abs(p.dist(circlecenter)
+      - vibration.getValuef() ) );
+
+   if (b <= 0) {
+     return 0;
+   }
+
+   return lx.hsb(
+     constrain(huespread.getValuef()*5*quadrant(p), 0, 360),
+     80,
+     b
+   ); 
  }
  color ellipsevalue(float px, float py, float pz , float f1xc, float f1yc, float f1zc, float f2xc, float f2yc, float f2zc)
   {
@@ -115,15 +127,21 @@ final Sphery[] spherys;
   {
     super(glucose);
     sinespin = new Projection(model);
+    sinespin2 = new Projection(model);
     addModulator(yrot).trigger();
+    addModulator(yrot2).trigger(); 
     addParameter(rotation);
     //Sshape = addPick("Shape", , 1);
     spherys = new Sphery[] {
       new Sphery(model.xMax/4, model.yMax/2, model.zMax/2, modelrad/16, modelrad/8, 3000),
       new Sphery(.75*model.xMax, model.yMax/2, model.zMax/2, modelrad/20, modelrad/10, 2000),
       new Sphery(model.xMax/2, model.yMax/2, model.zMax/2,  modelrad/4, modelrad/8, 2300),
-    };
-  
+
+      new Sphery(.3*model.xMax, .4*model.yMax, .6*model.zMax, modelrad/16, modelrad/8, 4000),
+      new Sphery(.75*model.xMax, model.yMax/2, model.zMax/2, modelrad/20, modelrad/10, 2000),
+      new Sphery(model.xMax/2, model.yMax/2, model.zMax/2,  modelrad/4, modelrad/8, 2300),
+      
+    };  
   }
 
 // public void onParameterChanged(LXParameter parameter)
@@ -152,8 +170,11 @@ final Sphery[] spherys;
      spherys[0].run(deltaMs);
      spherys[1].run(deltaMs);
      spherys[2].run(deltaMs);
+     spherys[3].run(deltaMs);
+     
      sinespin.reset(model)
-
+     
+    
      // Translate so the center of the car is the origin, offset 
       .translateCenter(model, 0, 0, 0)
      // .scale(1.3,1.3,1.3)
@@ -162,39 +183,50 @@ final Sphery[] spherys;
       .translate(model.cx, model.cy, model.cz);
       
 
-      //.translateCenter(model, model.cx, , model.cz);
+   
    
 
      for (Coord p: sinespin)
    // for (Point p: model.points)
      {
-      PVector P = new PVector(p.x, p.y, p.z);
-    color c = 0;
-    c = blendColor(c, spherys[1].spheryvalue(P, .75*model.xMax, model.yMax/2, model.zMax/2), ADD);
-    c = blendColor(c, spherys[0].spheryvalue(P, model.xMax/4, model.yMax/4, model.zMax/2), ADD);
-    c = blendColor(c, spherys[2].spheryvalue(P, model.xMax/2, model.yMax/2, model.zMax/2),ADD);
-     
-      colors[p.index] = lx.hsb(lx.h(c), lx.s(c), lx.b(c));
+       P.set(p.x, p.y, p.z);
+      // PVector P = new PVector(p.x, p.y, p.z);
+    color c = #000000;
+    c = blendIfColor(c, spherys[1].spheryvalue(P, .75*model.xMax, model.yMax/2, model.zMax/2), ADD);
+    c = blendIfColor(c, spherys[0].spheryvalue(P, model.xMax/4, model.yMax/4, model.zMax/2), ADD);
+    c = blendIfColor(c, spherys[2].spheryvalue(P, model.xMax/2, model.yMax/2, model.zMax/2),ADD);
+    
 
-               }
+    colors[p.index] = c;
+    
       
+               }
+   sinespin2.reset(model).
+   translateCenter(model,0,0,0).
+   rotate(yrot2.getValuef(), 0, 1, 0).
+   translate(model.cx,model.cy,model.cz);
+
+    for (Coord p: sinespin2)
+    {   color c = 0;
+      // PVector P = new PVector(p.x, p.y, p.z);
+        P.set(p.x, p.y, p.z);
+        c = blendIfColor(c, spherys[3].spheryvalue(P, .3*model.xMax, .7*model.yMax, .6*model.zMax),ADD);
+         
+        colors[p.index] = blendIfColor(colors[p.index], c , ADD);
+
+    }  
 
 
+
+  }
+  
+  color blendIfColor(color c1, color c2, int mode) {
+    if (c2 != 0) {
+      return blendColor(c1, c2, mode);
+    }
+    return c1;
   }
-  int spheremode = 0;
   
-   // void keyPressed() {
-   //   spheremode++;
-   //     }
-
-  // color CalcPoint(PVector Px) 
-  // { 
-  //      // if (spheremode == 0 )
-              //{
-            
-             //}
-      //   else if (spheremode == 1)
-      // {
 
       //   color c = 0;
       //   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);
@@ -233,7 +265,7 @@ ArrayList<PVector> centerlistrelative = new ArrayList<PVector>();
 for (int i = 0; i < model.cubes.size(); i++){
   Cube a = model.cubes.get(i);
   cubeorigin.add(new PVector(a.x, a.y, a.z));
-  centerlist.add(centerofcube(i));
+  centerlist.add(new PVector(a.cx, a.cy, a.cz) );
   
 }