X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_Internals.pde;h=61c453e34d88eaa31273e754b30f5224431ccd94;hb=570ba27d94c8a2b0a3303a583a3d819c1d73b649;hp=47166220ca84ae722f3392f707575a2a42377e85;hpb=ef7118ad30ec90ed1a3e6d3f5d9fdb0a21a03fe9;p=SugarCubes.git

diff --git a/_Internals.pde b/_Internals.pde
index 4716622..61c453e 100644
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -14,17 +14,13 @@
  */
 
 import glucose.*;
-import glucose.control.*;
-import glucose.effect.*;
 import glucose.model.*;
-import glucose.pattern.*;
-import glucose.transform.*;
-import glucose.transition.*;
 import heronarts.lx.*;
-import heronarts.lx.control.*;
 import heronarts.lx.effect.*;
 import heronarts.lx.modulator.*;
+import heronarts.lx.parameter.*;
 import heronarts.lx.pattern.*;
+import heronarts.lx.transform.*;
 import heronarts.lx.transition.*;
 import ddf.minim.*;
 import ddf.minim.analysis.*;
@@ -40,8 +36,8 @@ final float TRAILER_WIDTH = 240;
 final float TRAILER_DEPTH = 97;
 final float TRAILER_HEIGHT = 33;
 
-final int MaxCubeHeight = 5;
-final int NumBackTowers = 11;
+final int MaxCubeHeight = 7;
+final int NumBackTowers = 18;
 
 int targetFramerate = 60;
 int startMillis, lastMillis;
@@ -140,7 +136,7 @@ void setup() {
   lx = glucose.lx;
   lx.enableKeyboardTempo();
   logTime("Built GLucose engine");
-  
+    
   // Set the patterns
   LXEngine engine = lx.engine;
   engine.setPatterns(patterns = _leftPatterns(glucose));
@@ -299,20 +295,36 @@ void drawDiagnostics(long drawNanos, long simulationNanos, long uiNanos, long ga
   noFill();
   stroke(#999999);
   rect(x, y, tw, h);
+  h = 5;
   noStroke();
   for (long val : new long[] {
     lx.engine.timer.deckNanos,
+    lx.engine.timer.copyNanos,
     lx.engine.timer.fxNanos}) {
     float amt = val / (float) lx.timer.drawNanos;
     fill(lx.hsb(hv % 360, 100, 80));
     rect(xp, y, amt * tw, h-1);
     hv += 140;
     xp += amt * tw;
-  }  
+  }
+  
+  xp = x;
+  y += h;
+  hv = 120;
+  for (long val : new long[] {
+    lx.engine.getDeck(0).timer.runNanos,
+    lx.engine.getDeck(1).timer.runNanos,
+    lx.engine.getDeck(1).getFaderTransition().timer.blendNanos}) {
+    float amt = val / (float) lx.timer.drawNanos;
+    fill(lx.hsb(hv % 360, 100, 80));
+    rect(xp, y, amt * tw, h-1);
+    hv += 140;
+    xp += amt * tw;
+  }
 }
 
 void drawSimulation(color[] simulationColors) {
-    camera(
+  camera(
     eyeX, eyeY, eyeZ,
     midX, midY, midZ,
     0, -1, 0
@@ -354,7 +366,7 @@ void drawSimulation(color[] simulationColors) {
   noFill();
   strokeWeight(2);
   beginShape(POINTS);
-  for (Point p : glucose.model.points) {
+  for (LXPoint p : glucose.model.points) {
     stroke(simulationColors[p.index]);
     vertex(p.x, p.y, p.z);
   }