Restore mappings data to sugarcubes sketch. Called back from GLucose library.

[SugarCubes.git] / _Internals.pde

diff --git a/_Internals.pde b/_Internals.pde
index c93129f958becf2fb399afd4d6bb00c6455e7c7e..a103f13ace4630df806fb6b3f67dcc26f7686926 100644 (file)
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -1,4 +1,13 @@
 /**
+ *     DOUBLE BLACK DIAMOND        DOUBLE BLACK DIAMOND
+ *
+ *         //\\   //\\                 //\\   //\\  
+ *        ///\\\ ///\\\               ///\\\ ///\\\
+ *        \\\/// \\\///               \\\/// \\\///
+ *         \\//   \\//                 \\//   \\//
+ *
+ *        EXPERTS ONLY!!              EXPERTS ONLY!!
+ *
  * If you are an artist, you may ignore this file! It just sets
  * up the framework to run the patterns. Should not need modification
  * for general animation work.
@@ -7,19 +16,21 @@
 import glucose.*;
 import glucose.control.*;
 import glucose.effect.*;
+import glucose.model.*;
 import glucose.pattern.*;
+import glucose.transform.*;
 import glucose.transition.*;
-import glucose.model.*;
 import heronarts.lx.*;
 import heronarts.lx.control.*;
 import heronarts.lx.effect.*;
-import heronarts.lx.pattern.*;
 import heronarts.lx.modulator.*;
+import heronarts.lx.pattern.*;
 import heronarts.lx.transition.*;
 import ddf.minim.*;
 import ddf.minim.analysis.*;
 import processing.opengl.*;
 import java.lang.reflect.*;
+import rwmidi.*;
 
 final int VIEWPORT_WIDTH = 900;
 final int VIEWPORT_HEIGHT = 700;
@@ -44,7 +55,7 @@ void setup() {
   logTime("Created viewport");
 
   // Create the GLucose engine to run the cubes
-  glucose = new GLucose(this);
+  glucose = new GLucose(this, new SCMapping());
   lx = glucose.lx;
   logTime("Built GLucose engine");
   
@@ -59,9 +70,9 @@ void setup() {
   // Build overlay UI
   ui = new OverlayUI();
   logTime("Built overlay UI");
-  
+    
   // MIDI devices
-  SCMidiDevices.initializeStandardDevices(glucose);
+  SCMidiDevices.initializeStandardDevices(glucose, ui.patternKnobs, ui.transitionKnobs, ui.effectKnobs);
   logTime("Setup MIDI devices");
   
   println("Total setup: " + (millis() - startMillis) + "ms");