X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=blobdiff_plain;f=SugarCubes.pde;fp=SugarCubes.pde;h=3dc97917c72f2e1437c59415beab5fff033a2d35;hp=e8b15735861fd95dcdc34620e201e459f055a0ee;hb=31b2d04277074b68d9933e11d1f361702454890b;hpb=ab65d40b549a354ba5f70b08c29d35d0971243cf

diff --git a/SugarCubes.pde b/SugarCubes.pde
index e8b1573..3dc9791 100644
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -15,17 +15,18 @@
  *
  * Welcome to the Sugar Cubes! This Processing sketch is a fun place to build
  * animations, effects, and interactions for the platform. Most of the icky
- * code guts are embedded in the GLucose library extension. If you're an
- * artist, you shouldn't need to worry about any of that.
+ * code guts are embedded in the HeronLX library, or files prefixed with
+ * an underscore. If you're an artist, you shouldn't need to worry about that.
  *
  * Below, you will find definitions of the Patterns, Effects, and Interactions.
  * If you're an artist, create a new tab in the Processing environment with
  * your name. Implement your classes there, and add them to the list below.
  */ 
 
-LXPattern[] patterns(GLucose glucose) {
+LXPattern[] patterns(LX lx) {
   return new LXPattern[] {        
 
+<<<<<<< HEAD
     new SineSphere(glucose),
     //new CubeCurl(glucose), 
      // DanH
@@ -34,12 +35,18 @@ LXPattern[] patterns(GLucose glucose) {
     new Pong (glucose),
     new Worms(glucose),
 
+=======
+    new SineSphere(lx),
+    //new CubeCurl(lx), 
+     
+>>>>>>> 21dffb1b77608cacc57382f3eb6eac3ed16054c3
     // Slee
-    // new Cathedrals(glucose),
-     new Swarm(glucose),
-    new MidiMusic(glucose),
-    new Pulley(glucose),
+    // new Cathedrals(lx),
+    new Swarm(lx),
+    new MidiMusic(lx),
+    new Pulley(lx),
     
+<<<<<<< HEAD
     new ViolinWave(glucose),
     new BouncyBalls(glucose),
     new SpaceTime(glucose),
@@ -64,14 +71,41 @@ LXPattern[] patterns(GLucose glucose) {
     new Swim(glucose),
     new Balance(glucose),
     
+=======
+    new ViolinWave(lx),
+    new BouncyBalls(lx),
+    new SpaceTime(lx),
+    new ShiftingPlane(lx),
+    new AskewPlanes(lx),
+    new Blinders(lx),
+    new CrossSections(lx),
+    new Psychedelia(lx),
+
+    new MultipleCubes(lx),
+    
+    new Traktor(lx).setEligible(false),
+    new BassPod(lx).setEligible(false),
+    new CubeEQ(lx).setEligible(false),
+    new PianoKeyPattern(lx).setEligible(false),
+
+    // AntonK
+    new AKPong(lx),
+
+    // DanH
+    new Noise(lx),
+    new Play (lx),
+    new Pong (lx),
+    new Worms(lx),
+>>>>>>> 21dffb1b77608cacc57382f3eb6eac3ed16054c3
 
     
     
     // JR
-    new Gimbal(glucose),
+    new Gimbal(lx),
     
     // Alex G
      
+<<<<<<< HEAD
      // Tim
     new TimMetronome(glucose),
     new TimPlanes(glucose),
@@ -79,21 +113,32 @@ LXPattern[] patterns(GLucose glucose) {
     
     // new TimTrace(glucose),
     new TimSpheres(glucose),
+=======
+    // Tim
+    new TimMetronome(lx),
+    new TimPlanes(lx),
+    new TimPinwheels(lx),
+    new TimRaindrops(lx),
+    new TimCubes(lx),
+    // new TimTrace(lx),
+    new TimSpheres(lx),
+>>>>>>> 21dffb1b77608cacc57382f3eb6eac3ed16054c3
 
     // Jackie
-    new JackieSquares(glucose),
-    new JackieLines(glucose),
-    new JackieDots(glucose),
+    new JackieSquares(lx),
+    new JackieLines(lx),
+    new JackieDots(lx),
 
     // L8on
-    new L8onAutomata(glucose),
-    new L8onLife(glucose),
-    new L8onStripLife(glucose),
+    new L8onAutomata(lx),
+    new L8onLife(lx),
+    new L8onStripLife(lx),
 
     // Vincent
-    new VSTowers(glucose),
+    new VSTowers(lx),
     
     // Toby
+<<<<<<< HEAD
     new GlitchPlasma(glucose),
     new FireEffect(glucose).setEligible(false),
    
@@ -102,63 +147,68 @@ LXPattern[] patterns(GLucose glucose) {
     new FaceSync(glucose),
 
     // Jack
+=======
+    new GlitchPlasma(lx),
+    new FireEffect(lx).setEligible(false),
+    new StripBounce(lx),
+    new SoundRain(lx).setEligible(false),
+    new SoundSpikes(lx).setEligible(false),
+    new FaceSync(lx),
+
+    // Jack
+    new Swim(lx),
+    new Balance(lx),
+>>>>>>> 21dffb1b77608cacc57382f3eb6eac3ed16054c3
     
     // Ben
-    // new Sandbox(glucose),
-    new TowerParams(glucose),
-    new DriveableCrossSections(glucose),
-    new GranimTestPattern2(glucose),
+    // new Sandbox(lx),
+    new TowerParams(lx),
+    new DriveableCrossSections(lx),
+    new GranimTestPattern2(lx),
     
     // Shaheen
-    //new HelixPattern(glucose).setEligible(false),
+    // new HelixPattern(lx).setEligible(false),
     
     // Sam
-    new JazzRainbow(glucose),
+    new JazzRainbow(lx),
     
     // Arjun
-    new TelevisionStatic(glucose),
-    new AbstractPainting(glucose),
-    new Spirality(glucose),
+    new TelevisionStatic(lx),
+    new AbstractPainting(lx),
+    new Spirality(lx),
 
     // Basic test patterns for reference, not art    
-    new TestCubePattern(glucose),
-    new TestTowerPattern(glucose),
-    new TestProjectionPattern(glucose),
-    new TestStripPattern(glucose),
-    new TestBassMapping(glucose),
-    new TestFloorMapping(glucose),
-    new TestSpeakerMapping(glucose),    
-    // new TestHuePattern(glucose),
-    // new TestXPattern(glucose),
-    // new TestYPattern(glucose),
-    // new TestZPattern(glucose),
+    new TestCubePattern(lx),
+    new TestTowerPattern(lx),
+    new TestProjectionPattern(lx),
+    new TestStripPattern(lx),
+    // new TestHuePattern(lx),
+    // new TestXPattern(lx),
+    // new TestYPattern(lx),
+    // new TestZPattern(lx),
 
   };
 }
 
-LXTransition[] transitions(GLucose glucose) {
+LXTransition[] transitions(LX lx) {
   return new LXTransition[] {
     new DissolveTransition(lx),
-    new AddTransition(glucose),
-    new MultiplyTransition(glucose),
-    new OverlayTransition(glucose),
-    new DodgeTransition(glucose),
-    new SwipeTransition(glucose),
+    new AddTransition(lx),
+    new MultiplyTransition(lx),
+    new OverlayTransition(lx),
+    new DodgeTransition(lx),
+    new SwipeTransition(lx),
     new FadeTransition(lx),
-//  new SubtractTransition(glucose),	// similar to multiply - dh
-//  new BurnTransition(glucose),		// similar to multiply - dh
-//  new ScreenTransition(glucose), 		// same as add -dh
-//  new SoftLightTransition(glucose),	// same as overlay -dh
   };
 }
 
 // Handles to globally triggerable effects 
 class Effects {
   FlashEffect flash = new FlashEffect(lx);
-  BoomEffect boom = new BoomEffect(glucose);
-  BlurEffect blur = new BlurEffect(glucose);
-  QuantizeEffect quantize = new QuantizeEffect(glucose);
-  ColorFuckerEffect colorFucker = new ColorFuckerEffect(glucose);
+  BoomEffect boom = new BoomEffect(lx);
+  BlurEffect blur = new BlurEffect(lx);
+  QuantizeEffect quantize = new QuantizeEffect(lx);
+  ColorFuckerEffect colorFucker = new ColorFuckerEffect(lx);
   
   Effects() {
     blur.enable();