From: Mark Slee Date: Sat, 10 Aug 2013 01:39:25 +0000 (-0700) Subject: Merge branch 'newlayout' of https://github.com/sugarcubes/SugarCubes X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=f771cfe59e9703aad5acb80682e01fbb35ef8cd2;p=SugarCubes.git Merge branch 'newlayout' of https://github.com/sugarcubes/SugarCubes --- f771cfe59e9703aad5acb80682e01fbb35ef8cd2 diff --cc SugarCubes.pde index c0ab104,7d4cebf..1af65b0 --- a/SugarCubes.pde +++ b/SugarCubes.pde @@@ -34,11 -34,11 +34,13 @@@ LXPattern[] patterns(GLucose glucose) new Psychedelia(glucose), new CubeEQ(glucose), new PianoKeyPattern(glucose), + new WarmPlasma(glucose), + new FireTest(glucose), - // Basic test patterns for reference, not art - // new TestHuePattern(glucose), + // Basic test patterns for reference, not art + new TestCubePattern(glucose), + new TestHuePattern(glucose), + new TestProjectionPattern(glucose), // new TestXPattern(glucose), // new TestYPattern(glucose), // new TestZPattern(glucose),