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

diff --git a/AlexGreen.pde b/AlexGreen.pde
index 91677db..e8b55ce 100644
--- a/AlexGreen.pde
+++ b/AlexGreen.pde
@@ -1,6 +1,6 @@
 class SineSphere extends SCPattern {
   private SinLFO yrot = new SinLFO(0, TWO_PI, 2000);
-  public final Projection sinespin; 
+  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();
@@ -99,7 +99,7 @@ final Sphery[] spherys;
   SineSphere(GLucose glucose) 
   {
     super(glucose);
-    sinespin = new Projection(model);
+    sinespin = new LXProjection(model);
     addModulator(yrot).trigger();
     //Sshape = addPick("Shape", , 1);
     spherys = new Sphery[] {
@@ -136,17 +136,17 @@ final Sphery[] spherys;
      //spherys[1].run(deltaMs);
      //spherys[2].run(deltaMs);
      //spherys[3].run(deltaMs);]
-     sinespin.reset(model)
+     sinespin.reset()
 
      // Translate so the center of the car is the origin, offset by yPos
-      .translateCenter(model, 0, 0, 0)
+      .center()
 
       // 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){
+     for (LXPoint 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);
@@ -242,7 +242,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);
@@ -251,7 +251,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] = 
@@ -262,7 +262,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),  );
@@ -290,7 +290,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;