modified mappings to render more cubes, modified internals

[SugarCubes.git] / _Internals.pde

diff --git a/_Internals.pde b/_Internals.pde
index eba174ca9cbcc1156a363f02e4842f2bd04bf786..cdd4ba5ac64d755b4665fc4f5070e2b15b48fb72 100644 (file)
--- a/_Internals.pde
+++ b/_Internals.pde
@@ -30,6 +30,7 @@ import ddf.minim.*;
 import ddf.minim.analysis.*;
 import processing.opengl.*;
 import rwmidi.*;
 import ddf.minim.analysis.*;
 import processing.opengl.*;
 import rwmidi.*;

+import java.lang.reflect.*;

 
 final int VIEWPORT_WIDTH = 900;
 final int VIEWPORT_HEIGHT = 700;
 
 final int VIEWPORT_WIDTH = 900;
 final int VIEWPORT_HEIGHT = 700;


@@ -39,6 +40,9 @@ final float TRAILER_WIDTH = 240;
 final float TRAILER_DEPTH = 97;
 final float TRAILER_HEIGHT = 33;
 
 final float TRAILER_DEPTH = 97;
 final float TRAILER_HEIGHT = 33;
 

+final int MaxCubeHeight = 7;
+final int NumBackTowers = 18;
+

 int targetFramerate = 60;
 int startMillis, lastMillis;
 
 int targetFramerate = 60;
 int startMillis, lastMillis;
 


@@ -46,8 +50,10 @@ int startMillis, lastMillis;
 GLucose glucose;
 HeronLX lx;
 LXPattern[] patterns;
 GLucose glucose;
 HeronLX lx;
 LXPattern[] patterns;

+Effects effects;

 MappingTool mappingTool;
 PandaDriver[] pandaBoards;
 MappingTool mappingTool;
 PandaDriver[] pandaBoards;

+PresetManager presetManager;

 MidiEngine midiEngine;
 
 // Display configuration mode
 MidiEngine midiEngine;
 
 // Display configuration mode


@@ -57,6 +63,7 @@ DebugUI debugUI;
 boolean uiOn = true;
 LXPattern restoreToPattern = null;
 PImage logo;
 boolean uiOn = true;
 LXPattern restoreToPattern = null;
 PImage logo;

+float[] hsb = new float[3];

 
 // Handles to UI objects
 UIContext[] overlays;
 
 // Handles to UI objects
 UIContext[] overlays;


@@ -65,6 +72,7 @@ UICrossfader uiCrossfader;
 UIMidi uiMidi;
 UIMapping uiMapping;
 UIDebugText uiDebugText;
 UIMidi uiMidi;
 UIMapping uiMapping;
 UIDebugText uiDebugText;

+UISpeed uiSpeed;

 
 // Camera variables
 float eyeR, eyeA, eyeX, eyeY, eyeZ, midX, midY, midZ;
 
 // Camera variables
 float eyeR, eyeA, eyeX, eyeY, eyeZ, midX, midY, midZ;


@@ -72,14 +80,43 @@ float eyeR, eyeA, eyeX, eyeY, eyeZ, midX, midY, midZ;
 /**
  * Engine construction and initialization.
  */
 /**
  * Engine construction and initialization.
  */

-LXPattern[] _patterns(GLucose glucose) {
+
+LXTransition _transition(GLucose glucose) {
+  return new DissolveTransition(glucose.lx).setDuration(1000);
+}
+
+LXPattern[] _leftPatterns(GLucose glucose) {

   LXPattern[] patterns = patterns(glucose);
   for (LXPattern p : patterns) {
   LXPattern[] patterns = patterns(glucose);
   for (LXPattern p : patterns) {

-    p.setTransition(new DissolveTransition(glucose.lx).setDuration(1000));
+    p.setTransition(_transition(glucose));

   }
   return patterns;
 }
 
   }
   return patterns;
 }
 

