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

[SugarCubes.git] / AlexGreen.pde

diff --git a/AlexGreen.pde b/AlexGreen.pde
index cea0a90049a5c26ab89c171a4c8b04b7a1b6fd19..e507d20b179171fcd899973b6bd0ce42496e17df 100644 (file)
--- a/AlexGreen.pde
+++ b/AlexGreen.pde
@@ -1,16 +1,12 @@
 class SineSphere extends SCPattern {
   private SawLFO yrot = new SawLFO(0, TWO_PI, 3000);
   private SawLFO yrot2 = new SawLFO(0, -TWO_PI,  8000);
- 
-  public final Projection sinespin;
-  public final Projection sinespin2; 
-  
-  //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);
-  
+  public BasicParameter huespread = new BasicParameter("Hue", 0, 180);
+  public BasicParameter widthparameter= new BasicParameter("Width", .2);
+  private int pitch = 0; 
+  private int channel = 0; 
+  private int velocity = 0; 
+  public final LXProjection sinespin; 
  float modelrad = sqrt((model.xMax)*(model.xMax) + (model.yMax)*(model.yMax) + (model.zMax)*(model.zMax));
   Pick Sshape; 
   public final PVector P = new PVector();
@@ -24,8 +20,8 @@ class SineSphere extends SCPattern {
   public SinLFO ybounce;
   private SinLFO zbounce;
   float vibration_min, vibration_max, vperiod;
-  public BasicParameter widthparameter;
-  public BasicParameter huespread;
+  
+  //public BasicParameter huespread;
   public BasicParameter bouncerate;
   public BasicParameter bounceamp;
   public BasicParameter vibrationrate;
@@ -42,39 +38,40 @@ class SineSphere extends SCPattern {
    //addParameter(bounceamp = new BasicParameter("Amp", .5));
    //addParameter(bouncerate = new BasicParameter("Rate", .5));  //ybounce.modulateDurationBy(bouncerate);
    //addParameter(vibrationrate = new BasicParameter("vibration", 1000, 10000));
-    addParameter(widthparameter = new BasicParameter("Width", .2));
-    addParameter(huespread = new BasicParameter("Hue", 0, 180));
+    //addParameter(widthparameter = new BasicParameter("Width", .2));
+    
    
    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(bounceamp); //ybounce.setMagnitude(bouncerate);
-   addModulator( vibration = new SinLFO(vibration_min , vibration_max, 240000)).trigger(); //vibration.setPeriod(240000/lx.tempo.bpm());
+   addModulator( vibration = new SinLFO(vibration_min , vibration_max, 10000)).trigger(); //vibration.setPeriod(240000/lx.tempo.bpm());
       
   }
 
   //for an ellipse
- public Sphery(float f1xcenter, float f1ycenter, float f1zcenter, float f2xcenter, float f2ycenter, float f2zcenter, 
-  float vibration_min, float vibration_max, float vperiod)  
+//  public Sphery(float f1xcenter, float f1ycenter, float f1zcenter, float f2xcenter, float f2ycenter, float f2zcenter, 
+//   float vibration_min, float vibration_max, float vperiod)  
  
- {
-    this.f1xcenter = f1xcenter;
-   this.f1ycenter = f1ycenter;
-   this.f1zcenter = f1zcenter;
-   this.f2xcenter = f2xcenter;
-   this.f2ycenter = f2ycenter;
-   this.f2zcenter = f2zcenter;
-   this.vibration_min = vibration_min;
-   this.vibration_max = vibration_max;
-   this.vperiod = vperiod;
-   //addModulator(xbounce = new SinLFO(model.xMax/3, 2*model.yMax/3, 2000)).trigger(); 
-   addModulator(ybounce).trigger(); 
-   addModulator( vibration = new SinLFO(vibration_min , vibration_max, lx.tempo.rampf())).trigger(); //vibration.modulateDurationBy(vx);
-   addParameter(widthparameter = new BasicParameter("Width", .1));
-   addParameter(huespread = new BasicParameter("Hue", .2));
+//  {
+//     this.f1xcenter = f1xcenter;
+//    this.f1ycenter = f1ycenter;
+//    this.f1zcenter = f1zcenter;
+//    this.f2xcenter = f2xcenter;
+//    this.f2ycenter = f2ycenter;
+//    this.f2zcenter = f2zcenter;
+//    this.vibration_min = vibration_min;
+//    this.vibration_max = vibration_max;
+//    this.vperiod = vperiod;
+//    //addModulator(xbounce = new SinLFO(model.xMax/3, 2*model.yMax/3, 2000)).trigger(); 
+//    addModulator(ybounce).trigger(); 
+//    addModulator( vibration = new SinLFO(vibration_min , vibration_max, lx.tempo.rampf())).trigger(); //vibration.modulateDurationBy(vx);
+//    addParameter(widthparameter = new BasicParameter("Width", .1));
+//    //addParameter(huespread = new BasicParameter("bonk", .2));
   
-}
+// }
+ 
 
 
 void setVibrationPeriod(double period){
@@ -136,14 +133,28 @@ void run(double deltaMs) {
   
 }  
 
+// public boolean gridPressed(int row, int co){
+// midiengine.grid.setState();
+
+// return true;
+
+// }
+
+public boolean noteOn(Note note)  {
+pitch= note.getPitch();  
+velocity=note.getVelocity();
+channel=note.getChannel();
+return true;
+}
 
 final Sphery[] spherys;
  
   SineSphere(GLucose glucose) 
   {
     super(glucose);
-    sinespin = new Projection(model);
+    sinespin = new LXProjection(model);
     sinespin2 = new Projection(model);
+    addParameter(huespread);
     addParameter(rotationx);
     addParameter(rotationy);
     addParameter(rotationz);
@@ -187,14 +198,31 @@ 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);
-     for ( Sphery s: spherys){
-      s.setVibrationPeriod(240000/bpm);
+     //spherys[0].run(deltaMs);
+     //spherys[1].run(deltaMs);
+     //spherys[2].run(deltaMs);
+     //spherys[3].run(deltaMs);]
+     sinespin.reset()
+    .center
+     .rotate(yrot.getValuef(), 0, 1, 0);
+
+     switch (pitch) 
+    {
+     case 53: t = .5*t;   bpm = .5*bpm;  break;
+
+     case 54: t = t;   bpm = bpm;   break;
+
+     case 55: 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)
      
     
@@ -239,8 +267,6 @@ final Sphery[] spherys;
 
     }  
 
-
-
   }
   
   color blendIfColor(color c1, color c2, int mode) {
@@ -319,7 +345,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);
@@ -328,7 +354,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] = 
@@ -339,7 +365,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),  );
@@ -367,7 +393,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;