repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/sugarcubes/SugarCubes into alexgreen
[SugarCubes.git]
/
_Internals.pde
diff --git
a/_Internals.pde
b/_Internals.pde
index 41532f771384f4f5a350d4889ba3c709d7623bf3..2cc799f8eda4f94fcd7a6e3470ae33e4096f710c 100644
(file)
--- a/
_Internals.pde
+++ b/
_Internals.pde
@@
-4,7
+4,7
@@
* //\\ //\\ //\\ //\\
* ///\\\ ///\\\ ///\\\ ///\\\
* \\\/// \\\/// \\\/// \\\///
* //\\ //\\ //\\ //\\
* ///\\\ ///\\\ ///\\\ ///\\\
* \\\/// \\\/// \\\/// \\\///
- * \\// \\// \\// \\//
+ * \\// \\// \\// \\//
H
*
* EXPERTS ONLY!! EXPERTS ONLY!!
*
*
* EXPERTS ONLY!! EXPERTS ONLY!!
*
@@
-40,15
+40,15
@@
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 =
5
;
-final int NumBackTowers = 1
1
;
+final int MaxCubeHeight =
7
;
+final int NumBackTowers = 1
8
;
int targetFramerate = 60;
int startMillis, lastMillis;
// Core engine variables
GLucose glucose;
int targetFramerate = 60;
int startMillis, lastMillis;
// Core engine variables
GLucose glucose;
-
Heron
LX lx;
+LX lx;
LXPattern[] patterns;
Effects effects;
MappingTool mappingTool;
LXPattern[] patterns;
Effects effects;
MappingTool mappingTool;
@@
-72,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;
@@
-173,7
+174,7
@@
void setup() {
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(GLucose.RIGHT_DECK), "PATTERN B", width-144, 4, 140, 324),
uiMidi = new UIMidi(midiEngine, width-144, 332, 140, 158),
new UIPatternDeck(lx.engine.getDeck(GLucose.RIGHT_DECK), "PATTERN B", width-144, 4, 140, 324),
uiMidi = new UIMidi(midiEngine, width-144, 332, 140, 158),
@@
-222,9
+223,9
@@
void draw() {
simulationColors = sendColors = glucose.getColors();
String displayMode = uiCrossfader.getDisplayMode();
if (displayMode == "A") {
simulationColors = sendColors = glucose.getColors();
String displayMode = uiCrossfader.getDisplayMode();
if (displayMode == "A") {
- simulationColors = lx.engine.getDeck(
0
).getColors();
+ simulationColors = lx.engine.getDeck(
GLucose.LEFT_DECK
).getColors();
} else if (displayMode == "B") {
} else if (displayMode == "B") {
- simulationColors = lx.engine.getDeck(
1
).getColors();
+ simulationColors = lx.engine.getDeck(
GLucose.RIGHT_DECK
).getColors();
}
if (debugMode) {
debugUI.maskColors(simulationColors);
}
if (debugMode) {
debugUI.maskColors(simulationColors);