sinesphere working with notes

[SugarCubes.git] / _Internals.pde

diff --git a/_Internals.pde b/_Internals.pde
index 47166220ca84ae722f3392f707575a2a42377e85..fb2a9c7a7167867f7b6d9927320e97b67b839701 100644 (file)
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -40,8 +40,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;
@@ -299,16 +299,32 @@ 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) {