X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_PandaDriver.pde;h=ef86dbe71714473e20375ca7f42df31c26a55451;hb=9b893d9614672cc7ec0e9ed8e9e67388737a3c17;hp=d90613e9de483b4c04ab8cebd5641edd87919f20;hpb=45f43cc2debb7f90b01e7a5c7d355218ab9cdeed;p=SugarCubes.git

diff --git a/_PandaDriver.pde b/_PandaDriver.pde
index d90613e..ef86dbe 100644
--- a/_PandaDriver.pde
+++ b/_PandaDriver.pde
@@ -30,61 +30,73 @@ public class PandaDriver {
 
   // List of point indices on the board
   private final int[] points;
-  
-  // How many channels are on the panda board
-  private final static int CHANNELS_PER_BOARD = 8;
-  
-  // How many cubes per channel xc_PB is configured for
-  private final static int CUBES_PER_CHANNEL = 4;
-
+    
   // Packet data
   private final byte[] packet = new byte[4*352]; // TODO: de-magic-number, UDP related?
 
-  public PandaDriver(String ip, Model model, int[][] channelList) {
+  public PandaDriver(String ip) {
     this.ip = ip;
     this.address = new NetAddress(ip, 9001);
     message = new OscMessage("/shady/pointbuffer");
-    List<Integer> pointList = buildMappedList(model, channelList);
-    points = new int[pointList.size()];
-    int i = 0;
-    for (int value : pointList) {
-      points[i++] = value;
+    points = new int[PandaMapping.PIXELS_PER_BOARD];
+    for (int i = 0; i < points.length; ++i) {
+      points[i] = 0;
+    }
+  }
+
+  public PandaDriver(String ip, int[] pointList) {
+    this(ip);
+    for (int i = 0; i < pointList.length && i < points.length; ++i) {
+      this.points[i] = pointList[i];
     }
   }
+
+  public PandaDriver(String ip, Model model, PandaMapping pm) {
+    this(ip);
+    buildPointList(model, pm);
+  }
   
   public void toggle() {
     enabled = !enabled;
-    println("PandaBoard Output/" + ip + ": " + (enabled ? "ON" : "OFF"));    
+    println("PandaBoard/" + ip + ": " + (enabled ? "ON" : "OFF"));    
   } 
 
-  private ArrayList<Integer> buildMappedList(Model model, int[][] channelList) {
-    ArrayList<Integer> points = new ArrayList<Integer>();
-    for (int chi = 0; chi < CHANNELS_PER_BOARD; ++chi) {
-      int[] channel = (chi < channelList.length) ? channelList[chi] : new int[]{};
-      for (int ci = 0; ci < CUBES_PER_CHANNEL; ++ci) {
-        int cubeNumber = (ci < channel.length) ? channel[ci] : 0;
-        if (cubeNumber == 0) {
+  private void buildPointList(Model model, PandaMapping pm) {
+    final int[][] stripOrderings = new int[][] {
+      {  2,  1,  0,  3, 13, 12, 15, 14,  4,  7,  6,  5, 11, 10,  9,  8 }, // FRONT_LEFT
+      {  6,  5,  4,  7,  1,  0,  3,  2,  8, 11, 10,  9, 15, 14, 13, 12 }, // FRONT_RIGHT
+      { 14, 13, 12, 15,  9,  8, 11, 10,  0,  3,  2,  1,  7,  6,  5,  4 }, // REAR_LEFT
+      { 10,  9,  8, 11,  5,  4,  7,  6, 12, 15, 14, 13,  3,  2,  1,  0 }, // REAR_RIGHT
+    };
+
+    int pi = 0;
+    for (int[] channel : pm.channelList) {
+      for (int cubeNumber : channel) {
+        if (cubeNumber <= 0) {
           for (int i = 0; i < Cube.POINTS_PER_CUBE; ++i) {
-            points.add(0);
+            points[pi++] = 0;
           }
         } else {
           Cube cube = model.getCubeByRawIndex(cubeNumber);
           if (cube == null) {
             throw new RuntimeException("Non-zero, non-existing cube specified in channel mapping (" + cubeNumber + ")");
           }
-          final int[] stripOrder = new int[] {
-            2, 1, 0, 3, 13, 12, 15, 14, 4, 7, 6, 5, 11, 10, 9, 8
-          };
-          for (int stripIndex : stripOrder) {
+          int stripOrderIndex = 0;
+          switch (cube.wiring) {
+            case FRONT_LEFT: stripOrderIndex = 0; break;
+            case FRONT_RIGHT: stripOrderIndex = 1; break;
+            case REAR_LEFT: stripOrderIndex = 2; break;
+            case REAR_RIGHT: stripOrderIndex = 3; break;
+          }
+          for (int stripIndex : stripOrderings[stripOrderIndex]) {
             Strip s = cube.strips.get(stripIndex);
             for (int j = s.points.size() - 1; j >= 0; --j) {
-              points.add(s.points.get(j).index);
+              points[pi++] = s.points.get(j).index;
             }
           }
         }
       }
     }
-    return points;
   }
 
   public final void send(int[] colors) {