More optimization to unnecessary blending

diff --git a/MarkSlee.pde b/MarkSlee.pde
index 88759da00d83ef8f123dbf445eb8d8f79bfe9926..4a3720640f88985bb871d76cdede3329204d7e71 100644 (file)
--- a/MarkSlee.pde
+++ b/MarkSlee.pde
@@ -1426,7 +1426,11 @@ class ColorFuckerEffect extends SCEffect {
         }
         if (fSharp > 0) {
           fSharp = 1/(1-fSharp);
-          hsb[2] = hsb[2] < .5 ? pow(hsb[2],fSharp) : 1-pow(1-hsb[2],fSharp);
+          if (hsb[2] < .5) {
+            hsb[2] = pow(hsb[2],fSharp);
+          } else {
+            hsb[2] = 1-pow(1-hsb[2],fSharp);
+          }
         }
         if (fSoft > 0) {
           if (hsb[2] > 0.5) {

diff --git a/_Internals.pde b/_Internals.pde
index 47166220ca84ae722f3392f707575a2a42377e85..728e34387ae8250151ab71cbae29e72f259ab950 100644 (file)
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -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) {

diff --git a/code/HeronLX.jar b/code/HeronLX.jar
index 04fa7fda66c57a3ddc8c02c282a4b73476e908a2..396a41ea97f45f63a09ad57052b6339d30f9d103 100755 (executable)
Binary files a/code/HeronLX.jar and b/code/HeronLX.jar differ