X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=JackStahl.pde;h=862558ce21f90f5c3c9798cff8fdef5872453dc1;hb=270a8b44cd8296bb40fa74e4fcf2e7f7c4f1192c;hp=081ea40424c797e04594d75885808e17dba382a8;hpb=6b163a98976a5f2adf9da1b7bd3297e39d6dd7bf;p=SugarCubes.git

diff --git a/JackStahl.pde b/JackStahl.pde
index 081ea40..862558c 100644
--- a/JackStahl.pde
+++ b/JackStahl.pde
@@ -9,7 +9,7 @@
 class Swim extends SCPattern {
 
   // Projection stuff
-  private final Projection projection;
+  private final LXProjection projection;
   SawLFO rotation = new SawLFO(0, TWO_PI, 19000);
   SinLFO yPos = new SinLFO(-25, 25, 12323);
   final BasicParameter xAngle = new BasicParameter("XANG", 0.9);
@@ -20,7 +20,7 @@ class Swim extends SCPattern {
 
   public Swim(GLucose glucose) {
     super(glucose);
-    projection = new Projection(model);
+    projection = new LXProjection(model);
 
     addParameter(xAngle);
     addParameter(yAngle);
@@ -46,14 +46,14 @@ class Swim extends SCPattern {
 
     float denominator = max(xAngle.getValuef() + yAngle.getValuef() + zAngle.getValuef(), 1);
 
-    projection.reset(model)
+    projection.reset()
       // Swim around the world
       .rotate(rotation.getValuef(), xAngle.getValuef() / denominator, yAngle.getValuef() / denominator, zAngle.getValuef() / denominator)
-        .translateCenter(model, 0, 50 + yPos.getValuef(), 0);
+        .translateCenter(0, 50 + yPos.getValuef(), 0);
 
     float model_height =  model.yMax - model.yMin;
     float model_width =  model.xMax - model.xMin;
-    for (Coord p : projection) {
+    for (LXVector p : projection) {
       float x_percentage = (p.x - model.xMin)/model_width;
 
       // Multiply by 1.4 to shrink the size of the sin wave to be less than the height of the cubes.
@@ -83,7 +83,7 @@ class Balance extends SCPattern {
 
 
   // Projection stuff
-  private final Projection projection;
+  private final LXProjection projection;
 
   SinLFO sphere1Z = new SinLFO(0, 0, 15323);
   SinLFO sphere2Z = new SinLFO(0, 0, 8323);
@@ -102,7 +102,7 @@ class Balance extends SCPattern {
   public Balance(GLucose glucose) {
     super(glucose);
 
-    projection = new Projection(model);
+    projection = new LXProjection(model);
 
     addParameter(hueScale);
     addParameter(phaseParam);
@@ -157,12 +157,12 @@ class Balance extends SCPattern {
     float phase = phaseLFO.getValuef();
 
     float crazy_factor = crazyParam.getValuef() / 0.2;
-    projection.reset(model)
+    projection.reset()
       .rotate(rotationZ.getValuef() * crazy_factor,  0, 1, 0)
         .rotate(rotationX.getValuef() * crazy_factor, 0, 0, 1)
           .rotate(rotationY.getValuef() * crazy_factor, 0, 1, 0);
 
-    for (Coord p : projection) {
+    for (LXVector p : projection) {
       float x_percentage = (p.x - model.xMin)/modelWidth;
 
       float y_in_range = heightMod.getValuef() * (2*p.y - model.yMax - model.yMin) / modelHeight;