Add test patterns for new tower abstraction with cubes in it

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 3cae80f968129eda5fa1a4912636badebc66d9be..a7210f3054b4504807939381d72e82559c6db3be 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -42,11 +42,12 @@ LXPattern[] patterns(GLucose glucose) {
     
     // Basic test patterns for reference, not art    
     new TestCubePattern(glucose),
-    new TestHuePattern(glucose),
+    new TestTowerPattern(glucose),
     new TestProjectionPattern(glucose),
-//    new TestXPattern(glucose),
-//    new TestYPattern(glucose),
-//    new TestZPattern(glucose),
+    // new TestHuePattern(glucose),
+    // new TestXPattern(glucose),
+    // new TestYPattern(glucose),
+    // new TestZPattern(glucose),
 
   };
 }

diff --git a/TestPatterns.pde b/TestPatterns.pde
index 733494541ec28d1c5e6fce48ea7612007c2b1530..c247e2ca66f2eb3dff1a6a1c939dc0bde1c33ace 100644 (file)
--- a/TestPatterns.pde
+++ b/TestPatterns.pde
@@ -74,6 +74,35 @@ class TestZPattern extends SCPattern {
   }
 }
 
+/**
+ * This shows how to iterate over towers, enumerated in the model.
+ */
+class TestTowerPattern extends SCPattern {
+  private final SawLFO towerIndex = new SawLFO(0, model.towers.size(), 1000*model.towers.size());
+  
+  public TestTowerPattern(GLucose glucose) {
+    super(glucose);
+    addModulator(towerIndex).trigger();
+    towerIndex.setValue(9);
+  }
+
+  public void run(int deltaMs) {
+    println((int)towerIndex.getValuef());
+    int ti = 0;
+    for (Tower t : model.towers) {
+      for (Point p : t.points) {
+        colors[p.index] = color(
+          lx.getBaseHuef(),
+          100,
+          max(0, 100 - 80*abs(ti - towerIndex.getValuef()))
+        );
+      }
+      ++ti;
+    }
+  }
+  
+}
+
 /**
  * This is a demonstration of how to use the projection library. A projection
  * creates a mutation of the coordinates of all the points in the model, creating

diff --git a/_Internals.pde b/_Internals.pde
index 3d736baef20ac771b6479d8ee4c28a74a47e67d7..5753ef810f3c2e2c5d4bd4abac3a9f722d3aa974 100644 (file)
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -47,7 +47,6 @@ final float BASS_Z = (TRAILER_DEPTH - BASS_DEPTH) / 2.;
 int targetFramerate = 60;
 
 int startMillis, lastMillis;
-SCMapping mapping;
 GLucose glucose;
 HeronLX lx;
 MappingTool mappingTool;
@@ -76,8 +75,7 @@ void setup() {
   logTime("Created viewport");
 
   // Create the GLucose engine to run the cubes
-  mapping = new SCMapping();
-  glucose = new GLucose(this, mapping);
+  glucose = new GLucose(this, buildModel());
   lx = glucose.lx;
   lx.enableKeyboardTempo();
   logTime("Built GLucose engine");
@@ -91,7 +89,7 @@ void setup() {
   logTime("Built transitions");
     
   // Build output driver
-  PandaMapping[] pandaMappings = mapping.buildPandaList();
+  PandaMapping[] pandaMappings = buildPandaList();
   pandaBoards = new PandaDriver[pandaMappings.length];
   int pbi = 0;
   for (PandaMapping pm : pandaMappings) {

diff --git a/_Mappings.pde b/_Mappings.pde
index 56be1b13008bce5587dd115ff0c7d511d5e88782..3e0f1f249d62ad32e00c1ad82479a2981b515899 100644 (file)
--- a/_Mappings.pde
+++ b/_Mappings.pde
@@ -8,156 +8,193 @@
  *
  *        EXPERTS ONLY!!              EXPERTS ONLY!!
  *
- * This class implements the mapping functions needed to lay out the physical
+ * This file implements the mapping functions needed to lay out the physical
  * cubes and the output ports on the panda board. It should only be modified
  * when physical changes or tuning is being done to the structure.
  */
