repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Model is now in processing, not glucose
[SugarCubes.git]
/
_Internals.pde
diff --git
a/_Internals.pde
b/_Internals.pde
index 6e985f123e9129f3c95794c13326879dd114f46d..1b313ccbad5620ec1f16e71e283874ba3b8125d5 100644
(file)
--- a/
_Internals.pde
+++ b/
_Internals.pde
@@
-14,9
+14,9
@@
*/
import glucose.*;
*/
import glucose.*;
-import glucose.model.*;
import heronarts.lx.*;
import heronarts.lx.effect.*;
import heronarts.lx.*;
import heronarts.lx.effect.*;
+import heronarts.lx.model.*;
import heronarts.lx.modulator.*;
import heronarts.lx.parameter.*;
import heronarts.lx.pattern.*;
import heronarts.lx.modulator.*;
import heronarts.lx.parameter.*;
import heronarts.lx.pattern.*;
@@
-30,6
+30,9
@@
import ddf.minim.analysis.*;
import processing.opengl.*;
import rwmidi.*;
import java.lang.reflect.*;
import processing.opengl.*;
import rwmidi.*;
import java.lang.reflect.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
final int VIEWPORT_WIDTH = 900;
final int VIEWPORT_HEIGHT = 700;
final int VIEWPORT_WIDTH = 900;
final int VIEWPORT_HEIGHT = 700;
@@
-287,14
+290,14
@@
class UICubesLayer extends UICameraComponent {
popMatrix();
noStroke();
popMatrix();
noStroke();
- for (Cube c :
glucose.
model.cubes) {
+ for (Cube c : model.cubes) {
drawCube(c);
}
noFill();
strokeWeight(2);
beginShape(POINTS);
drawCube(c);
}
noFill();
strokeWeight(2);
beginShape(POINTS);
- for (LXPoint p :
glucose.
model.points) {
+ for (LXPoint p : model.points) {
stroke(simulationColors[p.index]);
vertex(p.x, p.y, p.z);
}
stroke(simulationColors[p.index]);
vertex(p.x, p.y, p.z);
}