X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_Mappings.pde;h=7335b8647544035fe12403ff7a6d9403fca2af2c;hb=31b2d04277074b68d9933e11d1f361702454890b;hp=5bcdb739bba8a3b6000af7bf7845d83834e968ce;hpb=882e2e3ed34fe7867ca849b2be18cbf148b6f5b2;p=SugarCubes.git

diff --git a/_Mappings.pde b/_Mappings.pde
index 5bcdb73..7335b86 100644
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@ -13,6 +13,7 @@
  * when physical changes or tuning is being done to the structure.
  */
 
+<<<<<<< HEAD
 final int MaxCubeHeight = 6;
 final int NumBackTowers = 16;
 
@@ -77,17 +78,17 @@ public Model buildModel() {
   // dan's proposed lattice
         ArrayList<StaggeredTower> scubes = new ArrayList<StaggeredTower>();
         //if (NumBackTowers != 25) exit();
-          // for (int i=0; i<NumBackTowers/2; i++) scubes.add(new StaggeredTower(
-          //           (i+1)*CW,                                                                 // x
-          //           (i % 2 == 0) ? 0 : CH * 2./3.                ,   // y
-          //          - ((i % 2 == 0) ? 11 : 0) + 80          ,   // z
-          //          -45, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight) );         // num cubes
+        for (int i=0; i<NumBackTowers/2; i++) scubes.add(new StaggeredTower(
+                  (i+1)*CW,                                                                 // x
+                  (i % 2 == 0) ? 0 : CH * 2./3.                ,   // y
+                 - ((i % 2 == 0) ? 11 : 0) + 80          ,   // z
+                 -45, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight) );         // num cubes
         
-       // for (int i=0; i<NumBackTowers/2; i++) scubes.add(new StaggeredTower(
-       //           (i+1)*CW,                                                                 // x
-       //           (i % 2 == 0) ? 0 : CH * 2./3.                ,   // y
-       //          - ((i % 2 == 0) ? 0 : 11) + 80 - pow(CH*CH + CW*CW, .5),   // z
-       //          225, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight-1) ); 
+       for (int i=0; i<NumBackTowers/2; i++) scubes.add(new StaggeredTower(
+                 (i+1)*CW,                                                                 // x
+                 (i % 2 == 0) ? 0 : CH * 2./3.                ,   // y
+                - ((i % 2 == 0) ? 0 : 11) + 80 - pow(CH*CH + CW*CW, .5),   // z
+                225, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight-1) ); 
 
       // for (int i=0; i<2 ; i++) scubes.add(new StaggeredTower(
       //             (i+1)*CW,                                                                 // x
@@ -101,101 +102,83 @@ public Model buildModel() {
         //                          dcubes.add(new Cube(-6+CW*4/3*i+CW*2/3., CH*.5, 0, 0, 0, 0, WRR));        
         // }
 
-float[] pos = new float[3];
-pos[0] = 50;
-pos[2] = 100;
-scubes.add(new StaggeredTower(//tower 1
-      pos[0],               // x
-       0   ,   // y
-       pos[2], // z
-     0, 4, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
-
-
-pos[0] += 25;
-pos[2] -= 10;
-scubes.add(new StaggeredTower(// tower 2
-      pos[0],               // x
-       15  ,   // y
-       pos[2], // z
-     0, 4, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
-
-pos[0] += 25;
-pos[2] += -12.5;
-scubes.add(new StaggeredTower(//tower 3
-      pos[0],               // x
-       0   ,   // y
-       pos[2], // z
-     0, 5, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
-
-pos[0] += -32.75;
-pos[2] += -13;
-scubes.add(new StaggeredTower(//tower 4
-    pos[0],               // x
-       0,   // y
-       pos[2], // z
-     0, 6, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
-
-pos[0] += 26;
-pos[2] += -16;
-scubes.add(new StaggeredTower(//tower 5
-      pos[0],               // x
-       15   ,   // y
-       pos[2], // z
-     0, 6, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
-
-pos[0] += 26;
-pos[2] += -4.5;
-scubes.add(new StaggeredTower(//tower 6
-      pos[0],               // x
-       0 ,   // y
-       pos[2], // z
-     0, 6, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
-
-pos[0] += -56.5;
-pos[2] += -6.5;
-scubes.add(new StaggeredTower(// tower 7
-      pos[0],               // x
-       15   ,   // y
-      pos[2], // z
-     0, 4, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
-
-pos[0] += 26;
-pos[2] += -16.5;     
-scubes.add(new StaggeredTower(//tower 8
-      pos[0],               // x
-       0  ,   // y
-       pos[2], // z
-     0, 5, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
-
-pos[0] += 27;
-pos[2] += -4.5;
-scubes.add(new StaggeredTower(//tower 9
-      pos[0],               // x
-       15   ,   // y
-       pos[2], // z
-     0, 5, new Cube.Wiring[] { WRR, WRR, WRR, WRR, WRR, WRR}) );
+float current_x_position = 0;
+// scubes.add(new StaggeredTower(//tower 1
+//       current_x_position,               // x
+//        15   ,   // y
+//        0  ,   // z
+//      45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) );
+// current_x_position += 25.25;
+// scubes.add(new StaggeredTower(// tower 2
+//       current_x_position,               // x
+//        0  ,   // y
+//        -10.5   ,   // z
+//      45, 6, new Cube.Wiring[] { WFR, WFL, WRR, WRR, WFL, WRR}) );
+// current_x_position += 25.25;
+// scubes.add(new StaggeredTower(//tower 3
+//       current_x_position,               // x
+//        15   ,   // y
+//        0,   // z
+//      45, 6, new Cube.Wiring[] { WRR, WFL, WRR, WRR, WFL, WRR}) );
+// current_x_position += 25.25;
+// scubes.add(new StaggeredTower(//tower 4
+//     current_x_position,               // x
+//        0,   // y
+//        -10.5  ,   // z
+//      45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) );
+// current_x_position += 28;
+// scubes.add(new StaggeredTower(//tower 5
+//       current_x_position,               // x
+//        15   ,   // y
+//        -4.5 ,   // z
+//      45, 6, new Cube.Wiring[] { WRR, WFL, WRR, WFL, WRR, WFL}) );
+// current_x_position += 28;
+// scubes.add(new StaggeredTower(//tower 6
+//       current_x_position,               // x
+//        0 ,   // y
+//        -10.5,   // z
+//      45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) );
+// current_x_position += 25.25;
+// scubes.add(new StaggeredTower(// tower 7
+//       current_x_position,               // x
+//        15   ,   // y
+//       0,   // z
+//      45, 6, new Cube.Wiring[] { WRR, WFL, WRR, WFL, WRR, WFL}) );
+// current_x_position += 25.25;     
+// scubes.add(new StaggeredTower(//tower 8
+//       current_x_position,               // x
+//        0  ,   // y
+//        -10.5 ,   // z
+//      45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) );
+// current_x_position += 25.25;
+// scubes.add(new StaggeredTower(//tower 9
+//       current_x_position,               // x
+//        15   ,   // y
+//        0,   // z
+//      45, 6, new Cube.Wiring[] { WFL, WRR, WFL, WRR, WFL, WRR}) );
+// current_x_position += 25.25;
 
 // //TOWERS ON DANCE FLOOR
 // scubes.add(new StaggeredTower(//tower 10
 //       83.75+39+43-124.5,   // x
 //       0,   // y
 //        -47.5-43,   // z
-//      45,  4, new Cube.Wiring[]{ WRR, WRR, WRR, WRR})  ); 
+//      45,  4, new Cube.Wiring[]{ WRR, WFL, WFL, WRR})  ); 
 // scubes.add(new StaggeredTower(//tower 11
 //       83.75,   // x
 //        0,   // y
 //        -47.5,   // z
-//      45,  4, new Cube.Wiring[]{ WRR, WRR, WRR, WRR})  );  
+//      45,  4, new Cube.Wiring[]{ WFL, WRR, WRR, WFL})  );  
 // scubes.add(new StaggeredTower(//tower 12
 //       83.75+39,   // x
 //        0,   // y
 //        -47.5,   // z
-//      45,  4, new Cube.Wiring[]{ WRR, WRR, WRR, WRR})  ); 
+//      45,  4, new Cube.Wiring[]{ WRR, WFL, WFL, WRR})  ); 
 // scubes.add(new StaggeredTower(//tower 13
 //        83.75+39+43,   // x
 //        0,   // y
 //        -47.5-43,   // z
-//      45,  4, new Cube.Wiring[]{ WRR, WRR, WRR, WRR})  ); 
+//      45,  4, new Cube.Wiring[]{ WFL, WRR, WFL, WRR})  ); 
 
 // scubes.add(new StaggeredTower(// Single cube on top of tower 4
 //       42,               // x
@@ -249,240 +232,60 @@ scubes.add(new StaggeredTower(//tower 9
 
   return new Model(towerList, cubes, bassBox, speakers);
 }
+=======
+static final float SPACING = 27;
+static final float RISER = 13.5;
+static final float FLOOR = 0;
+>>>>>>> 21dffb1b77608cacc57382f3eb6eac3ed16054c3
 
 /**
- * This function maps the panda boards. We have an array of them, each has
- * an IP address and a list of channels.
- */
-public PandaMapping[] buildPandaList() {
-  final int LEFT_SPEAKER = 0;
-  final int RIGHT_SPEAKER = 1;
-  
-  // 8 channels map to:  3, 4, 7, 8, 13, 14, 15, 16.
-  return new PandaMapping[] {
-    new PandaMapping(
-      "192.168.88.100", new ChannelMapping[] { // G1
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 6}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 5}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 6}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 7}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 7}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 8}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 2}),
-
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 3}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 11}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 10}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 9}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 9}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 12}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 13}),
-   }),
-
-   new PandaMapping(
-      "192.168.88.101", new ChannelMapping[] { //G4
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 25}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 23}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 24}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 43}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 45}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 44}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
-
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 41}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 42}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 21}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 20}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 22}),
-   }),
-  
-    new PandaMapping(
-      "192.168.88.104", new ChannelMapping[] { // G3
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 26}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 28}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 27}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 19}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 18}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 17}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1}),
-
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 18}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 19}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 15}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 16}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 14}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 29}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 30}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 31}),
-   }),
-
-   new PandaMapping( 
-      "192.168.88.105", new ChannelMapping[] { // G2
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 39}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 38}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 40}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 34}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 35}),
-
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 33}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 32}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  1}),
-   }),
-  };
-}
-
-class TowerMapping {
-  public final float x, y, z;
-  public final CubeMapping[] cubeMappings;
-  
-  TowerMapping(float x, float y, float z, CubeMapping[] cubeMappings) {
-    this.x = x;
-    this.y = y;
-    this.z = z;
-    this.cubeMappings = cubeMappings;
-  }
-}
-
-class CubeMapping {
-  public final float dx, dz, ry;
-  public final Cube.Wiring wiring;
-  
-  CubeMapping(float dx, float dz, Cube.Wiring wiring) {
-    this(dx, dz, 0., wiring);
-  }
-  CubeMapping(float dx, float dz, float ry) {
-    this(dz, dz, ry, Cube.Wiring.FRONT_LEFT);
-  }
-  
-  CubeMapping(float dx, float dz, float ry, Cube.Wiring wiring) {
-    this.dx = dx;
-    this.dz = dz;
-    this.ry = ry;
-    this.wiring = wiring;
-  }
-}
-
-class StaggeredTower {
-  public final float x, y, z, r;
-  public final int n;
-  public final Cube.Wiring[] wiring;
-  StaggeredTower(float _x, float _y, float _z, float _r, int _n) { this(_x, _y, _z, _r, _n, new Cube.Wiring[]{}); }
-  StaggeredTower(float _x, float _y, float _z, float _r, int _n, Cube.Wiring[] _wiring) { x=_x; y=_y; z=_z; r=_r; n=_n; wiring=_wiring;}
-}
-
-/**
- * Each panda board has an IP address and a fixed number of channels. The channels
- * each have a fixed number of pixels on them. Whether or not that many physical
- * pixels are connected to the channel, we still send it that much data.
+ * Definitions of tower positions. This is all that should need
+ * to be modified. Distances are measured from the left-most cube.
+ * The first value is the offset moving NE (towards back-right).
+ * The second value is the offset moving NW (negative comes forward-right).
  */