+LXPattern[] _rightPatterns(GLucose glucose) {
+  LXPattern[] patterns = _leftPatterns(glucose);
+  LXPattern[] rightPatterns = new LXPattern[patterns.length+1];
+  int i = 0;
+  rightPatterns[i++] = new BlankPattern(glucose).setTransition(_transition(glucose));
+  for (LXPattern p : patterns) {
+    rightPatterns[i++] = p;
+  }
+  return rightPatterns;
+}
+
+LXEffect[] _effectsArray(Effects effects) {
+  List<LXEffect> effectList = new ArrayList<LXEffect>();
+  for (Field f : effects.getClass().getDeclaredFields()) {
+    try {
+      Object val = f.get(effects);
+      if (val instanceof LXEffect) {
+        effectList.add((LXEffect)val);
+      }
+    } catch (IllegalAccessException iax) {}
+  }
+  return effectList.toArray(new LXEffect[]{});
+} 
+

 void logTime(String evt) {
   int now = millis();
   println(evt + ": " + (now - lastMillis) + "ms");
 void logTime(String evt) {
   int now = millis();
   println(evt + ": " + (now - lastMillis) + "ms");


@@ -102,20 +139,24 @@ void setup() {
   lx.enableKeyboardTempo();
   logTime("Built GLucose engine");
   
   lx.enableKeyboardTempo();
   logTime("Built GLucose engine");
   

-  // MIDI devices
-  midiEngine = new MidiEngine();
-  logTime("Setup MIDI devices");
-

   // Set the patterns
   // Set the patterns

-  Engine engine = lx.engine;
-  engine.setPatterns(patterns = _patterns(glucose));
-  engine.addDeck(_patterns(glucose));
+  LXEngine engine = lx.engine;
+  engine.setPatterns(patterns = _leftPatterns(glucose));
+  engine.addDeck(_rightPatterns(glucose));

   logTime("Built patterns");
   glucose.setTransitions(transitions(glucose));
   logTime("Built transitions");
   logTime("Built patterns");
   glucose.setTransitions(transitions(glucose));
   logTime("Built transitions");

-  glucose.lx.addEffects(effects(glucose));
+  glucose.lx.addEffects(_effectsArray(effects = new Effects()));

   logTime("Built effects");
   logTime("Built effects");

-    
+
+  // Preset manager
+  presetManager = new PresetManager();
+  logTime("Loaded presets");
+
+  // MIDI devices
+  midiEngine = new MidiEngine();
+  logTime("Setup MIDI devices");
+

   // Build output driver
   PandaMapping[] pandaMappings = buildPandaList();
   pandaBoards = new PandaDriver[pandaMappings.length];
   // Build output driver
   PandaMapping[] pandaMappings = buildPandaList();
   pandaBoards = new PandaDriver[pandaMappings.length];


@@ -129,13 +170,13 @@ void setup() {
   // Build overlay UI
   debugUI = new DebugUI(pandaMappings);
   overlays = new UIContext[] {
   // Build overlay UI
   debugUI = new DebugUI(pandaMappings);
   overlays = new UIContext[] {

-    uiPatternA = new UIPatternDeck(lx.engine.getDeck(0), "PATTERN A", 4, 4, 140, 324),
+    uiPatternA = new UIPatternDeck(lx.engine.getDeck(GLucose.LEFT_DECK), "PATTERN A", 4, 4, 140, 324),

     new UIBlendMode(4, 332, 140, 86),
     new UIEffects(4, 422, 140, 144),
     new UITempo(4, 570, 140, 50),
     new UIBlendMode(4, 332, 140, 86),
     new UIEffects(4, 422, 140, 144),
     new UITempo(4, 570, 140, 50),

-    new UISpeed(4, 624, 140, 50),
+    uiSpeed = new UISpeed(4, 624, 140, 50),

         
         

-    new UIPatternDeck(lx.engine.getDeck(1), "PATTERN B", width-144, 4, 140, 324),
+    new UIPatternDeck(lx.engine.getDeck(GLucose.RIGHT_DECK), "PATTERN B", width-144, 4, 140, 324),

     uiMidi = new UIMidi(midiEngine, width-144, 332, 140, 158),
     new UIOutput(width-144, 494, 140, 106),
     
     uiMidi = new UIMidi(midiEngine, width-144, 332, 140, 158),
     new UIOutput(width-144, 494, 140, 106),
     


@@ -176,16 +217,19 @@ void setup() {
 void draw() {
   // Draws the simulation and the 2D UI overlay
   background(40);
 void draw() {
   // Draws the simulation and the 2D UI overlay
   background(40);

-  color[] colors = glucose.getColors();

 
 

+  color[] simulationColors;
+  color[] sendColors;
+  simulationColors = sendColors = glucose.getColors();

   String displayMode = uiCrossfader.getDisplayMode();
   if (displayMode == "A") {
   String displayMode = uiCrossfader.getDisplayMode();
   if (displayMode == "A") {

-    colors = lx.engine.getDeck(0).getColors();
+    simulationColors = lx.engine.getDeck(GLucose.LEFT_DECK).getColors();

   } else if (displayMode == "B") {
   } else if (displayMode == "B") {

-    colors = lx.engine.getDeck(1).getColors();
+    simulationColors = lx.engine.getDeck(GLucose.RIGHT_DECK).getColors();

   }
   if (debugMode) {
   }
   if (debugMode) {

-    debugUI.maskColors(colors);
+    debugUI.maskColors(simulationColors);
+    debugUI.maskColors(sendColors);

   }
 
   camera(
   }
 
   camera(


@@ -217,10 +261,12 @@ void draw() {
   popMatrix();
   
   noStroke();
   popMatrix();
   
   noStroke();

-//  drawBassBox(glucose.model.bassBox);
-//  for (Speaker s : glucose.model.speakers) {
-//    drawSpeaker(s);
-//  }
+  if (glucose.model.bassBox.exists) {
+    drawBassBox(glucose.model.bassBox, false);
+  }
+  for (Speaker speaker : glucose.model.speakers) {
+    drawSpeaker(speaker);
+  }

   for (Cube c : glucose.model.cubes) {
     drawCube(c);
   }
   for (Cube c : glucose.model.cubes) {
     drawCube(c);
   }


@@ -228,51 +274,41 @@ void draw() {
   noFill();
   strokeWeight(2);
   beginShape(POINTS);
   noFill();
   strokeWeight(2);
   beginShape(POINTS);

-  // 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);
-    }
+  for (Point p : glucose.model.points) {
+    stroke(simulationColors[p.index]);
+    vertex(p.x, p.y, p.z);

   }
   endShape();
   
   // 2D Overlay UI
   drawUI();
     
   }
   endShape();
   
   // 2D Overlay UI
   drawUI();
     

-  // Send output colors
-  color[] sendColors = glucose.getColors();
-  if (debugMode) {
-    debugUI.maskColors(colors);
-  }
-  

   // Gamma correction here. Apply a cubic to the brightness
   // for better representation of dynamic range
   // Gamma correction here. Apply a cubic to the brightness
   // for better representation of dynamic range

-  for (int i = 0; i < colors.length; ++i) {
-    float b = brightness(colors[i]) / 100.f;
-    colors[i] = color(
-      hue(colors[i]),
-      saturation(colors[i]),
-      (b*b*b) * 100.
-    );
+  for (int i = 0; i < sendColors.length; ++i) {
+    lx.RGBtoHSB(sendColors[i], hsb);
+    float b = hsb[2];
+    sendColors[i] = lx.hsb(360.*hsb[0], 100.*hsb[1], 100.*(b*b*b));

   }
   
   // TODO(mcslee): move into GLucose engine
   for (PandaDriver p : pandaBoards) {
   }
   
   // TODO(mcslee): move into GLucose engine
   for (PandaDriver p : pandaBoards) {

-    p.send(colors);
+    p.send(sendColors);

   }
 }
 
   }
 }
 

-void drawBassBox(BassBox b) {
+void drawBassBox(BassBox b, boolean hasSub) {
+  

   float in = .15;
   float in = .15;

-
-  noStroke();
-  fill(#191919);
-  pushMatrix();
-  translate(b.x + BassBox.EDGE_WIDTH/2., b.y + BassBox.EDGE_HEIGHT/2, b.z + BassBox.EDGE_DEPTH/2.);
-  box(BassBox.EDGE_WIDTH-20*in, BassBox.EDGE_HEIGHT-20*in, BassBox.EDGE_DEPTH-20*in);
-  popMatrix();
+  
+  if (hasSub) {
+    noStroke();
+    fill(#191919);
+    pushMatrix();
+    translate(b.x + BassBox.EDGE_WIDTH/2., b.y + BassBox.EDGE_HEIGHT/2, b.z + BassBox.EDGE_DEPTH/2.);
+    box(BassBox.EDGE_WIDTH-20*in, BassBox.EDGE_HEIGHT-20*in, BassBox.EDGE_DEPTH-20*in);
+    popMatrix();
+  }

 
   noStroke();
   fill(#393939);
 
   noStroke();
   fill(#393939);


@@ -403,6 +439,44 @@ void keyPressed() {
     mappingTool.keyPressed(uiMapping);
   }
   switch (key) {
     mappingTool.keyPressed(uiMapping);
   }
   switch (key) {

+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+      if (!midiEngine.isQwertyEnabled()) {
+        presetManager.select(midiEngine.getFocusedDeck(), key - '1');
+      }
+      break;
+    
+    case '!':
+      if (!midiEngine.isQwertyEnabled()) presetManager.store(midiEngine.getFocusedDeck(), 0);
+      break;
+    case '@':
+      if (!midiEngine.isQwertyEnabled()) presetManager.store(midiEngine.getFocusedDeck(), 1);
+      break;
+    case '#':
+      if (!midiEngine.isQwertyEnabled()) presetManager.store(midiEngine.getFocusedDeck(), 2);
+      break;
+    case '$':
+      if (!midiEngine.isQwertyEnabled()) presetManager.store(midiEngine.getFocusedDeck(), 3);
+      break;
+    case '%':
+      if (!midiEngine.isQwertyEnabled()) presetManager.store(midiEngine.getFocusedDeck(), 4);
+      break;
+    case '^':
+      if (!midiEngine.isQwertyEnabled()) presetManager.store(midiEngine.getFocusedDeck(), 5);
+      break;
+    case '&':
+      if (!midiEngine.isQwertyEnabled()) presetManager.store(midiEngine.getFocusedDeck(), 6);
+      break;
+    case '*':
+      if (!midiEngine.isQwertyEnabled()) presetManager.store(midiEngine.getFocusedDeck(), 7);
+      break;
+      

     case '-':
     case '_':
       frameRate(--targetFramerate);
     case '-':
     case '_':
       frameRate(--targetFramerate);


@@ -410,7 +484,10 @@ void keyPressed() {
     case '=':
     case '+':
       frameRate(++targetFramerate);
     case '=':
     case '+':
       frameRate(++targetFramerate);

-      break;      
+      break; 
+    case 'b':
+      effects.boom.trigger();
+      break;    

     case 'd':
       if (!midiEngine.isQwertyEnabled()) {
         debugMode = !debugMode;
     case 'd':
       if (!midiEngine.isQwertyEnabled()) {
         debugMode = !debugMode;


@@ -434,6 +511,11 @@ void keyPressed() {
         }
       }
       break;
         }
       }
       break;

+    case 't':
+      if (!midiEngine.isQwertyEnabled()) {
+        lx.engine.setThreaded(!lx.engine.isThreaded());
+      }
+      break;

     case 'p':
       for (PandaDriver p : pandaBoards) {
         p.toggle();
     case 'p':
       for (PandaDriver p : pandaBoards) {
         p.toggle();


@@ -487,7 +569,7 @@ void mouseReleased() {
     context.mouseReleased(mouseX, mouseY);
   }
 }
     context.mouseReleased(mouseX, mouseY);
   }
 }

- 
+

 void mouseWheel(int delta) {
   boolean wheeled = false;
   for (UIContext context : overlays) {
 void mouseWheel(int delta) {
   boolean wheeled = false;
   for (UIContext context : overlays) {