X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_Internals.pde;h=e5a77552e73cc646e7beb09aee27da48e5285830;hb=f584b5ebb67c480024af86674c53fe2d8d73aad2;hp=5603698adf2d4f907aa832a1ec09ef9e27db2661;hpb=0e3c55427eb3c56557e42dd3a21aa159e47243de;p=SugarCubes.git

diff --git a/_Internals.pde b/_Internals.pde
index 5603698..e5a7755 100644
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -34,7 +34,17 @@ import rwmidi.*;
 final int VIEWPORT_WIDTH = 900;
 final int VIEWPORT_HEIGHT = 700;
 
-int targetFramerate = 30;
+final float TRAILER_WIDTH = 240;
+final float TRAILER_DEPTH = 97;
+final float TRAILER_HEIGHT = 33;
+
+final float BASS_WIDTH = 124;
+final float BASS_HEIGHT = 31.5;
+final float BASS_DEPTH = 66;
+final float BASS_X = (TRAILER_WIDTH - BASS_WIDTH) / 2.;
+final float BASS_Z = (TRAILER_DEPTH - BASS_DEPTH) / 2.;
+
+int targetFramerate = 60;
 
 int startMillis, lastMillis;
 GLucose glucose;
@@ -53,6 +63,10 @@ boolean mappingMode = false;
 boolean pandaBoardsEnabled = false;
 
 boolean debugMode = false;