-class PandaMapping {
-  
-  // How many channels are on the panda board
-  public final static int CHANNELS_PER_BOARD = 16;
-  
-  // How many total pixels on the whole board
-  public final static int PIXELS_PER_BOARD = ChannelMapping.PIXELS_PER_CHANNEL * CHANNELS_PER_BOARD;
-  
-  final String ip;
-  final ChannelMapping[] channelList = new ChannelMapping[CHANNELS_PER_BOARD];
-  
-  PandaMapping(String ip, ChannelMapping[] rawChannelList) {
-    this.ip = ip;
-    
-    // Ensure our array is the right length and has all valid items in it
-    for (int i = 0; i < channelList.length; ++i) {
-      channelList[i] = (i < rawChannelList.length) ? rawChannelList[i] : new ChannelMapping();
-      if (channelList[i] == null) {
-        channelList[i] = new ChannelMapping();
-      }
-    }
-  }
-}
+static final float[][] TOWER_CONFIG = new float[][] {
+  new float[] { 0, 0, RISER, 4 },
+  new float[] { 25, -10, RISER, 4 },
+  new float[] { 50, -22.5, FLOOR, 5 },
+  new float[] { 17.25, -35.5, FLOOR, 6 },
+  new float[] { 43.25, -51.5, RISER, 6 },
+  new float[] { 69.25, -56, FLOOR, 6 },
+  new float[] { 12.75, -62.5, RISER, 4 },
+  new float[] { 38.75, -78.5, FLOOR, 5 },
+  new float[] { 65.75, -83, RISER, 5 },  
+
+};
 
