From: Mark Slee <mcslee@Mark-Slees-MacBook-Pro.local>
Date: Wed, 7 Aug 2013 06:35:56 +0000 (-0700)
Subject: Use the new layout code
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=e0cea6008a7bdfb19012ed8f7ef1213cb553783d;p=SugarCubes.git

Use the new layout code
---

diff --git a/MarkSlee.pde b/MarkSlee.pde
index 97df3a0..1ecb640 100644
--- a/MarkSlee.pde
+++ b/MarkSlee.pde
@@ -335,7 +335,7 @@ public class PianoKeyPattern extends SCPattern {
     for (Cube c : model.cubes) {
       float v = max(getBase(i).getValuef() * levelf/4., getEnvelope(i++).getValuef());
       setColor(c, color(
-        (huef + 20*v + abs(c.fx-model.xMax/2.)*.3 + c.fy) % 360,
+        (huef + 20*v + abs(c.cx-model.xMax/2.)*.3 + c.cy) % 360,
         min(100, 120*v),
         100*v
       ));
diff --git a/TestPatterns.pde b/TestPatterns.pde
index 87d9ee2..d7d5625 100644
--- a/TestPatterns.pde
+++ b/TestPatterns.pde
@@ -112,7 +112,7 @@ class TestProjectionPattern extends SCPattern {
     projection.reset(model)
     
       // Translate so the center of the car is the origin, offset by yPos
-      .translateCenter(0, yPos.getValuef(), 0)
+      .translateCenter(model, 0, yPos.getValuef(), 0)
 
       // Rotate around the origin (now the center of the car) about an X-vector
       .rotate(angle.getValuef(), 1, 0, 0)
diff --git a/_Internals.pde b/_Internals.pde
index 108bec5..7dcf175 100644
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -68,8 +68,6 @@ DebugUI debugUI;
 // Camera variables
 float eyeR, eyeA, eyeX, eyeY, eyeZ, midX, midY, midZ;
 
-final float FEET = 12;
-
 void setup() {
   startMillis = lastMillis = millis();
 
@@ -117,10 +115,10 @@ void setup() {
   logTime("Setup MIDI devices");
     
   // Setup camera
-  midX = glucose.model.xMax/2 + 20;
+  midX = TRAILER_WIDTH/2. + 20;
   midY = glucose.model.yMax/2;
-  midZ = glucose.model.zMax/2;
-  eyeR = -270;
+  midZ = TRAILER_DEPTH/2.;
+  eyeR = -290;
   eyeA = .15;
   eyeY = midY + 20;
   eyeX = midX + eyeR*sin(eyeA);
@@ -204,7 +202,7 @@ void draw() {
   
   // 2D Overlay
   camera();
-  javax.media.opengl.GL gl= ((PGraphicsOpenGL)g).beginGL();
+  javax.media.opengl.GL gl = ((PGraphicsOpenGL)g).beginGL();
   gl.glClear(javax.media.opengl.GL.GL_DEPTH_BUFFER_BIT);
   ((PGraphicsOpenGL)g).endGL();
   strokeWeight(1);
@@ -228,9 +226,9 @@ void drawCube(Cube c) {
 void drawBox(float x, float y, float z, float rx, float ry, float rz, float xd, float yd, float zd, float sw) {
   pushMatrix();
   translate(x, y, z);
-  rotate(rx, 1, 0, 0);
+  rotate(rx / 180. * PI, -1, 0, 0);
   rotate(ry / 180. * PI, 0, -1, 0);
-  rotate(rz, 0, 0, 1);
+  rotate(rz / 180. * PI, 0, 0, -1);
   for (int i = 0; i < 4; ++i) {
     float wid = (i % 2 == 0) ? xd : zd;
     
diff --git a/code/GLucose.jar b/code/GLucose.jar
index a116287..3410152 100644
Binary files a/code/GLucose.jar and b/code/GLucose.jar differ