X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_Internals.pde;h=7dcf1757e8e9b138969df17d62dfe44fe5e5123f;hb=e0cea6008a7bdfb19012ed8f7ef1213cb553783d;hp=108bec54bfbfc802589c1426bc55fd1ad51a9a4a;hpb=87998ff32c5973d59ee9eb13fde64f9c4bd9d770;p=SugarCubes.git

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;