X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_Mappings.pde;h=2c28b450d6a3fae1b28485f93afaa46e82cb1810;hb=a9aad043f225ca84f6606e331c391d1e860872b9;hp=3b4b2f37395e7a3767304ef3438462d2b74c5010;hpb=51227786d68ba9b8e89d463acc1bc36db8f478c7;p=SugarCubes.git

diff --git a/_Mappings.pde b/_Mappings.pde
index 3b4b2f3..2c28b45 100644
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@ -255,16 +255,14 @@ public Model buildModel() {
   };
 
   // The bass box!
-  /*
   BassBox bassBox = new BassBox(BBX, 0, BBZ);
  
   // The speakers!
   List<Speaker> speakers = Arrays.asList(new Speaker[] {
      // Each speaker parameter is x, y, z, rotation, the left speaker comes first
-     new Speaker(-12, 6, 0, 15),
-     new Speaker(TRAILER_WIDTH - Speaker.EDGE_WIDTH + 8, 6, 3, -15)
+//     new Speaker(-12, 6, 0, 15),
+//     new Speaker(TRAILER_WIDTH - Speaker.EDGE_WIDTH + 8, 6, 3, -15)
   });
-  */
 
   //////////////////////////////////////////////////////////////////////
   //      BENEATH HERE SHOULD NOT REQUIRE ANY MODIFICATION!!!!        //
@@ -291,7 +289,7 @@ public Model buildModel() {
     cubes[cubeIndex++] = cube;
   }
 
-  return new Model(towerList, cubes, null, null);
+  return new Model(towerList, cubes, bassBox, speakers);
 }
 
 /**
@@ -308,7 +306,7 @@ public PandaMapping[] buildPandaList() {
       "10.200.1.30", new ChannelMapping[] {
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 39, 40, 41, 42 }), // 30 J3 *
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37, 38, 36, 35}),  // 30 J4 //ORIG *
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 20, 21, 22, 23}),  // 30 J7 *
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 30 J7 *
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 16, 17, 18, 19}),  // 30 J8 *
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 30 J13 (not working)
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 30 J14 (unplugged)
@@ -329,7 +327,7 @@ public PandaMapping[] buildPandaList() {
     new PandaMapping(
       "10.200.1.28", new ChannelMapping[] {
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 60, 61, 62, 63 }), // 28 J3
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 56, 57, 58, 59}),  // 28 J4
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 28 J4
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 45, 46, 47, 48 }), // 28 J7
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 28 J8
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] {  4,  5,  6,  7}),  // 28 J13
@@ -339,13 +337,13 @@ public PandaMapping[] buildPandaList() {
     }),    
     new PandaMapping(
       "10.200.1.31", new ChannelMapping[] {
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), 
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 31 J3
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 31 J4
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 73}),                // 31 J7
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 24, 25, 26, 27}),  // 31 J8
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), 
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), 
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 73 }), 
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 31 J13
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 56, 57, 58, 59}),  // 31 J14
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 20, 21, 22, 23}),  // 31 J15
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 31 J16
     }),
   };