Use helpers from new GLucose for points per cube

diff --git a/TestPatterns.pde b/TestPatterns.pde
index c4432ab0baa1d7cc976b5fcddecfcb43cce67529..acc50c7e33ef52eb3972a93d3d38a068d01e8658 100644 (file)
--- a/TestPatterns.pde
+++ b/TestPatterns.pde
@@ -136,8 +136,7 @@ class TestProjectionPattern extends SCPattern {
 
 class TestCubePattern extends SCPattern {
   
-  private int POINTS_PER_CUBE = Cube.FACES_PER_CUBE * Face.STRIPS_PER_FACE * Strip.POINTS_PER_STRIP;
-  private SawLFO index = new SawLFO(0, POINTS_PER_CUBE, POINTS_PER_CUBE*60);
+  private SawLFO index = new SawLFO(0, Cube.POINTS_PER_CUBE, Cube.POINTS_PER_CUBE*60);
   
   TestCubePattern(GLucose glucose) {
     super(glucose);

diff --git a/_PandaDriver.pde b/_PandaDriver.pde
index 5e37ccb6528612bce0d90b560e041a20825bab5a..2350928e8c2f8fd78029a50a6a079d4eb80bbe8a 100644 (file)
--- a/_PandaDriver.pde
+++ b/_PandaDriver.pde
@@ -52,7 +52,7 @@ public class PandaDriver {
       for (int ci = 0; ci < CUBES_PER_CHANNEL; ++ci) {
         int cubeNumber = (ci < channel.length) ? channel[ci] : 0;
         if (cubeNumber == 0) {
-          for (int i = 0; i < (Cube.FACES_PER_CUBE*Face.STRIPS_PER_FACE*Strip.POINTS_PER_STRIP); ++i) {
+          for (int i = 0; i < Cube.POINTS_PER_CUBE; ++i) {
             points.add(0);
           }
         } else {

diff --git a/code/GLucose.jar b/code/GLucose.jar
index 171f7eaefe93851a1c49fceac20cdb9edeffdefd..346b56f1913f358c9d95f6a933d6f02a15ced394 100644 (file)
Binary files a/code/GLucose.jar and b/code/GLucose.jar differ