From: Ben Morrow Date: Mon, 3 Mar 2014 06:02:04 +0000 (-0800) Subject: redo with new anti-GLucose X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=commitdiff_plain;h=7d60f6f6ea82fd5c9794524ce11d40e7d6c00bf7;hp=45717f713884d7f7f1f7e97003c47ab43edb8ab1 redo with new anti-GLucose --- diff --git a/AlexGreen.pde b/AlexGreen.pde index 54af5c0..5a35b3e 100644 --- a/AlexGreen.pde +++ b/AlexGreen.pde @@ -1,3 +1,4 @@ + class SineSphere extends APat { float modelrad = sqrt((model.xMax)*(model.xMax) + (model.yMax)*(model.yMax) + (model.zMax)*(model.zMax)); private BasicParameter yrotspeed = new BasicParameter("yspeed", 3000, 1, 10000); diff --git a/AntonK.pde b/AntonK.pde index 5010a4e..5b286f1 100644 --- a/AntonK.pde +++ b/AntonK.pde @@ -1,7 +1,8 @@ /************************************************************** * WORKING PATTERNS **************************************************************/ - +import java.util.List; +import java.util.LinkedList; class AKPong extends SCPattern { private final BasicParameter speed = new BasicParameter("Speed", 0); diff --git a/_Grizzly.pde b/Grizzly.pde similarity index 99% rename from _Grizzly.pde rename to Grizzly.pde index 25d390f..5f46b96 100644 --- a/_Grizzly.pde +++ b/Grizzly.pde @@ -11,7 +11,7 @@ * If you are an artist, you may ignore this file! It contains * the code to drive grizzly board outputs. */ - +import java.net.*; GrizzlyOutput[] buildGrizzlies() throws SocketException, UnknownHostException { return new GrizzlyOutput[] { new GrizzlyOutput(lx, "192.168.88.100", 6, 5, 6, 7, 7, 8, 1, 2, 4, 3, 11, 10, 9, 9, 12, 13), diff --git a/_Internals.pde b/Internals.pde similarity index 100% rename from _Internals.pde rename to Internals.pde diff --git a/JR.pde b/JR.pde index 4abcc62..07ddf38 100644 --- a/JR.pde +++ b/JR.pde @@ -1,3 +1,5 @@ +import java.util.Map; +import java.util.TreeMap; color BLACK = #000000; class Gimbal extends SCPattern { diff --git a/JackieBavaro.pde b/JackieBavaro.pde index 806fec0..fe18092 100644 --- a/JackieBavaro.pde +++ b/JackieBavaro.pde @@ -1,3 +1,4 @@ +import java.util.Iterator; class JackieSquares extends SCPattern { private BasicParameter rateParameter = new BasicParameter("RATE", 0.25); private BasicParameter attackParameter = new BasicParameter("ATTK", 0.3); diff --git a/_MIDI.pde b/MIDI.pde similarity index 99% rename from _MIDI.pde rename to MIDI.pde index 562aa86..5a198f0 100644 --- a/_MIDI.pde +++ b/MIDI.pde @@ -264,7 +264,7 @@ public class VirtualKeyMidiInput extends SCMidiInput { } else { mapKeys(); } - registerKeyEvent(this); + //registerKeyEvent(this); } private void mapAPC() { @@ -321,7 +321,7 @@ public class VirtualKeyMidiInput extends SCMidiInput { if (!enabled) { return; } - char c = Character.toLowerCase(e.getKeyChar()); + /* char c = 0;//0Character.toLowerCase(e.getKeyChar()); NoteMeta nm = keyToNote.get(c); if (nm != null) { switch (e.getID()) { @@ -342,7 +342,7 @@ public class VirtualKeyMidiInput extends SCMidiInput { octaveShift = constrain(octaveShift+1, -4, 4); break; } - } + }*/ } } @@ -523,7 +523,7 @@ public class APC40MidiInput extends GenericDeviceMidiInput { return true; case 83: // scene 2 - effects.flash.trigger(); + //effects.flash.trigger(); return true; case 84: // scene 3 diff --git a/_Mappings.pde b/Mappings.pde similarity index 100% rename from _Mappings.pde rename to Mappings.pde diff --git a/MarkSlee.pde b/MarkSlee.pde index a2d36fd..fea4a43 100644 --- a/MarkSlee.pde +++ b/MarkSlee.pde @@ -1,3 +1,4 @@ +import java.util.Stack; class Cathedrals extends SCPattern { private final BasicParameter xpos = new BasicParameter("XPOS", 0.5); @@ -222,7 +223,7 @@ class MidiMusic extends SCPattern { effects.boom.trigger(); break; case 40: - effects.flash.trigger(); + //effects.flash.trigger(); break; } } diff --git a/_Model.pde b/Model.pde similarity index 100% rename from _Model.pde rename to Model.pde diff --git a/_Presets.pde b/Presets.pde similarity index 100% rename from _Presets.pde rename to Presets.pde diff --git a/_UIImplementation.pde b/UIImplementation.pde similarity index 99% rename from _UIImplementation.pde rename to UIImplementation.pde index ba0f110..7750ab9 100644 --- a/_UIImplementation.pde +++ b/UIImplementation.pde @@ -10,7 +10,7 @@ * * Custom UI components using the framework. */ - +import java.util.Arrays; class UICubesLayer extends UICameraComponent { void onDraw(UI ui) { color[] simulationColors = lx.getColors(); @@ -28,9 +28,7 @@ class UICubesLayer extends UICameraComponent { simulationNanos = System.nanoTime() - simulationStart; camera(); - javax.media.opengl.GL gl = ((PGraphicsOpenGL)g).beginGL(); - gl.glClear(javax.media.opengl.GL.GL_DEPTH_BUFFER_BIT); - ((PGraphicsOpenGL)g).endGL(); + PGraphicsOpenGL gl = (PGraphicsOpenGL) g; strokeWeight(1); } diff --git a/libraries/HeronLX.jar b/libraries/HeronLX.jar new file mode 100755 index 0000000..7c388a7 Binary files /dev/null and b/libraries/HeronLX.jar differ diff --git a/libraries/JGraphT.jar b/libraries/JGraphT.jar new file mode 100644 index 0000000..1db92e6 Binary files /dev/null and b/libraries/JGraphT.jar differ diff --git a/libraries/ScreenShot.dll b/libraries/ScreenShot.dll new file mode 100755 index 0000000..68a6c99 Binary files /dev/null and b/libraries/ScreenShot.dll differ diff --git a/libraries/ScreenShot.jar b/libraries/ScreenShot.jar new file mode 100755 index 0000000..c75b8de Binary files /dev/null and b/libraries/ScreenShot.jar differ diff --git a/libraries/rwmidi.jar b/libraries/rwmidi.jar new file mode 100755 index 0000000..4788ff6 Binary files /dev/null and b/libraries/rwmidi.jar differ diff --git a/libraries/toxiclibscore.jar b/libraries/toxiclibscore.jar new file mode 100755 index 0000000..18fbbfe Binary files /dev/null and b/libraries/toxiclibscore.jar differ diff --git a/sketch.properties b/sketch.properties new file mode 100644 index 0000000..8630fa2 --- /dev/null +++ b/sketch.properties @@ -0,0 +1,2 @@ +mode.id=processing.mode.java.JavaMode +mode=Java