From cdb88d5d665ad144719ed382d345be43750af88e Mon Sep 17 00:00:00 2001 From: Mark Slee Date: Sat, 10 Aug 2013 17:39:32 -0700 Subject: [PATCH] Use helpers from new GLucose for points per cube --- TestPatterns.pde | 3 +-- _PandaDriver.pde | 2 +- code/GLucose.jar | Bin 18509 -> 18794 bytes 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/TestPatterns.pde b/TestPatterns.pde index c4432ab..acc50c7 100644 --- 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 5e37ccb..2350928 100644 --- 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 GIT binary patch delta 3906 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