Add mask transition to do MULTIPLY burn on crossfader

[SugarCubes.git] / _Mappings.pde

diff --git a/_Mappings.pde b/_Mappings.pde
index fe08aaa7c6677027d27f3794be17924a961d4ab5..57bcbb55340aa705a8e457211724453f5f5426bc 100644 (file)
--- 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);
 }
 
 /**
@@ -339,14 +337,14 @@ public PandaMapping[] buildPandaList() {
     }),    
     new PandaMapping(
       "10.200.1.31", new ChannelMapping[] {
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),  //placeholders
+        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[] { 24,25,26,27}), //28 J8
+        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 J16
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 31 J16
     }),
   };
 }