redo with new anti-GLucose

diff --git a/AlexGreen.pde b/AlexGreen.pde
index 54af5c04b14f40f24a35f963760afb4f793148f3..5a35b3e31bc24edb50b352d2d69d198569220436 100644 (file)
--- 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 5010a4ee16aeaee25e03cefb6ffca641d4b725ef..5b286f1c3c49c18d8eff9a36e9b7b291d69a7838 100644 (file)
--- 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 25d390f07fba7d653039521539f7dabd395a2ca4..5f46b967d6cfae3628f7f9f4645dd60af3d1fdb1 100644 (file)
--- 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 4abcc62c1226d1b25dd1a8fbb0b162bae8364966..07ddf386c9d990f300bc702d7a20cae892c33a44 100644 (file)
--- 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 806fec09f0f05957a31abc113867616fe3d153aa..fe18092e129a0bee2450c01cfb75ab3d68d40274 100644 (file)
--- 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 562aa869a3d3193b1294219ffb84355ac3b47920..5a198f0e608df954c68058678e480fafcff32998 100644 (file)
--- 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 a2d36fd24cdda3f460a26200abc2dd916374b30f..fea4a43d18a668070981be8d4c57fa745bbd75c4 100644 (file)
--- 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 ba0f110bc826a00aec85ce91e1b7ad52e9520c37..7750ab930c365a3322d635b6f82728483f0bca7c 100644 (file)
--- 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 (executable)
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 (file)
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 (executable)
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 (executable)
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 (executable)
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 (executable)
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 (file)
index 0000000..8630fa2
--- /dev/null
+++ b/sketch.properties
@@ -0,0 +1,2 @@
+mode.id=processing.mode.java.JavaMode
+mode=Java