added JGraphT to code folder, seems to be working but it's possible I screwed somethi...

[SugarCubes.git] / _Mappings.pde

diff --git a/_Mappings.pde b/_Mappings.pde
index 6877e63335415de61c1b2b2b483419743a06e6f5..817601e6adad7fa24589ddcf4cdb822423e7e8c2 100644 (file)
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@ -83,11 +83,11 @@ public Model buildModel() {
                  - ((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
@@ -214,8 +214,12 @@ float current_x_position = 0;
   }
 
   
-  for (Cube cube : singleCubes) cubes[cubeIndex++] = cube;
-  for (Cube cube : dcubes)                 cubes[cubeIndex++] = cube;
+  for (Cube cube : singleCubes) {
+    cubes[cubeIndex++] = cube;
+  }
+  for (Cube cube : dcubes) {
+    cubes[cubeIndex++] = cube;
+  }
   for (StaggeredTower st : scubes) {
     tower = new ArrayList<Cube>();
     for (int i=0; i < st.n; i++) {
@@ -255,6 +259,7 @@ public PandaMapping[] buildPandaList() {
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 1, 2, 3 }),
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 4, 5, 6 }),
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 7, 8, 9 }),
+
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 10, 11, 12 }),
         new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 16, 17, 18 }),
 //        new ChannelMapping(ChannelMapping.MODE_CUBES, new int[] { 34, 35, 36}),