-/**
- * Each channel on a pandaboard can be mapped in a number of modes. The typical is
- * to a series of connected cubes, but we also have special mappings for the bass box,
- * the speaker enclosures, and the DJ booth floor.
- *
- * This class is just the mapping meta-data. It sanitizes the input to make sure
- * that the cubes and objects being referenced actually exist in the model.
- *
- * The logic for how to encode the pixels is contained in the PandaDriver.
- */
-class ChannelMapping {
-
-  // How many cubes per channel xc_PB is configured for
-  public final static int CUBES_PER_CHANNEL = 1;  
+public Model buildModel() {
 
-  // How many total pixels on each channel
-  public final static int PIXELS_PER_CHANNEL = Cube.POINTS_PER_CUBE * CUBES_PER_CHANNEL;
-  
-  public static final int MODE_NULL = 0;
-  public static final int MODE_CUBES = 1;
-  public static final int MODE_BASS = 2;
-  public static final int MODE_SPEAKER = 3;
-  public static final int MODE_STRUTS_AND_FLOOR = 4;
-  public static final int MODE_INVALID = 5;
-  
-  public static final int NO_OBJECT = -1;
-  
-  final int mode;
-  final int[] objectIndices = new int[CUBES_PER_CHANNEL];
-  
-  ChannelMapping() {
-    this(MODE_NULL);
-  }
-  
-  ChannelMapping(int mode) {
-    this(mode, new int[]{});
-  }
-  
-  ChannelMapping(int mode, int rawObjectIndex) {
-    this(mode, new int[]{ rawObjectIndex });
-  }
-  
-  ChannelMapping(int mode, int[] rawObjectIndices) {
-    if (mode < 0 || mode >= MODE_INVALID) {
-      throw new RuntimeException("Invalid channel mapping mode: " + mode);
-    }
-    if (mode == MODE_SPEAKER) {
-      if (rawObjectIndices.length != 1) {
-        throw new RuntimeException("Speaker channel mapping mode must specify one speaker index");
-      }
-      int speakerIndex = rawObjectIndices[0];
-      if (speakerIndex < 0 || speakerIndex >= glucose.model.speakers.size()) {
-        throw new RuntimeException("Invalid speaker channel mapping: " + speakerIndex);
-      }
-    } else if ((mode == MODE_STRUTS_AND_FLOOR) || (mode == MODE_BASS) || (mode == MODE_NULL)) {
-      if (rawObjectIndices.length > 0) {
-        throw new RuntimeException("Bass/floor/null mappings cannot specify object indices");
-      }
-    } else if (mode == MODE_CUBES) {
-      for (int rawCubeIndex : rawObjectIndices) {
-        if (glucose.model.getCubeByRawIndex(rawCubeIndex) == null) {
-          throw new RuntimeException("Non-existing cube specified in cube mapping: " + rawCubeIndex);
-        }
-      }
+  List<Tower> towers = new ArrayList<Tower>();
+  Cube[] cubes = new Cube[200];
+  int cubeIndex = 1;
+
+  float rt2 = sqrt(2);
+  float x, y, z, xd, zd, num;
+  for (float[] tc : TOWER_CONFIG) {
+    x = -tc[1];
+    z = tc[0]; 
+    y = tc[2];
+    num = tc[3];
+    if (z < x) {
+      zd = -(x-z)/rt2;
+      xd = z*rt2 - zd;
+    } else {
+      zd = (z-x)/rt2;
+      xd = z*rt2 - zd;
     }
-    
-    this.mode = mode;
-    for (int i = 0; i < objectIndices.length; ++i) {
-      objectIndices[i] = (i < rawObjectIndices.length) ? rawObjectIndices[i] : NO_OBJECT;
+    List<Cube> tower = new ArrayList<Cube>();
+    for (int n = 0; n < num; ++n) {
+      Cube cube = new Cube(xd + 24, y, zd + 84, 0, -45, 0);
+      tower.add(cube);
+      cubes[cubeIndex++] = cube;
+      y += SPACING;
     }
+    towers.add(new Tower(tower));
   }
+
+  return new Model(towers, cubes);
 }