repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #17 from l8on/master
[SugarCubes.git]
/
SugarCubes.pde
diff --git
a/SugarCubes.pde
b/SugarCubes.pde
index a6c4e4105e95a92587c5647262bd24d11dcdc696..2c9ecab95c290689624babc0a7d224167ed8453d 100644
(file)
--- a/
SugarCubes.pde
+++ b/
SugarCubes.pde
@@
-25,8
+25,10
@@
LXPattern[] patterns(GLucose glucose) {
return new LXPattern[] {
LXPattern[] patterns(GLucose glucose) {
return new LXPattern[] {
-
+ new SineSphere(glucose),
+ //new CubeCurl(glucose),
+
// Slee
// new Cathedrals(glucose),
new Swarm(glucose),
// Slee
// new Cathedrals(glucose),
new Swarm(glucose),
@@
-41,6
+43,8
@@
LXPattern[] patterns(GLucose glucose) {
new Blinders(glucose),
new CrossSections(glucose),
new Psychedelia(glucose),
new Blinders(glucose),
new CrossSections(glucose),
new Psychedelia(glucose),
+
+ new MultipleCubes(glucose),
new Traktor(glucose).setEligible(false),
new BassPod(glucose).setEligible(false),
new Traktor(glucose).setEligible(false),
new BassPod(glucose).setEligible(false),
@@
-54,18
+58,27
@@
LXPattern[] patterns(GLucose glucose) {
new Worms(glucose),
// Alex G
new Worms(glucose),
// Alex G
- new SineSphere(glucose),
- //new CubeCurl(glucose),
// Tim
// Tim
+ new TimMetronome(glucose),
new TimPlanes(glucose),
new TimPinwheels(glucose),
new TimRaindrops(glucose),
new TimCubes(glucose),
// new TimTrace(glucose),
new TimSpheres(glucose),
new TimPlanes(glucose),
new TimPinwheels(glucose),
new TimRaindrops(glucose),
new TimCubes(glucose),
// new TimTrace(glucose),
new TimSpheres(glucose),
+
+
+
+ // Jackie
+ new JackieSquares(glucose),
+ new JackieLines(glucose),
+ new JackieDots(glucose),
+
+ // Vincent
+ new VSTowers(glucose),
// Toby
new GlitchPlasma(glucose),
// Toby
new GlitchPlasma(glucose),
@@
-79,6
+92,8
@@
LXPattern[] patterns(GLucose glucose) {
new Swim(glucose),
new Balance(glucose),
new Swim(glucose),
new Balance(glucose),
+ // L8on
+ new Life(glucose),
// Ben
// new Sandbox(glucose),
// Ben
// new Sandbox(glucose),