rename Tim.pde -> TimBavaro.pde

[SugarCubes.git] / _Internals.pde

diff --git a/_Internals.pde b/_Internals.pde
index 82feb2d2b2e9509d78074e2d910523aacc133ac5..1b32abd1b17c647202ddc631a4e7df04b3de9813 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,11 +89,11 @@ 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) {
-    pandaBoards[pbi++] = new PandaDriver(pm.ip, glucose.model, pm.channelList);
+    pandaBoards[pbi++] = new PandaDriver(pm.ip, glucose.model, pm);
   }
   mappingTool = new MappingTool(glucose, pandaMappings);
   logTime("Built PandaDriver");
@@ -183,7 +181,7 @@ void draw() {
   endShape();
   
   noStroke();
-  fill(#292929);
+  fill(#393939);
   drawBox(BASS_X, 0, BASS_Z, 0, 0, 0, BASS_WIDTH, BASS_HEIGHT, BASS_DEPTH, Cube.CHANNEL_WIDTH);
   for (Cube c : glucose.model.cubes) {
     drawCube(c);