New Heron and GLucose jars, bring bass box back

diff --git a/Audio.pde b/Audio.pde
old mode 100755 (executable)
new mode 100644 (file)
index 06390bc..6e36a29
--- a/Audio.pde
+++ b/Audio.pde
@@ -35,7 +35,7 @@ public static class GraphicEQ {
     numBands = this.fft.avgSize();
     bandVals = new LinearEnvelope[numBands];
     for (int i = 0; i < bandVals.length; ++i) {
-      bandVals[i] = new LinearEnvelope(0, 0, 500).trigger();
+      (bandVals[i] = new LinearEnvelope(0, 0, 500)).trigger();
     }
   }
   

diff --git a/_Internals.pde b/_Internals.pde
index 86c0661db5a43decec397ea751cce66a7468c1f9..5035ed59b6f8aeef7f4c7f232466929222924211 100644 (file)
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -187,9 +187,13 @@ void draw() {
   noFill();
   strokeWeight(2);
   beginShape(POINTS);
-  for (Point p : glucose.model.points) {
-    stroke(colors[p.index]);
-    vertex(p.fx, p.fy, p.fz);
+  // TODO(mcslee): restore when bassBox/speakers are right again
+  // for (Point p : glucose.model.points) {
+  for (Cube cube : glucose.model.cubes) {
+    for (Point p : cube.points) {
+      stroke(colors[p.index]);
+      vertex(p.fx, p.fy, p.fz);
+    }
   }
   endShape();
   

diff --git a/_Mappings.pde b/_Mappings.pde
index 3b4b2f37395e7a3767304ef3438462d2b74c5010..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);
 }
 
 /**

diff --git a/code/GLucose.jar b/code/GLucose.jar
index 39466d60690c25ec9b883119704576aa1358c123..c36c6e992b80915841af721effbb5d42337da86e 100755 (executable)
Binary files a/code/GLucose.jar and b/code/GLucose.jar differ

diff --git a/code/HeronLX.jar b/code/HeronLX.jar
index 004d86fff690ecd717aa0f41f9e03696583187f4..0445f9c712379acae4ce4499a2b08a9095cc2f02 100755 (executable)
Binary files a/code/HeronLX.jar and b/code/HeronLX.jar differ