X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=SugarCubes.pde;h=cf54800cf0e44508eead6c77ee7872f287d8872c;hb=09437b3e395227ad2061512f9f0333091aeef2b7;hp=9faf3ec45d2babd96a24089d549e86c370d96a90;hpb=e530876366cf4c07a5e77b7e8890dff376cbcd3c;p=SugarCubes.git diff --git a/SugarCubes.pde b/SugarCubes.pde index 9faf3ec..cf54800 100644 --- a/SugarCubes.pde +++ b/SugarCubes.pde @@ -25,10 +25,13 @@ LXPattern[] patterns(GLucose glucose) { return new LXPattern[] { + + new SineSphere(glucose), + new CubeCurl(glucose), - // Slee - // new MidiMusic(glucose), + new Cathedrals(glucose), + new MidiMusic(glucose), new Pulley(glucose), new Swarm(glucose), new ViolinWave(glucose), @@ -52,8 +55,7 @@ LXPattern[] patterns(GLucose glucose) { new Worms(glucose), // Alex G - new SineSphere(glucose), -// new CubeCurl(glucose), + // Shaheen new HelixPattern(glucose).setEligible(false), @@ -103,7 +105,6 @@ LXPattern[] patterns(GLucose glucose) { new TestBassMapping(glucose), new TestFloorMapping(glucose), new TestSpeakerMapping(glucose), - new TestPerformancePattern(glucose), // new TestHuePattern(glucose), // new TestXPattern(glucose), // new TestYPattern(glucose), @@ -129,18 +130,17 @@ LXTransition[] transitions(GLucose glucose) { } // Handles to globally triggerable effects -BoomEffect EFF_boom; -FlashEffect EFF_flash; -ColorFuckerEffect EFF_colorFucker; -BlurEffect EFF_blur; -QuantizeEffect EFF_quantize; - -LXEffect[] effects(GLucose glucose) { - return new LXEffect[] { - EFF_flash = new FlashEffect(lx), - EFF_boom = new BoomEffect(glucose), - (EFF_blur = new BlurEffect(glucose)).enable(), - (EFF_quantize = new QuantizeEffect(glucose)).enable(), - (EFF_colorFucker = new ColorFuckerEffect(glucose)).enable(), - }; +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); + + Effects() { + blur.enable(); + quantize.enable(); + colorFucker.enable(); + } } +