X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_PandaDriver.pde;h=e62cfff7b98ca5529282197698346d7e7275a6e7;hb=54521a391e9fac72b19c35ed1f20e055c79f2bb1;hp=5e4776455e23f11f52a02c955e577c0ee1855d60;hpb=79ae8245d084fe7901933b22a44b404f9d68b925;p=SugarCubes.git

diff --git a/_PandaDriver.pde b/_PandaDriver.pde
index 5e47764..e62cfff 100644
--- a/_PandaDriver.pde
+++ b/_PandaDriver.pde
@@ -30,42 +30,44 @@ 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/" + ip + " Output: " + (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) {
+    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);
@@ -78,13 +80,12 @@ public class PandaDriver {
           for (int stripIndex : stripOrder) {
             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) {