Merge branch 'panda-refactor' of https://github.com/sugarcubes/SugarCubes

[SugarCubes.git] / SugarCubes.pde

diff --git a/SugarCubes.pde b/SugarCubes.pde
index 8428367fd1e209e9bf78489f8fb8b24a9f55ca63..3f6cc8f4e47494ad81954d9065c4fcc5c84985f8 100644 (file)
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@ -1,7 +1,7 @@
 /**
  *           +-+-+-+-+-+               +-+-+-+-+-+
  *          /         /|               |\         \
- *         /         / +               + \         \
+ *         /         / +               <+ \         \
  *        +-+-+-+-+-+  |   +-+-+-+-+   |  +-+-+-+-+-+
  *        |         |  +  /         \  +  |         |
  *        +   THE   + /  /           \  \ +  CUBES  +
@@ -25,29 +25,38 @@
 
 LXPattern[] patterns(GLucose glucose) {
   return new LXPattern[] {
-    new SpaceTime(glucose),
+    new ShiftingPlane(glucose),
+    new AskewPlanes(glucose),
     new Swarm(glucose),
+    new SpaceTime(glucose),
+    new Blinders(glucose),
+    new CrossSections(glucose),
+    new Psychedelia(glucose),
     new CubeEQ(glucose),
+    new PianoKeyPattern(glucose),
     
     // Basic test patterns for reference, not art
 //    new TestHuePattern(glucose),
 //    new TestXPattern(glucose),
 //    new TestYPattern(glucose),
 //    new TestZPattern(glucose),
+//    new TestProjectionPattern(glucose),
+
   };
 }
 
 LXTransition[] transitions(GLucose glucose) {
   return new LXTransition[] {
-    new DissolveTransition(lx).setDuration(3000),
+    new DissolveTransition(lx),
     new SwipeTransition(glucose),
-    new FadeTransition(lx).setDuration(2000),
+    new FadeTransition(lx),
   };
 }
 
 LXEffect[] effects(GLucose glucose) {
   return new LXEffect[] {
     new FlashEffect(lx),
+    new BoomEffect(glucose),
     new DesaturationEffect(lx),
   };
 }