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 #21 from savanto/AntonK
[SugarCubes.git]
/
SugarCubes.pde
diff --git
a/SugarCubes.pde
b/SugarCubes.pde
index 6318339df09a42b134ff47510950155233699551..a685442b2eb1fcb5cb0a6ad61b10172647e08afe 100644
(file)
--- a/
SugarCubes.pde
+++ b/
SugarCubes.pde
@@
-24,15
+24,17
@@
*/
LXPattern[] patterns(GLucose glucose) {
*/
LXPattern[] patterns(GLucose glucose) {
- return new LXPattern[] {
+ return new LXPattern[] {
new SineSphere(glucose),
new SineSphere(glucose),
- new CubeCurl(glucose),
+ //new CubeCurl(glucose),
+
// Slee
// Slee
- new Cathedrals(glucose),
+ // new Cathedrals(glucose),
+ new Swarm(glucose),
new MidiMusic(glucose),
new Pulley(glucose),
new MidiMusic(glucose),
new Pulley(glucose),
- new Swarm(glucose),
+
new ViolinWave(glucose),
new BouncyBalls(glucose),
new SpaceTime(glucose),
new ViolinWave(glucose),
new BouncyBalls(glucose),
new SpaceTime(glucose),
@@
-41,12
+43,17
@@
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 CubeEQ(glucose).setEligible(false),
new PianoKeyPattern(glucose).setEligible(false),
new Traktor(glucose).setEligible(false),
new BassPod(glucose).setEligible(false),
new CubeEQ(glucose).setEligible(false),
new PianoKeyPattern(glucose).setEligible(false),
+ // AntonK
+ new AKPong(glucose),
+
// DanH
new Noise(glucose),
new Play (glucose),
// DanH
new Noise(glucose),
new Play (glucose),
@@
-55,9
+62,27
@@
LXPattern[] patterns(GLucose glucose) {
// Alex G
// Alex G
+ // Tim
+ new TimMetronome(glucose),
+ new TimPlanes(glucose),
+ new TimPinwheels(glucose),
+ new TimRaindrops(glucose),
+ new TimCubes(glucose),
+ // new TimTrace(glucose),
+ new TimSpheres(glucose),
- // Shaheen
- new HelixPattern(glucose).setEligible(false),
+ // Jackie
+ new JackieSquares(glucose),
+ new JackieLines(glucose),
+ new JackieDots(glucose),
+
+ // L8on
+ new L8onLife(glucose),
+ new L8onAutomata(glucose),
+ new L8onStrips(glucose),
+
+ // Vincent
+ new VSTowers(glucose),
// Toby
new GlitchPlasma(glucose),
// Toby
new GlitchPlasma(glucose),
@@
-70,21
+95,18
@@
LXPattern[] patterns(GLucose glucose) {
// Jack
new Swim(glucose),
new Balance(glucose),
// Jack
new Swim(glucose),
new Balance(glucose),
+
- // Tim
- new TimPlanes(glucose),
- new TimPinwheels(glucose),
- new TimRaindrops(glucose),
- new TimCubes(glucose),
- // new TimTrace(glucose),
- new TimSpheres(glucose),
-
+
// Ben
// new Sandbox(glucose),
new TowerParams(glucose),
new DriveableCrossSections(glucose),
new GranimTestPattern2(glucose),
// Ben
// new Sandbox(glucose),
new TowerParams(glucose),
new DriveableCrossSections(glucose),
new GranimTestPattern2(glucose),
+ // Shaheen
+ //new HelixPattern(glucose).setEligible(false),
+
//JR
new Gimbal(glucose),
//JR
new Gimbal(glucose),
@@
-104,7
+126,6
@@
LXPattern[] patterns(GLucose glucose) {
new TestBassMapping(glucose),
new TestFloorMapping(glucose),
new TestSpeakerMapping(glucose),
new TestBassMapping(glucose),
new TestFloorMapping(glucose),
new TestSpeakerMapping(glucose),
- new TestPerformancePattern(glucose),
// new TestHuePattern(glucose),
// new TestXPattern(glucose),
// new TestYPattern(glucose),
// new TestHuePattern(glucose),
// new TestXPattern(glucose),
// new TestYPattern(glucose),