fabric

[SugarCubes.git] / _Internals.pde

diff --git a/_Internals.pde b/_Internals.pde
index 7936724ce327b594270fae946e26a24f6c082b9b..dab8bdd920a665e768cceda90fda4dc681d72be6 100644 (file)
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -53,10 +53,10 @@ boolean mappingMode = false;
 boolean pandaBoardsEnabled = false;
 
 boolean debugMode = false;
+DebugUI debugUI;
 
 // Camera variables
-final float eyeR = -270;
-float eyeA, eyeX, eyeY, eyeZ, midX, midY, midZ;
+float eyeR, eyeA, eyeX, eyeY, eyeZ, midX, midY, midZ;
 
 void setup() {
   startMillis = lastMillis = millis();
@@ -94,6 +94,7 @@ void setup() {
   // Build overlay UI
   ui = controlUI = new ControlUI();
   mappingUI = new MappingUI(mappingTool);
+  debugUI = new DebugUI(frontChannels, rearChannels);
   logTime("Built overlay UI");
     
   // MIDI devices
@@ -102,15 +103,21 @@ void setup() {
   }
   SCMidiDevices.initializeStandardDevices(glucose);
   logTime("Setup MIDI devices");
-  
+    
   // Setup camera
   midX = glucose.model.xMax/2 + 20;
   midY = glucose.model.yMax/2;
   midZ = glucose.model.zMax/2;
+  eyeR = -270;
   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");
@@ -144,6 +151,10 @@ void draw() {
   // 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,
@@ -176,6 +187,10 @@ void draw() {
   strokeWeight(1);
   drawUI();
   
+  if (debugMode) {
+    debugUI.draw();
+  }
+    
   // TODO(mcslee): move into GLucose engine
   if (pandaBoardsEnabled) {
     pandaFront.send(colors);
@@ -211,6 +226,7 @@ void keyPressed() {
     case 'd':
       debugMode = !debugMode;
       println("Debug output: " + (debugMode ? "ON" : "OFF"));
+      break;
     case 'm':
       mappingMode = !mappingMode;
       if (mappingMode) {
@@ -245,6 +261,9 @@ void mousePressed() {
   if (mouseX > ui.leftPos) {
     ui.mousePressed();
   } else {
+    if (debugMode) {
+      debugUI.mousePressed();
+    }    
     mx = mouseX;
     my = mouseY;
   }
@@ -270,4 +289,10 @@ void mouseReleased() {
     ui.mouseReleased();
   }
 }
+ 
+void mouseWheel(int delta) {
+  eyeR = constrain(eyeR - delta, -500, -80);
+  eyeX = midX + eyeR*sin(eyeA);
+  eyeZ = midZ + eyeR*cos(eyeA);
+}