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 #16 from tbavaro/timmetronome
[SugarCubes.git]
/
SugarCubes.pde
diff --git
a/SugarCubes.pde
b/SugarCubes.pde
index d5892485e36658485b948be433512458c14d9868..5fb58504c1b4a7266425a854bccf87df82478aa9 100644
(file)
--- a/
SugarCubes.pde
+++ b/
SugarCubes.pde
@@
-22,12
+22,21
@@
* 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[] patterns(GLucose glucose) {
return new LXPattern[] {
LXPattern[] patterns(GLucose glucose) {
return new LXPattern[] {
+ new SineSphere(glucose),
+ //new CubeCurl(glucose),
+
// Slee
// Slee
- new Swarm(glucose),
+ // new Cathedrals(glucose),
+ new Swarm(glucose),
+ new MidiMusic(glucose),
+ new Pulley(glucose),
+
+ new ViolinWave(glucose),
+ new BouncyBalls(glucose),
new SpaceTime(glucose),
new ShiftingPlane(glucose),
new AskewPlanes(glucose),
new SpaceTime(glucose),
new ShiftingPlane(glucose),
new AskewPlanes(glucose),
@@
-42,14
+51,32
@@
LXPattern[] patterns(GLucose glucose) {
// DanH
new Noise(glucose),
// DanH
new Noise(glucose),
- new Play(glucose),
- new Pong(glucose),
+ new Play (glucose),
+ new Pong (glucose),
+ new Worms(glucose),
// Alex G
// Alex G
- new SineSphere(glucose),
+
+ // 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),
+
+
+
+ // Vincent
+ new VSTowers(glucose),
// Toby
new GlitchPlasma(glucose),
// Toby
new GlitchPlasma(glucose),
@@
-63,20
+90,16
@@
LXPattern[] patterns(GLucose glucose) {
new Swim(glucose),
new Balance(glucose),
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),
@@
-107,25
+130,31
@@
LXPattern[] patterns(GLucose glucose) {
LXTransition[] transitions(GLucose glucose) {
return new LXTransition[] {
new DissolveTransition(lx),
LXTransition[] transitions(GLucose glucose) {
return new LXTransition[] {
new DissolveTransition(lx),
+ new AddTransition(glucose),
new MultiplyTransition(glucose),
new MultiplyTransition(glucose),
- new ScreenTransition(glucose),
- new BurnTransition(glucose),
- new DodgeTransition(glucose),
new OverlayTransition(glucose),
new OverlayTransition(glucose),
- new AddTransition(glucose),
- new SubtractTransition(glucose),
- new SoftLightTransition(glucose),
+ new DodgeTransition(glucose),
new SwipeTransition(glucose),
new FadeTransition(lx),
new SwipeTransition(glucose),
new FadeTransition(lx),
+// new SubtractTransition(glucose), // similar to multiply - dh
+// new BurnTransition(glucose), // similar to multiply - dh
+// new ScreenTransition(glucose), // same as add -dh
+// new SoftLightTransition(glucose), // same as overlay -dh
};
}
};
}
-LXEffect[] effects(GLucose glucose) {
- return new LXEffect[] {
- new FlashEffect(lx),
- new BoomEffect(glucose),
- new BlurEffect(glucose),
- new DesaturationEffect(lx),
- new ColorFuckerEffect(glucose),
- };
+// Handles to globally triggerable effects
+class Effects {
+ FlashEffect flash = new FlashEffect(lx);
+ BoomEffect boom = new BoomEffect(glucose);
+ BlurEffect blur = new BlurEffect(glucose);
+ QuantizeEffect quantize = new QuantizeEffect(glucose);
+ ColorFuckerEffect colorFucker = new ColorFuckerEffect(glucose);
+
+ Effects() {
+ blur.enable();
+ quantize.enable();
+ colorFucker.enable();
+ }
}
}
+