-class SCMapping implements GLucose.Mapping {
 
-  public Cube[] buildCubeArray() {
-    // TODO(mcslee): find a cleaner way of representing this data, probably
-    // serialized in some more neutral form. also figure out what's going on
-    // with the indexing starting at 1 and some indices missing.
-    Cube[] cubes = new Cube[79];
-    
-    int cubeIndex = 1;
-    
-    cubes[cubeIndex++] = new Cube(0, 0, 0, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(5, Cube.EDGE_HEIGHT, -10, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube(0, 2*Cube.EDGE_HEIGHT, -6, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(-5, 3*Cube.EDGE_HEIGHT, -2, 0, -20, 0);
-    
-    cubes[cubeIndex++] = new Cube(Cube.EDGE_WIDTH + 2, 0, 0, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(Cube.EDGE_WIDTH + 2, Cube.EDGE_HEIGHT, 5, 0, 10, 0);
-    cubes[cubeIndex++] = new Cube(Cube.EDGE_WIDTH + 2, 2*Cube.EDGE_HEIGHT, 2, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube(Cube.EDGE_WIDTH + 2, 3*Cube.EDGE_HEIGHT, 0, 0, 30, 0);
-    
-    // Back Cubes behind DJ platform (in order of increasing x)
-    cubes[cubeIndex++] = new Cube(50, 0, BASS_DEPTH, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(52,  5+Cube.EDGE_HEIGHT, BASS_DEPTH, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube(48, 5+2*Cube.EDGE_HEIGHT, BASS_DEPTH + 10, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(45,   5+3*Cube.EDGE_HEIGHT, BASS_DEPTH + 15, 0, -20, 0);
-    cubes[cubeIndex++] = new Cube(48,  5+4*Cube.EDGE_HEIGHT, BASS_DEPTH + 13, 0, 0, 0);
-    
-    cubes[cubeIndex++] = new Cube(79, 0, BASS_DEPTH, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(81,  5+Cube.EDGE_HEIGHT, BASS_DEPTH, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube(83, 5+2*Cube.EDGE_HEIGHT, BASS_DEPTH + 10, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(81,   5+3*Cube.EDGE_HEIGHT, BASS_DEPTH + 15, 0, -20, 0);
-    cubes[cubeIndex++] = new Cube(79,  5+4*Cube.EDGE_HEIGHT, BASS_DEPTH + 13, 0, 0, 0);
-    
-    cubes[cubeIndex++] = new Cube(107, 0, BASS_DEPTH, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(111,  5+Cube.EDGE_HEIGHT, BASS_DEPTH, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube(113, 5+2*Cube.EDGE_HEIGHT, BASS_DEPTH + 10, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(110,   5+3*Cube.EDGE_HEIGHT, BASS_DEPTH + 15, 0, -20, 0);
-    // cubes[cubeIndex++] = new Cube(115,  5+4*Cube.EDGE_HEIGHT, BASS_DEPTH + 13, 0, 0, 0);
-    
-    cubes[cubeIndex++] = new Cube(133, 0, BASS_DEPTH, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(131,  5+Cube.EDGE_HEIGHT, BASS_DEPTH, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube(133, 5+2*Cube.EDGE_HEIGHT, BASS_DEPTH + 10, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(135,   5+3*Cube.EDGE_HEIGHT, BASS_DEPTH + 15, 0, -20, 0);
-    // cubes[cubeIndex++] = new Cube(137,  5+4*Cube.EDGE_HEIGHT, BASS_DEPTH + 13, 0, 0, 0);
-    
-    cubes[cubeIndex++] = new Cube(165, 0, BASS_DEPTH, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(164,  5+Cube.EDGE_HEIGHT, BASS_DEPTH, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube(167, 5+2*Cube.EDGE_HEIGHT, BASS_DEPTH + 10, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(163,   5+3*Cube.EDGE_HEIGHT, BASS_DEPTH + 15, 0, -20, 0);
-    cubes[cubeIndex++] = new Cube(168,  5+4*Cube.EDGE_HEIGHT, BASS_DEPTH + 13, 0, 0, 0);
-    
-    // front DJ cubes
-    cubes[cubeIndex++] = new Cube( (TRAILER_WIDTH - BASS_WIDTH)/2, BASS_HEIGHT + 0, 10, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2, BASS_HEIGHT + Cube.EDGE_HEIGHT, 0, 0, 20, 0);
-    
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + Cube.EDGE_HEIGHT + 3, BASS_HEIGHT, 10, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + Cube.EDGE_HEIGHT + 2, BASS_HEIGHT+Cube.EDGE_HEIGHT, 0, 0, 20, 0);
-    
+public Model buildModel() {
+  // TODO(mcslee): find a cleaner way of representing this data, probably
+  // serialized in some more neutral form. also figure out what's going on
+  // with the indexing starting at 1 and some indices missing.
+  ArrayList<Tower> towerList = new ArrayList<Tower>();
+  ArrayList<Cube> tower;
+  Cube[] cubes = new Cube[79];
+  int cubeIndex = 1;
 
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 2*Cube.EDGE_HEIGHT + 5, BASS_HEIGHT + 0, 10, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 2*Cube.EDGE_HEIGHT + 6, BASS_HEIGHT + Cube.EDGE_HEIGHT, 10, 0, 10, 0);
-   
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 3*Cube.EDGE_HEIGHT + 9, BASS_HEIGHT + 0, 10, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 3*Cube.EDGE_HEIGHT + 8, BASS_HEIGHT + Cube.EDGE_HEIGHT, 10, 0, 0, 0);
-    
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 15, BASS_HEIGHT + 0, 10, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 14, BASS_HEIGHT + Cube.EDGE_HEIGHT, 10, 0, 0, 0);
-    
-    // left dj cubes
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2, BASS_HEIGHT + 0, Cube.EDGE_HEIGHT + 2, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2, BASS_HEIGHT + Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 4, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2, BASS_HEIGHT + 0, 2*Cube.EDGE_HEIGHT + 4, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2, BASS_HEIGHT + Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 6, 0, 20, 0);
-    
-    // right dj cubes    
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 15, BASS_HEIGHT + 0, Cube.EDGE_HEIGHT + 2, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 15, BASS_HEIGHT + Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 4, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 15, BASS_HEIGHT + 0, 2*Cube.EDGE_HEIGHT + 4, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 15, BASS_HEIGHT + Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 6, 0, 20, 0);
+  tower = new ArrayList<Cube>();
+  tower.add(cubes[cubeIndex++] = new Cube(0, 0, 0, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(5, Cube.EDGE_HEIGHT, -10, 0, 20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(0, 2*Cube.EDGE_HEIGHT, -6, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(-5, 3*Cube.EDGE_HEIGHT, -2, 0, -20, 0));
+  towerList.add(new Tower(tower));
+  
+  tower = new ArrayList<Cube>();
+  tower.add(cubes[cubeIndex++] = new Cube(Cube.EDGE_WIDTH + 2, 0, 0, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(Cube.EDGE_WIDTH + 2, Cube.EDGE_HEIGHT, 5, 0, 10, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(Cube.EDGE_WIDTH + 2, 2*Cube.EDGE_HEIGHT, 2, 0, 20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(Cube.EDGE_WIDTH + 2, 3*Cube.EDGE_HEIGHT, 0, 0, 30, 0));
+  towerList.add(new Tower(tower));
+  
+  // Back Cubes behind DJ platform (in order of increasing x)
+  tower = new ArrayList<Cube>();  
+  tower.add(cubes[cubeIndex++] = new Cube(50, 0, BASS_DEPTH, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(52,  5+Cube.EDGE_HEIGHT, BASS_DEPTH, 0, 20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(48, 5+2*Cube.EDGE_HEIGHT, BASS_DEPTH + 10, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(45,   5+3*Cube.EDGE_HEIGHT, BASS_DEPTH + 15, 0, -20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(48,  5+4*Cube.EDGE_HEIGHT, BASS_DEPTH + 13, 0, 0, 0));
+  towerList.add(new Tower(tower));
+  
+  tower = new ArrayList<Cube>();  
+  tower.add(cubes[cubeIndex++] = new Cube(79, 0, BASS_DEPTH, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(81,  5+Cube.EDGE_HEIGHT, BASS_DEPTH, 0, 20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(83, 5+2*Cube.EDGE_HEIGHT, BASS_DEPTH + 10, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(81,   5+3*Cube.EDGE_HEIGHT, BASS_DEPTH + 15, 0, -20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(79,  5+4*Cube.EDGE_HEIGHT, BASS_DEPTH + 13, 0, 0, 0));
+  towerList.add(new Tower(tower));
+  
+  tower = new ArrayList<Cube>();  
+  tower.add(cubes[cubeIndex++] = new Cube(107, 0, BASS_DEPTH, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(111,  5+Cube.EDGE_HEIGHT, BASS_DEPTH, 0, 20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(113, 5+2*Cube.EDGE_HEIGHT, BASS_DEPTH + 10, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(110,   5+3*Cube.EDGE_HEIGHT, BASS_DEPTH + 15, 0, -20, 0));
+  // tower.add(cubes[cubeIndex++] = new Cube(115,  5+4*Cube.EDGE_HEIGHT, BASS_DEPTH + 13, 0, 0, 0));
+  towerList.add(new Tower(tower));
+  
+  tower = new ArrayList<Cube>();  
+  tower.add(cubes[cubeIndex++] = new Cube(133, 0, BASS_DEPTH, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(131,  5+Cube.EDGE_HEIGHT, BASS_DEPTH, 0, 20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(133, 5+2*Cube.EDGE_HEIGHT, BASS_DEPTH + 10, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(135,   5+3*Cube.EDGE_HEIGHT, BASS_DEPTH + 15, 0, -20, 0));
+  // tower.add(cubes[cubeIndex++] = new Cube(137,  5+4*Cube.EDGE_HEIGHT, BASS_DEPTH + 13, 0, 0, 0));
+  towerList.add(new Tower(tower));
+  
+  tower = new ArrayList<Cube>();
+  tower.add(cubes[cubeIndex++] = new Cube(165, 0, BASS_DEPTH, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(164,  5+Cube.EDGE_HEIGHT, BASS_DEPTH, 0, 20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(167, 5+2*Cube.EDGE_HEIGHT, BASS_DEPTH + 10, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(163,   5+3*Cube.EDGE_HEIGHT, BASS_DEPTH + 15, 0, -20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(168,  5+4*Cube.EDGE_HEIGHT, BASS_DEPTH + 13, 0, 0, 0));
+  towerList.add(new Tower(tower));
+  
+  // front DJ cubes
+  tower = new ArrayList<Cube>();  
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2, BASS_HEIGHT + 0, 10, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2, BASS_HEIGHT + Cube.EDGE_HEIGHT, 0, 0, 20, 0));
+  towerList.add(new Tower(tower));
+  
+  tower = new ArrayList<Cube>();
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + Cube.EDGE_HEIGHT + 2, BASS_HEIGHT+Cube.EDGE_HEIGHT, 0, 0, 20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + Cube.EDGE_HEIGHT + 3, BASS_HEIGHT, 10, 0, 0, 0));
+  towerList.add(new Tower(tower));
+
+  tower = new ArrayList<Cube>();
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 2*Cube.EDGE_HEIGHT + 5, BASS_HEIGHT + 0, 10, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 2*Cube.EDGE_HEIGHT + 6, BASS_HEIGHT + Cube.EDGE_HEIGHT, 10, 0, 10, 0));
+  towerList.add(new Tower(tower));
+ 
+  tower = new ArrayList<Cube>();
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 3*Cube.EDGE_HEIGHT + 9, BASS_HEIGHT + 0, 10, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 3*Cube.EDGE_HEIGHT + 8, BASS_HEIGHT + Cube.EDGE_HEIGHT, 10, 0, 0, 0));
+  towerList.add(new Tower(tower));
+  
+  tower = new ArrayList<Cube>();
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 15, BASS_HEIGHT + 0, 10, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 14, BASS_HEIGHT + Cube.EDGE_HEIGHT, 10, 0, 0, 0));
+  towerList.add(new Tower(tower));
+  
+  // left dj cubes
+  tower = new ArrayList<Cube>();
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2, BASS_HEIGHT + 0, Cube.EDGE_HEIGHT + 2, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2, BASS_HEIGHT + Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 4, 0, 20, 0));
+  towerList.add(new Tower(tower));
+  
+  tower = new ArrayList<Cube>();
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2, BASS_HEIGHT + 0, 2*Cube.EDGE_HEIGHT + 4, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2, BASS_HEIGHT + Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 6, 0, 20, 0));
+  towerList.add(new Tower(tower));
+  
+  // right dj cubes    
+  tower = new ArrayList<Cube>();
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 15, BASS_HEIGHT + 0, Cube.EDGE_HEIGHT + 2, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 15, BASS_HEIGHT + Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 4, 0, 20, 0));
+  towerList.add(new Tower(tower));
+  
+  tower = new ArrayList<Cube>();
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 15, BASS_HEIGHT + 0, 2*Cube.EDGE_HEIGHT + 4, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube((TRAILER_WIDTH - BASS_WIDTH)/2 + 4*Cube.EDGE_HEIGHT + 15, BASS_HEIGHT + Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 6, 0, 20, 0));
+  towerList.add(new Tower(tower));
+  
+  tower = new ArrayList<Cube>();
+  tower.add(cubes[cubeIndex++] = new Cube(200, 0, 10, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(205, Cube.EDGE_HEIGHT, 0, 0, 20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(200, 2*Cube.EDGE_HEIGHT, 4, 0, 0, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(195, 3*Cube.EDGE_HEIGHT, 8, 0, -20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(200, 4*Cube.EDGE_HEIGHT, 3, 0, 0, 0));
+  towerList.add(new Tower(tower));
    
-    cubes[cubeIndex++] = new Cube(200, 0, 10, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(205, Cube.EDGE_HEIGHT, 0, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube(200, 2*Cube.EDGE_HEIGHT, 4, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(195, 3*Cube.EDGE_HEIGHT, 8, 0, -20, 0);
-    cubes[cubeIndex++] = new Cube(200, 4*Cube.EDGE_HEIGHT, 3, 0, 0, 0);
+  tower = new ArrayList<Cube>();
+  tower.add(cubes[cubeIndex++] = new Cube(10, 0 , Cube.EDGE_HEIGHT + 10, 0, 40, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(3, Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 8, 0, 20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(0, 2*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 10, 0, 40, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(0, 3*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 10, 0, 60, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(0, 4*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 10, 0, 40, 0));
+  towerList.add(new Tower(tower));
 
-    cubes[cubeIndex++] = new Cube(200, 0, 10, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(205, Cube.EDGE_HEIGHT, 0, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube(200, 2*Cube.EDGE_HEIGHT, 4, 0, 0, 0);
-    cubes[cubeIndex++] = new Cube(195, 3*Cube.EDGE_HEIGHT, 8, 0, -20, 0);
-     
-    cubes[cubeIndex++] = new Cube(10, 0 , Cube.EDGE_HEIGHT + 10, 0, 40, 0);
-    cubes[cubeIndex++] = new Cube(3, Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 8, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube(0, 2*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 10, 0, 40, 0);
-    cubes[cubeIndex++] = new Cube(0, 3*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 10, 0, 60, 0);
-    cubes[cubeIndex++] = new Cube(0, 4*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 10, 0, 40, 0);
-    
-    cubes[cubeIndex++] = new Cube(20, 0, 2*Cube.EDGE_HEIGHT + 18, 0, 40, 0);
-    cubes[cubeIndex++] = new Cube(30, Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 18, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube(25, 2*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 18, 0, 40, 0);
-    cubes[cubeIndex++] = new Cube(30, 3*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 18, 0, 60, 0);
-    cubes[cubeIndex++] = new Cube(32, 4*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 18, 0, 40, 0);
-    
-    cubes[cubeIndex++] = new Cube(210, 0, Cube.EDGE_HEIGHT + 15, 0, 40, 0);
-    cubes[cubeIndex++] = new Cube(215, Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 15, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube(218, 2*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 15, 0, 40, 0);
-    cubes[cubeIndex++] = new Cube(213, 3*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 15, 0, 60, 0);
-    cubes[cubeIndex++] = new Cube(210, 4*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 15, 0, 40, 0);
-    
-    cubes[cubeIndex++] = new Cube(210, 0, 2*Cube.EDGE_HEIGHT + 25, 0, 40, 0);
-    cubes[cubeIndex++] = new Cube(215, Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 25, 0, 20, 0);
-    cubes[cubeIndex++] = new Cube(212, 2*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 25, 0, 40, 0);
-    cubes[cubeIndex++] = new Cube(215, 3*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 25, 0, 60, 0);
-    cubes[cubeIndex++] = new Cube(210, 4*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 25, 0, 40, 0);
-         
-    return cubes;
-  }
+  tower = new ArrayList<Cube>();  
+  tower.add(cubes[cubeIndex++] = new Cube(20, 0, 2*Cube.EDGE_HEIGHT + 18, 0, 40, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(30, Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 18, 0, 20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(25, 2*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 18, 0, 40, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(30, 3*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 18, 0, 60, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(32, 4*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 18, 0, 40, 0));
+  towerList.add(new Tower(tower));
+  
+  tower = new ArrayList<Cube>();    
+  tower.add(cubes[cubeIndex++] = new Cube(210, 0, Cube.EDGE_HEIGHT + 15, 0, 40, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(215, Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 15, 0, 20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(218, 2*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 15, 0, 40, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(213, 3*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 15, 0, 60, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(210, 4*Cube.EDGE_HEIGHT, Cube.EDGE_HEIGHT + 15, 0, 40, 0));
+  towerList.add(new Tower(tower));
+  
+  tower = new ArrayList<Cube>();    
+  tower.add(cubes[cubeIndex++] = new Cube(210, 0, 2*Cube.EDGE_HEIGHT + 25, 0, 40, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(215, Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 25, 0, 20, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(212, 2*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 25, 0, 40, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(215, 3*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 25, 0, 60, 0));
+  tower.add(cubes[cubeIndex++] = new Cube(210, 4*Cube.EDGE_HEIGHT, 2*Cube.EDGE_HEIGHT + 25, 0, 40, 0));
+  towerList.add(new Tower(tower));
+       
+  return new Model(towerList, cubes);
+}
 
-  public PandaMapping[] buildPandaList() {
-    return new PandaMapping[] {
-      new PandaMapping(
-        "10.200.1.28", new int[][] {
-        {  1,  2,  3,  4 }, // ch1
-        {  5,  6,  7,  8 }, // ch2
-        {  9, 10, 11, 12 }, // ch3
-        { 13, 14, 15, 16 }, // ch4
-        { 17, 18, 19, 20 }, // ch5
-        { 21, 22, 23, 24 }, // ch6
-        { 25, 26, 27, 28 }, // ch7
-        { 29, 30, 31, 32 }, // ch8
-      }),
+public PandaMapping[] buildPandaList() {
+  return new PandaMapping[] {
+    new PandaMapping(
+      "10.200.1.28", new int[][] {
+      {  1,  2,  3,  4 }, // ch1
+      {  5,  6,  7,  8 }, // ch2
+      {  9, 10, 11, 12 }, // ch3
+      { 13, 14, 15, 16 }, // ch4
+      { 17, 18, 19, 20 }, // ch5
+      { 21, 22, 23, 24 }, // ch6
+      { 25, 26, 27, 28 }, // ch7
+      { 29, 30, 31, 32 }, // ch8
+    }),
 
-      new PandaMapping(
-        "10.200.1.29", new int[][] {
-        { 33, 34, 35, 36 }, // ch9
-        { 37, 38, 39, 40 }, // ch10
-        { 41, 42, 43, 44 }, // ch11
-        { 45, 46, 47, 48 }, // ch12
-        { 49, 50, 51, 52 }, // ch13
-        { 53, 54, 55, 56 }, // ch14
-        { 57, 58, 59, 60 }, // ch15
-        { 61, 62, 63, 64 }, // ch16
-      }),
-      
-    };
-  }
+    new PandaMapping(
+      "10.200.1.29", new int[][] {
+      { 33, 34, 35, 36 }, // ch9
+      { 37, 38, 39, 40 }, // ch10
+      { 41, 42, 43, 44 }, // ch11
+      { 45, 46, 47, 48 }, // ch12
+      { 49, 50, 51, 52 }, // ch13
+      { 53, 54, 55, 56 }, // ch14
+      { 57, 58, 59, 60 }, // ch15
+      { 61, 62, 63, 64 }, // ch16
+    }),
+    
+  };
 }
 
 class PandaMapping {

diff --git a/code/GLucose.jar b/code/GLucose.jar
index c8f7976cead46ef1389223192addd90c5d5669a8..3525e185d14bb71910f52411c518c4ef2917e3a9 100644 (file)
Binary files a/code/GLucose.jar and b/code/GLucose.jar differ