X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=AlexGreen.pde;h=00dfe19945576a98e94f030c8af3106f9e67a3b8;hb=df18145ff0149470136d51d6eab334800e7be9a9;hp=e3897cfe8045ebfb8752cb0975995f62f362f02a;hpb=1c44211b1a15965afee7056a2f1d43a1306df61b;p=SugarCubes.git

diff --git a/AlexGreen.pde b/AlexGreen.pde
index e3897cf..00dfe19 100644
--- a/AlexGreen.pde
+++ b/AlexGreen.pde
@@ -6,17 +6,18 @@ class SineSphere extends SCPattern {
   private int pitch = 0; 
   private int channel = 0; 
   private int velocity = 0; 
-  public final Projection sinespin;
-  public final Projection sinespin2; 
-  
+  private int cur = 0; 
+  public final LXProjection sinespin; 
+  public final LXProjection sinespin2;
+ float modelrad = sqrt((model.xMax)*(model.xMax) + (model.yMax)*(model.yMax) + (model.zMax)*(model.zMax));
+  Pick Sshape; 
+
   //to-do:  how to sync all hues across sphery's via one basicparameter 
   //public BasicParameter huespread = new BasicParameter("HueSpread", 180, 360);
   public BasicParameter rotationx = new BasicParameter("rotx", 0, 0, 1 );
   public BasicParameter rotationy = new BasicParameter("roty", 1, 0, 1);
   public BasicParameter rotationz = new BasicParameter("rotz", 0, 0, 1);
   
- 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 {
@@ -51,7 +52,7 @@ class SineSphere extends SCPattern {
    
    addModulator( vx = new SinLFO(500, 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(); //bounce.modulateDurationBy
+   addModulator(ybounce= new SinLFO(model.yMax/3, 2*model.yMax/3, 240000)).trigger(); //bounce.modulateDurationBy
     
    //addModulator(bounceamp); //ybounce.setMagnitude(bouncerate);
    addModulator( vibration = new SinLFO(vibration_min , vibration_max, 10000)).trigger(); //vibration.setPeriod(240000/lx.tempo.bpm());
@@ -155,13 +156,21 @@ channel=note.getChannel();
 return true;
 }
 
+public boolean gridPressed(int row, int col) {
+ pitch = row; channel = col; 
+ cur = NumApcCols*(pitch-53)+col; 
+//setState(row, col, 0 ? 1 : 0); 
+return true;
+}
+
+//public grid
 final Sphery[] spherys;
  
   SineSphere(GLucose glucose) 
   {
     super(glucose);
-    sinespin = new Projection(model);
-    sinespin2 = new Projection(model);
+    sinespin = new LXProjection(model);
+    sinespin2 = new LXProjection(model);
     addParameter(huespread);
     addParameter(rotationx);
     addParameter(rotationy);
@@ -206,34 +215,36 @@ final Sphery[] spherys;
     public void run( double deltaMs) {
      double t = lx.tempo.ramp();
      double bpm = lx.tempo.bpm();
-     spherys[0].run(deltaMs);
-     spherys[1].run(deltaMs);
-     spherys[2].run(deltaMs);
-     spherys[3].run(deltaMs);
      
+     sinespin.reset()
+     .center() 
+     // .scale(1.3,1.3,1.3)
+      // Rotate around the origin (now the center of the car) about an y-vector
+      .rotate(yrot.getValuef(), rotationx.getValuef(), rotationy.getValuef() , rotationz.getValuef())
+      .translate(model.cx, model.cy, model.cz);
+     
+     switch (cur) {
 
-     switch (pitch) 
-    {
-     case 53: t = .5*t;   bpm = .5*bpm;  break;
+     case 1: t = .5*t;   bpm = .5*bpm;  break;
 
-     case 54: t = t;   bpm = bpm;   break;
+     case 2: t = t;   bpm = bpm;   break;
 
-     case 55: t = 2*t;  bpm = 2*bpm; break;
+     case 3: t = 2*t;  bpm = 2*bpm; break;
 
      default: t= t;   bpm = bpm; 
-
-     
-      }
-      
+     }
+        
       for ( Sphery s: spherys){
+     
       s.setVibrationPeriod(480000/bpm);
       s.vibration.setBasis(t);
+     
        }
-     sinespin.reset(model)
+     sinespin.reset()
      
     
      // Translate so the center of the car is the origin, offset 
-      .translateCenter(model, 0, 0, 0)
+      .center()
      // .scale(1.3,1.3,1.3)
       // Rotate around the origin (now the center of the car) about an y-vector
       .rotate(yrot.getValuef(), rotationx.getValuef(), rotationy.getValuef() , rotationz.getValuef())
@@ -243,7 +254,7 @@ final Sphery[] spherys;
    
    
 
-     for (Coord p: sinespin)
+     for (LXVector p: sinespin)
    // for (Point p: model.points)
      {
        P.set(p.x, p.y, p.z);
@@ -258,12 +269,12 @@ final Sphery[] spherys;
     
       
                }
-   sinespin2.reset(model).
-   translateCenter(model,0,0,0).
-   rotate(yrot2.getValuef(), 0, 1, 0).
-   translate(model.cx,model.cy,model.cz);
+   sinespin2.reset()
+   .center()
+   .rotate(yrot.getValuef(), rotationx.getValuef(), rotationy.getValuef() , rotationz.getValuef())
+   .translate(model.cx,model.cy,model.cz);
 
-    for (Coord p: sinespin2)
+    for (LXVector p: sinespin2)
     {   color c = 0;
       // PVector P = new PVector(p.x, p.y, p.z);
         P.set(p.x, p.y, p.z);
@@ -273,8 +284,6 @@ final Sphery[] spherys;
 
     }  
 
-
-
   }
   
   color blendIfColor(color c1, color c2, int mode) {
@@ -331,16 +340,16 @@ for (int i = 0; i < model.cubes.size(); i++){
 PVector centerofcube(int i) { 
 Cube c = model.cubes.get(i);
 
-println(" cube #:  " + i + " c.x  "  +  c.x  + "  c.y   "  + c.y   + "  c.z  "  +   c.z  );
+//println(" cube #:  " + i + " c.x  "  +  c.x  + "  c.y   "  + c.y   + "  c.z  "  +   c.z  );
 // PVector cubeangle = new PVector(c.rx, c.ry, c.rz);
-println("raw x angle:  " + c.rx + "raw y angle:  " + c.ry + "raw z angle:  " + c.rz);
-PVector cubecenter = new PVector(c.x + CW/2, c.y + CH/2, c.z + CW/2);
-println("cubecenter unrotated:  "  + cubecenter.x + "  "  +cubecenter.y + "  " +cubecenter.z );
-PVector centerrot = new PVector(cos(c.rx)*CW/2 - sin(c.rx)*CW/2, cubecenter.y, cos(c.rz)*CW/2 + sin(c.rz)*CW/2);
+//println("raw x angle:  " + c.rx + "raw y angle:  " + c.ry + "raw z angle:  " + c.rz);
+//PVector cubecenter = new PVector(c.x + CW/2, c.y + CH/2, c.z + CW/2);
+//println("cubecenter unrotated:  "  + cubecenter.x + "  "  +cubecenter.y + "  " +cubecenter.z );
+//PVector centerrot = new PVector(cos(c.rx)*CW/2 - sin(c.rx)*CW/2, cubecenter.y, cos(c.rz)*CW/2 + sin(c.rz)*CW/2);
  // nCos*(y-o.y) - nSin*(z-o.z) + o.y
-cubecenter = PVector.add(new PVector(c.x, c.y, c.z), centerrot);
-println( "  cubecenter.x  " + cubecenter.x  + " cubecenter.y  " +  cubecenter.y + " cubecenter.z  "   +  cubecenter.z  + "   ");
-
+//cubecenter = PVector.add(new PVector(c.x, c.y, c.z), centerrot);
+//println( "  cubecenter.x  " + cubecenter.x  + " cubecenter.y  " +  cubecenter.y + " cubecenter.z  "   +  cubecenter.z  + "   ");
+PVector cubecenter = new PVector(c.cx, c.cy, c.cz);
 
 return cubecenter;
 }
@@ -353,7 +362,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);
@@ -362,7 +371,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] = 
@@ -373,7 +382,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),  );
@@ -401,7 +410,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;