From: Micah Elizabeth Scott <micah@scanlime.org>
Date: Wed, 5 Mar 2014 04:01:55 +0000 (-0800)
Subject: Merge local repository from hackathon
X-Git-Url: https://git.piment-noir.org/?p=SugarCubes.git;a=commitdiff_plain;h=22cc0977d83b137ab1b57490dc1dec5e5ae24544

Merge local repository from hackathon
---

22cc0977d83b137ab1b57490dc1dec5e5ae24544
diff --cc SugarCubes.pde
index 0afeefe,fb24acb..40c3ffe
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@@ -65,66 -65,74 +65,69 @@@ LXPattern[] patterns(LX lx) 
      
      // Alex G
       
 -     // Tim
 -    new TimMetronome(glucose),
 -    new TimPlanes(glucose),
 -    new TimPinwheels(glucose),
 -    new TimRaindrops(glucose),
 -    new TimCubes(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),
  
      // 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
 -    new GlitchPlasma(glucose),
 -    new FireEffect(glucose).setEligible(false),
 -    new StripBounce(glucose),
 -    new SoundRain(glucose).setEligible(false),
 -    new SoundSpikes(glucose).setEligible(false),
 -    new FaceSync(glucose),
 +    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(glucose),
 -    new Balance(glucose),
 -    
 -
 +    new Swim(lx),
 +    new Balance(lx),
      
      // 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),
  
+     // Micah
+     new Rings(glucose),
+ 
      // 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),
  
    };
  }