X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=TestPatterns.pde;h=52e8ea45f72a2929cf371b55ef38be3834b0df4e;hb=045b432d2b2bb8accd36080f3e501be60ff32782;hp=c4432ab0baa1d7cc976b5fcddecfcb43cce67529;hpb=749eb72c6abd63e1f1d1253646e52b3c08954fd4;p=SugarCubes.git

diff --git a/TestPatterns.pde b/TestPatterns.pde
index c4432ab..52e8ea4 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);
@@ -179,30 +178,37 @@ class MappingTool extends SCPattern {
   public boolean channelModeGreen = false;
   public boolean channelModeBlue = false;
   
-  private final static int NUM_CHANNELS = 16;
+  private final int numChannels;
   
-  private final int[][] frontChannels;
-  private final int[][] rearChannels;
-  private int[] activeChannels;
+  private final PandaMapping[] pandaMappings;
+  private PandaMapping activeMapping;
+  private int mappingChannelIndex;
   
-  MappingTool(GLucose glucose, int[][]frontChannels, int[][]rearChannels) {
+  MappingTool(GLucose glucose, PandaMapping[] pandaMappings) {
     super(glucose);
-    this.frontChannels = frontChannels;
-    this.rearChannels = rearChannels;
+    this.pandaMappings = pandaMappings;
+    int totalChannels = 0;
+    for (PandaMapping pm : pandaMappings) {
+       totalChannels += pm.channelList.length;
+    }
+    numChannels = totalChannels;
     setChannel();
   }
   
   private void setChannel() {
-    if (channelIndex < frontChannels.length) {
-      activeChannels = frontChannels[channelIndex];
-    } else {
-      activeChannels = rearChannels[channelIndex - frontChannels.length];
+    mappingChannelIndex = channelIndex;
+    for (PandaMapping pm : pandaMappings) {
+      if (mappingChannelIndex < pm.channelList.length) {
+        activeMapping = pm;
+        break;
+      }
+      mappingChannelIndex -= pm.channelList.length;
     }
   }
   
   private int cubeInChannel(Cube c) {
     int i = 1;
-    for (int index : activeChannels) {
+    for (int index : activeMapping.channelList[mappingChannelIndex]) {
       if (c == model.getCubeByRawIndex(index)) {
         return i;
       }
@@ -222,7 +228,7 @@ class MappingTool extends SCPattern {
   }
   
   public void strip(int delta) {
-    int len = Cube.FACES_PER_CUBE * Face.STRIPS_PER_FACE;
+    int len = Cube.STRIPS_PER_CUBE;
     stripIndex = (len + stripIndex + delta) % len;
     printInfo();
   }
@@ -300,14 +306,14 @@ class MappingTool extends SCPattern {
   }
 
   public void incChannel() {
-    channelIndex = (channelIndex + 1) % NUM_CHANNELS;
+    channelIndex = (channelIndex + 1) % numChannels;
     setChannel();
   }
   
   public void decChannel() {
     --channelIndex;
     if (channelIndex < 0) {
-      channelIndex += NUM_CHANNELS;
+      channelIndex += numChannels;
     }
     setChannel();    
   }