Merge branch 'processing-2'

[SugarCubes.git] / Internals.pde

diff --git a/_Internals.pde b/Internals.pde
similarity index 99%
rename from _Internals.pde
rename to Internals.pde
index b593f3ef07b9c4aa7db088430348d3da9c653ae7..31f8ffcb4b90c27c750f3c59ff5efed0350b00f2 100644 (file)
--- a/_Internals.pde
+++ b/Internals.pde
@@ -134,7 +134,6 @@ void setup() {
   size(VIEWPORT_WIDTH, VIEWPORT_HEIGHT, OPENGL);
   frameRate(targetFramerate);
   noSmooth();
-  // hint(ENABLE_OPENGL_4X_SMOOTH); // no discernable improvement?
   logTime("Created viewport");
 
   // Create the model
@@ -224,6 +223,9 @@ void setup() {
       
   println("Total setup: " + (millis() - startMillis) + "ms");
   println("Hit the 'o' key to toggle live output");
+  
+  lx.engine.framesPerSecond.setValue(120);
+  lx.engine.setThreaded(true);
 }
 
 public SCPattern getPattern() {
@@ -360,7 +362,7 @@ void drawDiagnostics(long drawNanos, long simulationNanos, long uiNanos, long ga
   noStroke();
   int xp = x;
   float hv = 0;
-  for (long val : new long[] {lx.timer.drawNanos, simulationNanos, uiNanos, gammaNanos, lx.timer.outputNanos }) {
+  for (long val : new long[] {lx.timer.drawNanos, simulationNanos, uiNanos, gammaNanos, lx.engine.timer.outputNanos }) {
     fill(lx.hsb(hv % 360, 100, 80));
     rect(xp, y, val * ws, h-1);
     hv += 140;