repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'alexdesktopworking' of https://github.com/sugarcubes/SugarCubes into...
[SugarCubes.git]
/
SugarCubes.pde
diff --git
a/SugarCubes.pde
b/SugarCubes.pde
index c80a4da38fd826b5ff3616cf98f742e93691d060..7f8be7b14a9837d7f5fb5bb5453030b94f804110 100644
(file)
--- a/
SugarCubes.pde
+++ b/
SugarCubes.pde
@@
-22,12
+22,18
@@
* If you're an artist, create a new tab in the Processing environment with
* your name. Implement your classes there, and add them to the list below.
*/
* If you're an artist, create a new tab in the Processing environment with
* your name. Implement your classes there, and add them to the list below.
*/
+LXPattern gplay;
LXPattern[] patterns(GLucose glucose) {
return new LXPattern[] {
LXPattern[] patterns(GLucose glucose) {
return new LXPattern[] {
+
+ new Gimbal(glucose),
+
+ // DMK
// Slee
new Swarm(glucose),
// Slee
new Swarm(glucose),
+ //new ScreenScrape(glucose),
new SpaceTime(glucose),
new ShiftingPlane(glucose),
new AskewPlanes(glucose),
new SpaceTime(glucose),
new ShiftingPlane(glucose),
new AskewPlanes(glucose),
@@
-40,9
+46,10
@@
LXPattern[] patterns(GLucose glucose) {
new CubeEQ(glucose).setEligible(false),
new PianoKeyPattern(glucose).setEligible(false),
new CubeEQ(glucose).setEligible(false),
new PianoKeyPattern(glucose).setEligible(false),
- // Dan
- new Pong(glucose),
+ // DanH
new Noise(glucose),
new Noise(glucose),
+ gplay=new Play(glucose), // XXX do this properly
+ new Pong(glucose),
// Alex G
new SineSphere(glucose),
// Alex G
new SineSphere(glucose),
@@
-112,8
+119,8
@@
LXEffect[] effects(GLucose glucose) {
return new LXEffect[] {
new FlashEffect(lx),
new BoomEffect(glucose),
return new LXEffect[] {
new FlashEffect(lx),
new BoomEffect(glucose),
- new DesaturationEffect(lx),
- new ColorFuckerEffect(glucose),
+ //new DesaturationEffect(lx),
+ //new ColorFuckerEffect(glucose),
+ new DualBlender(glucose),
};
}
};
}
-