From: Mark Slee <mcslee@Mark-Slees-MacBook-Pro.local>
Date: Mon, 14 Oct 2013 05:20:07 +0000 (-0700)
Subject: Update TestPerformance to use all methods of getting geometry
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=f38a60491e5a42404497d2d56517c27f4df5d6e6;p=SugarCubes.git

Update TestPerformance to use all methods of getting geometry
---

diff --git a/TestPatterns.pde b/TestPatterns.pde
index 3f8f8e1..1c2ea70 100644
--- a/TestPatterns.pde
+++ b/TestPatterns.pde
@@ -96,29 +96,42 @@ class TestPerformancePattern extends TestPattern {
   }
   
   public void run(double deltaMs) {
-    if (iter.getValuef() > 0.5) {
-       for (int i = 0; i < colors.length; ++i) {
-         float x = 1;
-         for (int j = 0; j < ops.getValuef() * 30; ++j) {
-           x *= random(0, 1);
-         }
-         colors[i] = lx.hsb(
-           (lx.getBaseHuef() + model.px[i]*.2 + model.py[i]*.4) % 360,
-           100,
-           100
-         );
-       }
-    } else {
+    float x = 1;
+    for (int j = 0; j < ops.getValuef() * 400000; ++j) {
+      x *= random(0, 1);
+    }
+
+    if (iter.getValuef() < 0.25) {
       for (Point p : model.points) {
-        float x = 1;
-        for (int j = 0; j < ops.getValuef() * 30; ++j) {
-          x *= random(0, 1);
-        }
         colors[p.index] = lx.hsb(
-           (lx.getBaseHuef() + p.x*.2 + p.y*.4) % 360,
-           100,
-           100
-         );
+          (p.x*.1 + p.y*.1) % 360,
+          100,
+          100
+        );
+      }
+    } else if (iter.getValuef() < 0.5) {
+      for (int i = 0; i < colors.length; ++i) {
+        colors[i] = lx.hsb(
+          (90 + model.px[i]*.1 + model.py[i]*.1) % 360,
+          100,
+          100
+        );
+      }
+    } else if (iter.getValuef() < 0.75) {
+      for (int i = 0; i < colors.length; ++i) {
+        colors[i] = lx.hsb(
+          (180 + model.p[3*i]*.1 + model.p[3*i+1]*.1) % 360,
+          100,
+          100
+        );
+      }
+    } else {
+      for (int i = 0; i < colors.length; ++i) {
+        colors[i] = lx.hsb(
+          (270 + model.x(i)*.1 + model.y(i)*.1) % 360,
+          100,
+          100
+        );
       }
     }
   }
diff --git a/code/GLucose.jar b/code/GLucose.jar
index aceb246..326cb38 100755
Binary files a/code/GLucose.jar and b/code/GLucose.jar differ