updated dpat

[SugarCubes.git] / _Mappings.pde

diff --git a/_Mappings.pde b/_Mappings.pde
index 3f6756a08c56cd6522d38db47adc757f4d689d56..7d288ef8916a31979033c229926bc344f62c486c 100644 (file)
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@ -51,13 +51,31 @@ public Model buildModel() {
   //  We can do better than this.  The raw object index should be obvious from the code-- looking through the
   //  rendered simulation and counting through cubes in mapping mode is grossly inefficient. 
 
+
+  ////////////////////////////////////////////////////////////////////////
+  // dan's proposed lattice
+  ArrayList<StaggeredTower> scubes = new ArrayList<StaggeredTower>();
+  if (NumBackTowers != 9) exit();
+  for (int i=0; i<NumBackTowers; i++) scubes.add(new StaggeredTower(
+      (i+1)*CW,               // x
+      (i % 2 == 0) ? 0 : CH * 2./3.   ,   // y
+     - ((i % 2 == 0) ? 0 : 11) + 97   ,   // z
+     -135, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight-1) );  // num cubes
+  
+  ArrayList<Cube> dcubes = new ArrayList<Cube>();
+  for (int i=1; i<6; i++) {
+    if (i>1) dcubes.add(new Cube(-6+CW*4/3*i             , 0, 0, 0, 0, 0, WRR));  
+         dcubes.add(new Cube(-6+CW*4/3*i+CW*2/3., CH*.5, 0, 0, 0, 0, WRR)); 
+  }
+
+
   TowerMapping[] towerCubes = new TowerMapping[] {};
   
   // Single cubes can be constructed directly here if you need them
   Cube[] singleCubes = new Cube[] {
-    // new Cube(15, int( Cube.EDGE_HEIGHT), 39, 0, 10, 0,  WRL),     // Back left channel behind speaker
+     //new Cube(15, int( Cube.EDGE_HEIGHT), 39, 0, 10, 0,  WRL),     // Back left channel behind speaker
      //new Cube(x, y, z, rx, ry, rz, wiring),
-    new Cube(0,0,0,0,-135,0, WRR),
+     //new Cube(0,0,0,0,-135,0, WRR),
   };
 
   // The bass box!
@@ -71,23 +89,6 @@ public Model buildModel() {
      // new Speaker(TRAILER_WIDTH - Speaker.EDGE_WIDTH + 8, 6, 3, -15)
   });
 
-
-  ////////////////////////////////////////////////////////////////////////
-  // dan's proposed lattice
-       ArrayList<StaggeredTower> scubes = new ArrayList<StaggeredTower>();
-       if (NumBackTowers != 9) exit();
-       for (int i=0; i<NumBackTowers; i++) scubes.add(new StaggeredTower(
-                 (i+1)*CW,                                                             // x
-                 (i % 2 == 0) ? 0 : CH * 2./3.         ,   // y
-                - ((i % 2 == 0) ? 0 : 11) + 97         ,   // z
-                -135, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight-1) );        // num cubes
-       
-       ArrayList<Cube> dcubes = new ArrayList<Cube>();
-       for (int i=1; i<6; i++) {
-               if (i>1) dcubes.add(new Cube(-6+CW*4/3*i             , 0, 0, 0, 0, 0, WRR));    
-                                dcubes.add(new Cube(-6+CW*4/3*i+CW*2/3., CH*.5, 0, 0, 0, 0, WRR));     
-       }
-
   //////////////////////////////////////////////////////////////////////
   //      BENEATH HERE SHOULD NOT REQUIRE ANY MODIFICATION!!!!        //
   //////////////////////////////////////////////////////////////////////
@@ -120,7 +121,7 @@ for (StaggeredTower st : scubes) {
     towerList.add(new Tower(tower));
   }
 
- return new Model(towerList, cubes, bassBox, speakers);
+  return new Model(towerList, cubes, bassBox, speakers);
 }
 
 /**