+DebugUI debugUI;
+
+// Camera variables
+float eyeR, eyeA, eyeX, eyeY, eyeZ, midX, midY, midZ;
 
 void setup() {
   startMillis = lastMillis = millis();
@@ -81,15 +95,15 @@ void setup() {
   // Build output driver
   int[][] frontChannels = glucose.mapping.buildFrontChannelList();
   int[][] rearChannels = glucose.mapping.buildRearChannelList();
-  int[][] flippedRGB = glucose.mapping.buildFlippedRGBList();
   mappingTool = new MappingTool(glucose, frontChannels, rearChannels);
-  pandaFront = new PandaDriver(new NetAddress("192.168.1.28", 9001), glucose.model, frontChannels, flippedRGB);
-  pandaRear = new PandaDriver(new NetAddress("192.168.1.29", 9001), glucose.model, rearChannels, flippedRGB);
+  pandaFront = new PandaDriver(new NetAddress("192.168.1.28", 9001), glucose.model, frontChannels);
+  pandaRear = new PandaDriver(new NetAddress("192.168.1.29", 9001), glucose.model, rearChannels);
   logTime("Build PandaDriver");
   
   // Build overlay UI
   ui = controlUI = new ControlUI();
   mappingUI = new MappingUI(mappingTool);
+  debugUI = new DebugUI(frontChannels, rearChannels);
   logTime("Built overlay UI");
     
   // MIDI devices
@@ -98,6 +112,21 @@ void setup() {
   }
   SCMidiDevices.initializeStandardDevices(glucose);
   logTime("Setup MIDI devices");
+    
+  // Setup camera
+  midX = TRAILER_WIDTH/2. + 20;
+  midY = glucose.model.yMax/2;
+  midZ = TRAILER_DEPTH/2.;
+  eyeR = -290;
+  eyeA = .15;
+  eyeY = midY + 20;
+  eyeX = midX + eyeR*sin(eyeA);
+  eyeZ = midZ + eyeR*cos(eyeA);
+  addMouseWheelListener(new java.awt.event.MouseWheelListener() { 
+    public void mouseWheelMoved(java.awt.event.MouseWheelEvent mwe) { 
+      mouseWheel(mwe.getWheelRotation());
+  }}); 
+  
   
   println("Total setup: " + (millis() - startMillis) + "ms");
   println("Hit the 'p' key to toggle Panda Board output");
@@ -128,17 +157,104 @@ void logTime(String evt) {
 }
 
 void draw() {
-  // The glucose engine deals with the core simulation here, we don't need
-  // to do anything specific. This method just needs to exist.
+  // Draws the simulation and the 2D UI overlay
+  background(40);
+  color[] colors = glucose.getColors();
+  if (debugMode) {
+    debugUI.maskColors(colors);
+  }
+
+  camera(
+    eyeX, eyeY, eyeZ,
+    midX, midY, midZ,
+    0, -1, 0
+  );
+
+  noStroke();
+  fill(#141414);
+  drawBox(0, -TRAILER_HEIGHT, 0, 0, 0, 0, TRAILER_WIDTH, TRAILER_HEIGHT, TRAILER_DEPTH, TRAILER_HEIGHT/2.);
+  fill(#070707);
+  stroke(#222222);
+  beginShape();
+  vertex(0, 0, 0);
+  vertex(TRAILER_WIDTH, 0, 0);
+  vertex(TRAILER_WIDTH, 0, TRAILER_DEPTH);
+  vertex(0, 0, TRAILER_DEPTH);
+  endShape();
+  
+  noStroke();
+  fill(#292929);
+  drawBox(BASS_X, 0, BASS_Z, 0, 0, 0, BASS_WIDTH, BASS_HEIGHT, BASS_DEPTH, Cube.CHANNEL_WIDTH);
+  for (Cube c : glucose.model.cubes) {
+    drawCube(c);
+  }
+
+  noFill();
+  strokeWeight(2);
+  beginShape(POINTS);
+  for (Point p : glucose.model.points) {
+    stroke(colors[p.index]);
+    vertex(p.fx, p.fy, p.fz);
+    // println(p.fx + ":" + p.fy + ":" + p.fz);
+  }
+  endShape();
+  
+  // 2D Overlay
+  camera();
+  javax.media.opengl.GL gl = ((PGraphicsOpenGL)g).beginGL();
+  gl.glClear(javax.media.opengl.GL.GL_DEPTH_BUFFER_BIT);
+  ((PGraphicsOpenGL)g).endGL();
+  strokeWeight(1);
+  drawUI();
+  
+  if (debugMode) {
+    debugUI.draw();
+  }
   
   // TODO(mcslee): move into GLucose engine
   if (pandaBoardsEnabled) {
-    color[] colors = glucose.getColors();
     pandaFront.send(colors);
-    pandaRear.send(colors);
+    // pandaRear.send(colors);
   }
 }
 
+void drawCube(Cube c) {
+  float in = .15;
+  drawBox(c.x+in, c.y+in, c.z+in, c.rx, c.ry, c.rz, Cube.EDGE_WIDTH-in*2, Cube.EDGE_HEIGHT-in*2, Cube.EDGE_WIDTH-in*2, Cube.CHANNEL_WIDTH-in);
+}
+
+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 / 180. * PI, -1, 0, 0);
+  rotate(ry / 180. * PI, 0, -1, 0);
+  rotate(rz / 180. * PI, 0, 0, -1);
+  for (int i = 0; i < 4; ++i) {
+    float wid = (i % 2 == 0) ? xd : zd;
+    
+    beginShape();
+    vertex(0, 0);
+    vertex(wid, 0);
+    vertex(wid, yd);
+    vertex(wid - sw, yd);
+    vertex(wid - sw, sw);
+    vertex(0, sw);
+    endShape();
+    beginShape();
+    vertex(0, sw);
+    vertex(0, yd);
+    vertex(wid - sw, yd);
+    vertex(wid - sw, yd - sw);
+    vertex(sw, yd - sw);
+    vertex(sw, sw);
+    endShape();
+
+    translate(wid, 0, 0);
+    rotate(HALF_PI, 0, -1, 0);
+  }
+  popMatrix();
+}
+
 void drawUI() {
   if (uiOn) {
     ui.draw();
@@ -167,6 +283,7 @@ void keyPressed() {
     case 'd':
       debugMode = !debugMode;
       println("Debug output: " + (debugMode ? "ON" : "OFF"));
+      break;
     case 'm':
       mappingMode = !mappingMode;
       if (mappingMode) {
@@ -195,4 +312,44 @@ void keyPressed() {
   }
 }
 
+int mx, my;
+
+void mousePressed() {
+  if (mouseX > ui.leftPos) {
+    ui.mousePressed();
+  } else {
+    if (debugMode) {
+      debugUI.mousePressed();
+    }    
+    mx = mouseX;
+    my = mouseY;
+  }
+}
+
+void mouseDragged() {
+  if (mouseX > ui.leftPos) {
+    ui.mouseDragged();
+  } else {
+    int dx = mouseX - mx;
+    int dy = mouseY - my;
+    mx = mouseX;
+    my = mouseY;
+    eyeA += dx*.003;
+    eyeX = midX + eyeR*sin(eyeA);
+    eyeZ = midZ + eyeR*cos(eyeA);
+    eyeY += dy;
+  }
+}
+
+void mouseReleased() {
+  if (mouseX > ui.leftPos) {
+    ui.mouseReleased();
+  }
+}
+ 
+void mouseWheel(int delta) {
+  eyeR = constrain(eyeR - delta, -500, -80);
+  eyeX = midX + eyeR*sin(eyeA);
+  eyeZ = midZ + eyeR*cos(eyeA);
+}