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 728e34387ae8250151ab71cbae29e72f259ab950..61c453e34d88eaa31273e754b30f5224431ccd94 100644
(file)
--- a/
_Internals.pde
+++ b/
_Internals.pde
@@
-14,17
+14,13
@@
*/
import glucose.*;
*/
import glucose.*;
-import glucose.control.*;
-import glucose.effect.*;
import glucose.model.*;
import glucose.model.*;
-import glucose.pattern.*;
-import glucose.transform.*;
-import glucose.transition.*;
import heronarts.lx.*;
import heronarts.lx.*;
-import heronarts.lx.control.*;
import heronarts.lx.effect.*;
import heronarts.lx.modulator.*;
import heronarts.lx.effect.*;
import heronarts.lx.modulator.*;
+import heronarts.lx.parameter.*;
import heronarts.lx.pattern.*;
import heronarts.lx.pattern.*;
+import heronarts.lx.transform.*;
import heronarts.lx.transition.*;
import ddf.minim.*;
import ddf.minim.analysis.*;
import heronarts.lx.transition.*;
import ddf.minim.*;
import ddf.minim.analysis.*;
@@
-40,8
+36,8
@@
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;
int targetFramerate = 60;
int startMillis, lastMillis;
@@
-140,7
+136,7
@@
void setup() {
lx = glucose.lx;
lx.enableKeyboardTempo();
logTime("Built GLucose engine");
lx = glucose.lx;
lx.enableKeyboardTempo();
logTime("Built GLucose engine");
-
+
// Set the patterns
LXEngine engine = lx.engine;
engine.setPatterns(patterns = _leftPatterns(glucose));
// Set the patterns
LXEngine engine = lx.engine;
engine.setPatterns(patterns = _leftPatterns(glucose));
@@
-328,7
+324,7
@@
void drawDiagnostics(long drawNanos, long simulationNanos, long uiNanos, long ga
}
void drawSimulation(color[] simulationColors) {
}
void drawSimulation(color[] simulationColors) {
-
camera(
+ camera(
eyeX, eyeY, eyeZ,
midX, midY, midZ,
0, -1, 0
eyeX, eyeY, eyeZ,
midX, midY, midZ,
0, -1, 0
@@
-370,7
+366,7
@@
void drawSimulation(color[] simulationColors) {
noFill();
strokeWeight(2);
beginShape(POINTS);
noFill();
strokeWeight(2);
beginShape(POINTS);
- for (Point p : glucose.model.points) {
+ for (
LX
Point p : glucose.model.points) {
stroke(simulationColors[p.index]);
vertex(p.x, p.y, p.z);
}
stroke(simulationColors[p.index]);
vertex(p.x, p.y, p.z);
}