repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated midi stuff
[SugarCubes.git]
/
_Internals.pde
diff --git
a/_Internals.pde
b/_Internals.pde
index 5738ed21078afa6f64ef7ed42c3bb1c7897bdad3..9d6e2740a4aea94a54cd807202b86949403b6a98 100644
(file)
--- a/
_Internals.pde
+++ b/
_Internals.pde
@@
-39,7
+39,7
@@
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 MaxCubeHeight =
5
;
final int NumBackTowers = 9;
int targetFramerate = 60;
final int NumBackTowers = 9;
int targetFramerate = 60;
@@
-60,6
+60,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;
@@
-122,10
+123,6
@@
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
Engine engine = lx.engine;
engine.setPatterns(patterns = _leftPatterns(glucose));
// Set the patterns
Engine engine = lx.engine;
engine.setPatterns(patterns = _leftPatterns(glucose));
@@
-135,7
+132,11
@@
void setup() {
logTime("Built transitions");
glucose.lx.addEffects(effects(glucose));
logTime("Built effects");
logTime("Built transitions");
glucose.lx.addEffects(effects(glucose));
logTime("Built effects");
-
+
+ // 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];
@@
-196,16
+197,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") {
-
c
olors = lx.engine.getDeck(0).getColors();
+
simulationC
olors = lx.engine.getDeck(0).getColors();
} else if (displayMode == "B") {
} else if (displayMode == "B") {
-
c
olors = lx.engine.getDeck(1).getColors();
+
simulationC
olors = lx.engine.getDeck(1).getColors();
}
if (debugMode) {
}
if (debugMode) {
- debugUI.maskColors(colors);
+ debugUI.maskColors(simulationColors);
+ debugUI.maskColors(sendColors);
}
camera(
}
camera(
@@
-251,34
+255,25
@@
void draw() {
strokeWeight(2);
beginShape(POINTS);
for (Point p : glucose.model.points) {
strokeWeight(2);
beginShape(POINTS);
for (Point p : glucose.model.points) {
- stroke(
c
olors[p.index]);
- vertex(p.
fx, p.fy, p.f
z);
+ stroke(
simulationC
olors[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(
c
olors);
+ p.send(
sendC
olors);
}
}
}
}
@@
-458,6
+453,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();
@@
-512,7
+512,7
@@
void mouseReleased() {
}
}
}
}
-void mouseWheel(int delta) {
delta*=20;
+void mouseWheel(int delta) {
boolean wheeled = false;
for (UIContext context : overlays) {
wheeled |= context.mouseWheel(mouseX, mouseY, delta);
boolean wheeled = false;
for (UIContext context : overlays) {
wheeled |= context.mouseWheel(mouseX, mouseY, delta);