X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=_Internals.pde;h=425ea0e3c8a34532ef54f39f10bca368be15ba28;hb=270a8b44cd8296bb40fa74e4fcf2e7f7c4f1192c;hp=fb2a9c7a7167867f7b6d9927320e97b67b839701;hpb=25bee9c5e1f3d4e24d0604b3b4936c01e47b0c6c;p=SugarCubes.git diff --git a/_Internals.pde b/_Internals.pde index fb2a9c7..425ea0e 100644 --- a/_Internals.pde +++ b/_Internals.pde @@ -14,17 +14,13 @@ */ import glucose.*; -import glucose.control.*; -import glucose.effect.*; import glucose.model.*; -import glucose.pattern.*; -import glucose.transform.*; -import glucose.transition.*; import heronarts.lx.*; -import heronarts.lx.control.*; import heronarts.lx.effect.*; import heronarts.lx.modulator.*; +import heronarts.lx.parameter.*; import heronarts.lx.pattern.*; +import heronarts.lx.transform.*; import heronarts.lx.transition.*; import ddf.minim.*; import ddf.minim.analysis.*; @@ -40,9 +36,6 @@ final float TRAILER_WIDTH = 240; final float TRAILER_DEPTH = 97; final float TRAILER_HEIGHT = 33; -final int MaxCubeHeight = 7; -final int NumBackTowers = 18; - int targetFramerate = 60; int startMillis, lastMillis; @@ -140,7 +133,7 @@ void setup() { lx = glucose.lx; lx.enableKeyboardTempo(); logTime("Built GLucose engine"); - + // Set the patterns LXEngine engine = lx.engine; engine.setPatterns(patterns = _leftPatterns(glucose)); @@ -328,7 +321,7 @@ void drawDiagnostics(long drawNanos, long simulationNanos, long uiNanos, long ga } void drawSimulation(color[] simulationColors) { - camera( + camera( eyeX, eyeY, eyeZ, midX, midY, midZ, 0, -1, 0 @@ -370,7 +363,7 @@ void drawSimulation(color[] simulationColors) { noFill(); strokeWeight(2); beginShape(POINTS); - for (Point p : glucose.model.points) { + for (LXPoint p : glucose.model.points) { stroke(simulationColors[p.index]); vertex(p.x, p.y, p.z); }