X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_PandaDriver.pde;h=2c8b96c43653502ed1632cee9a6e73a1989cef7c;hb=a7c8d80aea0abed745934ffcc723b7a7f542d6d0;hp=cd85e9b05e9738d051492aef097ec123dae857a3;hpb=29674806c55d6280e15e3b92eb40266685a414b7;p=SugarCubes.git

diff --git a/_PandaDriver.pde b/_PandaDriver.pde
index cd85e9b..2c8b96c 100644
--- a/_PandaDriver.pde
+++ b/_PandaDriver.pde
@@ -1,6 +1,11 @@
 import netP5.*;
 import oscP5.*;
 
+//import hypermedia.net.*;
+
+
+
+
 /**
  *     DOUBLE BLACK DIAMOND        DOUBLE BLACK DIAMOND
  *
@@ -14,7 +19,23 @@ import oscP5.*;
  * This class implements the output function to the Panda Boards. It
  * will be moved into GLucose once stabilized.
  */
-public static class PandaDriver {
+public static class PandaDriver extends Thread{
+  int lastSeen;
+  void start(){super.start();}
+  void run(){
+    while(true){
+      if(queue.size()>0) {
+        for(int i=0; i<queue.size(); i++){
+          this.sendNow(queue.get(queue.size()-1));
+          queue.clear();
+        }
+      } else {
+        try{sleep(1);} catch(Exception e){}
+      }
+    }
+  }
+
+  //UDP udp;  // define the UDP object
 
   // IP address
   public final String ip;
@@ -39,20 +60,57 @@ public static class PandaDriver {
   public PandaDriver(String ip) {
     this.ip = ip;
     
+    //udp = new UDP(this, 10000);
+    
     // Initialize our OSC output stuff
     address = new NetAddress(ip, 9001);
     message = new OscMessage("/shady/pointbuffer");
-
+    
     // Build the array of points, initialize all to nothing
     points = new int[PandaMapping.PIXELS_PER_BOARD];
     for (int i = 0; i < points.length; ++i) {
       points[i] = NO_POINT;
     }
+    this.start();
   }
 
   private final static int FORWARD = -1;
   private final static int BACKWARD = -2;
 
+  ////////////////////////////////////////////////////////////////
+  //
+  // READ THIS RIGHT NOW BEFORE YOU MODIFY THE BELOW!!!!!!!!!!!!!
+  // READ THIS RIGHT NOW BEFORE YOU MODIFY THE BELOW!!!!!!!!!!!!!
+  // READ THIS RIGHT NOW BEFORE YOU MODIFY THE BELOW!!!!!!!!!!!!!
+  //
+  // The mappings below indicate the physical order of strips
+  // connected to a pandaboard channel. The strip numbers are a
+  // reflection of how the model is built.
+  //
+  // For ANYTHING in the model which is a rectangular prism,
+  // which means Cubes, the BassBox, and each Speaker, the
+  // strips are numbered incrementally by face. The first
+  // face is always the FRONT, which you are looking at.
+  // The next face is the RIGHT, then the BACK, then the LEFT.
+  //
+  // For every face, the strips are ordered numerically moving
+  // clockwise from the the TOP LEFT.
+  //
+  // So, for a cube:
+  //
+  //  Strip 0: front face, top strip, left to right
+  //  Strip 1: front face, right strip, top to bottom
+  //  Strip 2: front face, bottom strip, right to left
+  //  Strip 3: front face, left strip, bottom to top
+  //
+  //  Strip 4: right face, top strip, left to right
+  //  ... and so on
+  //  Strip 14: left face, bottom strip, right to left
+  //  Strip 15: left face, left strip, bottom to top
+  //
+  ////////////////////////////////////////////////////////////////
+  
+
   /**
    * These constant arrays indicate the order in which the strips of a cube
    * are wired. There are four different options, depending on which bottom
@@ -66,59 +124,81 @@ public static class PandaDriver {
   };
   
   private final static int[][] BASS_STRIP_ORDERING = {
-    {0, FORWARD },
-    {1, FORWARD },
-    {2, FORWARD },
-    {3, FORWARD },
-    {4, FORWARD },
-    {5, FORWARD },
-    {6, FORWARD },
-    {7, FORWARD },
-    {8, FORWARD },
-    {9, FORWARD },
-    {10, FORWARD },
-    {11, FORWARD },
-    {12, FORWARD },
-    {13, FORWARD },
-    {14, FORWARD },
-    {15, FORWARD },
-    {16, FORWARD },
-    {17, FORWARD },
-    {18, FORWARD },
-    {19, FORWARD },
-    {20, FORWARD },
-    {21, FORWARD },
-    {22, FORWARD },            
+    // front face, counterclockwise from bottom front left
+    {2, BACKWARD /* if this strip has extra pixels, you can add them here */ /*, 4 */ }, 
+    {1, BACKWARD /* if this strip is short some pixels, substract them here */ /*, -3 */ },
+    {0, BACKWARD },
+    {3, BACKWARD },
+    
+    // left face, counterclockwise from bottom front left
+    {13, BACKWARD },
+    {12, BACKWARD },
+    {15, BACKWARD },
+    {14, BACKWARD },
+
+    // back face, counterclockwise from bottom rear left
+    {9, BACKWARD },
+    {8, BACKWARD },
+    {11, BACKWARD },
+    {10, BACKWARD },
+
+    // right face, counterclockwise from bottom rear right
+    {5, BACKWARD },
+    {4, BACKWARD },
+    {7, BACKWARD },
+    {6, BACKWARD },
+  };
+
+  private final static int[][] STRUT_STRIP_ORDERING = {
+    {6, BACKWARD},
+    {5, FORWARD},
+    {4, BACKWARD},
+    {3, FORWARD},
+    {2, BACKWARD},
+    {1, FORWARD},
+    {0, BACKWARD},
+    {7, FORWARD},    
   };
   
   private final static int[][] FLOOR_STRIP_ORDERING = {
     {0, FORWARD},
     {1, FORWARD},
     {2, FORWARD},
-    {3, FORWARD},
+    {3, BACKWARD},
   };
   
-  private final static int[][] SPEAKER_STRIP_ORDERING = {
-    {0, FORWARD },
-    {1, FORWARD },
-    {2, FORWARD },
-    {3, FORWARD },
-    {4, FORWARD },
-    {5, FORWARD },
-    {6, FORWARD },
-    {7, FORWARD },
-    {8, FORWARD },
-    {9, FORWARD },
-    {10, FORWARD },
-    {11, FORWARD },
-    {12, FORWARD },
-    {13, FORWARD },
-    {14, FORWARD },
-    {15, FORWARD },
+  // The speakers are currently configured to be wired the same
+  // as cubes with Wiring.FRONT_LEFT. If this needs to be changed,
+  // remove this null assignment and change the below to have mappings
+  // for the LEFT and RIGHT speaker
+  private final static int[][][] SPEAKER_STRIP_ORDERING = null; /* {
+    // Left speaker
+    { 
+      // Front face, counter-clockwise from bottom left
+      {2, BACKWARD },
+      {1, BACKWARD },
+      {0, BACKWARD },
+      {3, BACKWARD },
+    },
+    // Right speaker
+    {
+      // Front face, counter-clockwise from bottom left
+      {2, BACKWARD },
+      {1, BACKWARD },
+      {0, BACKWARD },
+      {3, BACKWARD },
+    }
+  };*/
+  
+  private final static int[][] LEFT_SPEAKER_STRIP_ORDERING = {
   };
+
+  ArrayList<int[]> queue;
   
   public PandaDriver(String ip, Model model, PandaMapping pm) {
     this(ip);
+    
+    queue = new ArrayList<int[]>();
 
     // Ok, we are initialized, time to build the array if points in order to
     // send out. We start at the head of our point buffer, and work our way
@@ -163,19 +243,37 @@ public static class PandaDriver {
         case ChannelMapping.MODE_BASS:
           for (int[] config : BASS_STRIP_ORDERING) {
             pi = mapStrip(model.bassBox.strips.get(config[0]), config[1], points, pi);
+            if (config.length >= 3) pi += config[2];            
           }
           break;
           
-        case ChannelMapping.MODE_FLOOR:
+        case ChannelMapping.MODE_STRUTS_AND_FLOOR:
+          for (int[] config : STRUT_STRIP_ORDERING) {
+            pi = mapStrip(model.bassBox.struts.get(config[0]), config[1], points, pi);
+            if (config.length >= 3) pi += config[2];
+          }     
           for (int[] config : FLOOR_STRIP_ORDERING) {
             pi = mapStrip(model.boothFloor.strips.get(config[0]), config[1], points, pi);
+            if (config.length >= 3) pi += config[2];
           }
           break;
           
         case ChannelMapping.MODE_SPEAKER:
-          for (int[] config : SPEAKER_STRIP_ORDERING) {
+          int [][] speakerStripOrdering;
+          if (SPEAKER_STRIP_ORDERING == null) {
+            // Copy the cube strip ordering
+            int[] frontLeftCubeWiring = CUBE_STRIP_ORDERINGS[0];
+            speakerStripOrdering = new int[frontLeftCubeWiring.length][];
+            for (int i = 0; i < frontLeftCubeWiring.length; ++i) {
+              speakerStripOrdering[i] = new int[] { frontLeftCubeWiring[0], BACKWARD }; 
+            }
+          } else {
+            speakerStripOrdering = SPEAKER_STRIP_ORDERING[channel.objectIndices[0]];
+          }
+          for (int[] config : speakerStripOrdering) {
             Speaker speaker = model.speakers.get(channel.objectIndices[0]);
             pi = mapStrip(speaker.strips.get(config[0]), config[1], points, pi);
+            if (config.length >= 3) pi += config[2];            
           }
           break;
           
@@ -205,19 +303,38 @@ public static class PandaDriver {
     return pi;
   }
 
+  public void disable() {
+    if (enabled) {
+      enabled = false;
+      println("PandaBoard/" + ip + ": OFF");
+    }
+  }
+  
+  public void enable() {
+    if (!enabled) {
+      enabled = true;
+      println("PandaBoard/" + ip + ": ON");
+    }
+  }
+
   public void toggle() {
     enabled = !enabled;
     println("PandaBoard/" + ip + ": " + (enabled ? "ON" : "OFF"));    
   }
 
   public final void send(int[] colors) {
-    if (!enabled) {
+     queue.add(colors);
+  }
+  public final void sendNow(int[] colors) {
+    if (!enabled || colors==null) {
       return;
     }
     int len = 0;
     int packetNum = 0;
-    for (int index : points) {
-      int c = (index < 0) ? 0 : colors[index];
+    if(points==null) { return; }
+    for (int index: points) {
+      int c = 0;
+      if(index>0) { c= colors[index]; }
       byte r = (byte) ((c >> 16) & 0xFF);
       byte g = (byte) ((c >> 8) & 0xFF);
       byte b = (byte) ((c) & 0xFF);
@@ -239,16 +356,17 @@ public static class PandaDriver {
     }
   }
   
+
   private void sendPacket(int packetNum) {
     message.clearArguments();
     message.add(packetNum);
     message.add(packet.length);
     message.add(packet);
     try {
+      //udp.send(packet, "10.200.1.29", 9001);
       OscP5.flush(message, address);
     } catch (Exception x) {
       x.printStackTrace();
     }
   }
 }
-