X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=blobdiff_plain;f=_Mappings.pde;h=9ff93e6b962c86d0606cd8ee84b2badd15dd5562;hp=0824cc6f236f3c7924124f9c27409c086daccef7;hb=df18145ff0149470136d51d6eab334800e7be9a9;hpb=bdef287d097659a12c9573879d0e8a7e34cbdef6

diff --git a/_Mappings.pde b/_Mappings.pde
index 0824cc6..9ff93e6 100644
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@ -75,12 +75,24 @@ public Model buildModel() {
   ////////////////////////////////////////////////////////////////////////
   // dan's proposed lattice
         ArrayList<StaggeredTower> scubes = new ArrayList<StaggeredTower>();
-        if (NumBackTowers != 11) 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
-        //          225, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight-1) );         // num cubes
+        //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) ? 0 : 11) + 80          ,   // z
+                 225, (i % 2 == 0) ? MaxCubeHeight : MaxCubeHeight-1) );         // 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<2 ; i++) scubes.add(new StaggeredTower(
+      //             (i+1)*CW,                                                                 // x
+      //                0             ,   // y
+      //            - 0 + 97 - 2*pow(CH*CH + CW*CW, .5),   // z
+      //            225,  MaxCubeHeight  ) ); 
         
         ArrayList<Cube> dcubes = new ArrayList<Cube>();
         // for (int i=1; i<6; i++) {
@@ -89,82 +101,82 @@ public Model buildModel() {
         // }
 
 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;
+// 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, WFL, WFL, WRR})  ); 
-scubes.add(new StaggeredTower(//tower 11
-      83.75,   // x
-       0,   // y
-       -47.5,   // z
-     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, 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[]{ WFL, WRR, WFL, WRR})  ); 
+// //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, WFL, WFL, WRR})  ); 
+// scubes.add(new StaggeredTower(//tower 11
+//       83.75,   // x
+//        0,   // y
+//        -47.5,   // z
+//      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, 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[]{ WFL, WRR, WFL, WRR})  ); 
 
 // scubes.add(new StaggeredTower(// Single cube on top of tower 4
 //       42,               // x
@@ -185,7 +197,7 @@ scubes.add(new StaggeredTower(//tower 13
   // These guts just convert the shorthand mappings into usable objects
   ArrayList<Tower> towerList = new ArrayList<Tower>();
   ArrayList<Cube> tower;
-  Cube[] cubes = new Cube[100];
+  Cube[] cubes = new Cube[200];
   int cubeIndex = 1;  
   float px, pz, ny;
   for (TowerMapping tm : towerCubes) {
@@ -210,7 +222,7 @@ for (StaggeredTower st : scubes) {
       tower.add(cubes[cubeIndex++] = new Cube(st.x, st.y + CH* 4/3.*i, st.z, 0, st.r, 0, w));
     }
     towerList.add(new Tower(tower));
-  }
+  }   
 
   return new Model(towerList, cubes, bassBox, speakers);
 }
@@ -249,8 +261,8 @@ public PandaMapping[] buildPandaList() {
     }),    
     new PandaMapping(
       "10.200.1.30", new ChannelMapping[] {
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }), // 30 J3 *
-        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),  // 30 J4 //ORIG *
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,1,1}), // 30 J3 *
+        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1,1,1}),  // 30 J4 //ORIG *
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 37, 38, 39}),                // 30 J7 *
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 40, 41, 42}),  // 30 J8 *
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 43, 44, 45}),                // 30 J13 (not working)
@@ -258,28 +270,28 @@ public PandaMapping[] buildPandaList() {
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 49, 50, 51}),                // 30 J15 (unplugged)
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 52, 53, 54}), // 30 J16
    }),    
-     new PandaMapping(
-       "10.200.1.31", new ChannelMapping[] {
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 65, 66}),       // J3 
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),       // J4
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 55, 56}), // 30 J7 
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 57, 58}), //  J8 
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 59, 60}),           // J13 
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 61, 62}),                // 30 J14 
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 63, 64}),                //  J15
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),              //  J16
-     }),
-     new PandaMapping(
-       "10.200.1.32", new ChannelMapping[] {
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),       // J3 
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),       // J4
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 67, 68}), // 30 J7 
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 69, 70}), //  J8 
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),           // J13 
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 30 J14 
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                //  J15
-         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),              //  J16
-     }),
+   //   new PandaMapping(
+   //     "10.200.1.31", new ChannelMapping[] {
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 65, 66}),       // J3 
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),       // J4
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 55, 56}), // 30 J7 
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 57, 58}), //  J8 
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 59, 60}),           // J13 
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 61, 62}),                // 30 J14 
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 63, 64}),                //  J15
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),              //  J16
+   //   }),
+   //   new PandaMapping(
+   //     "10.200.1.32", new ChannelMapping[] {
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),       // J3 
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),       // J4
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 67, 68}), // 30 J7 
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 69, 70}), //  J8 
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),           // J13 
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                // 30 J14 
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),                //  J15
+   //       new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { }),              //  J16
+   //   }),
   };
 }
 
@@ -422,4 +434,4 @@ class ChannelMapping {
       objectIndices[i] = (i < rawObjectIndices.length) ? rawObjectIndices[i] : NO_OBJECT;
     }
   }
-}
\ No newline at end of file
+}