X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=AlexGreen.pde;h=fdd88f0d20ccec2a2a597ce6dbf5accd0cd38124;hb=b30f14fdacdcccafe123e00f20a4d6df46e6995c;hp=f63fb493ec9c1558d2838b67fc97a3942d3a5e40;hpb=7c7625ec088b93148f46adc19ba8f1cb4baa8321;p=SugarCubes.git

diff --git a/AlexGreen.pde b/AlexGreen.pde
index f63fb49..fdd88f0 100755
--- a/AlexGreen.pde
+++ b/AlexGreen.pde
@@ -96,7 +96,7 @@ final Sphery[] spherys;
   SineSphere(GLucose glucose) 
   {
     super(glucose);
-    //Sshape = addPick("Shape", 0, 1);
+    //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),
@@ -172,7 +172,9 @@ final Sphery[] spherys;
   }
 
 class CubeCurl extends SCPattern{
-float CH, CW;
+float CH, CW, diag;
+ArrayList<PVector> cubeorigin = new ArrayList<PVector>();
+ArrayList<PVector> centerlist = new ArrayList<PVector>();
 private SinLFO curl = new SinLFO(0, Cube.EDGE_HEIGHT, 5000 ); 
 
 private SinLFO bg = new SinLFO(180, 220, 3000);
@@ -183,25 +185,32 @@ addModulator(curl).trigger();
 addModulator(bg).trigger();
  this.CH = Cube.EDGE_HEIGHT;
  this.CW = Cube.EDGE_WIDTH;
-final float diag = sqrt(CH*CH + CW*CW + CW*CW);
-ArrayList<PVector> centerlist = new ArrayList<PVector>();
+ this.diag = sqrt(CH*CH + CW*CW + CW*CW);
+
 
+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));
-   } 
+  
+} 
 
 }
 //there is definitely a better way of doing this!
 PVector centerofcube(int i) { 
 Cube c = model.cubes.get(i);
-PVector cubeorigin = new PVector(c.x, c.y, c.z);
-PVector cubecenter = new PVector(c.x+ CW/2, c.y + CH/2, c.z + CW/2);
 PVector cubeangle = new PVector(c.rx, c.ry, c.rz);
+println("raw x" + cubeangle.x + "raw y" + cubeangle.y + "raw z" + cubeangle.z);
 cubeangle.normalize();
-println( cubeangle.x + cubeangle.y + cubeangle.z);
-PVector cubecenterf = new PVector(cubecenter.x + tan(c.rx)*CW/2, cubecenter.y + tan(c.ry)*CH/2, cubecenter.z + tan(c.rz)*CW/2);
-
-return cubecenterf;
+println( "norm"+ cubeangle.x + "norm" + cubeangle.y +"norm" + cubeangle.z);
+PVector cubecenter = PVector.add(cubeorigin.get(i), PVector.mult(cubeangle, diag));
+
+//PVector cubecenter = new PVector(c.x+ CW/2, c.y + CH/2, c.z + CW/2);
+//println("cubecenter raw" + " : " +  cubecenter.x + "  " + cubecenter.y + "  " + cubecenter.z ); 
+//PVector cubecenterf = new PVector(cubecenter.x + cos(c.ry)*CW/2, cubecenter.y , cubecenter.z - tan(c.ry) * CW/2);
+//println("cubecenter angled" + " : " +  cubecenterf.x + "  " + cubecenterf.y + "  " + cubecenterf.z );
+return cubecenter;
 }
 
 
@@ -222,7 +231,7 @@ for (Point p : c.points ){
 else if (i%3 == 1) {
   
  for (Point p: c.points){
-   colors[p.index]=color(0,0,0);
+  colors[p.index]=color(0,0,0);
   float dif = (p.y - c.y);
   // colors[p.index] = 
   // color(bg.getValuef(),
@@ -231,14 +240,17 @@ else if (i%3 == 1) {
      }
     }
 else if (i%3 == 2){
+ // centerlist[i].sub(cubeorigin(i);
    for (Point p: c.points) {
-    
+    PVector pv = new PVector(p.x, p.y, p.z);
+     colors[p.index] =color( constrain(5*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),  );
 
 
-   }
+    }
 
 
-}
+  }
 
    }
   }