repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More mapping cleanup, got rid of tons of mess code, clean definitions now
[SugarCubes.git]
/
SugarCubes.pde
diff --git
a/SugarCubes.pde
b/SugarCubes.pde
index 5ce692746d69ef6230a47f29b7fb2d19a9171df3..ff85065f00b8519e045ab2025606a0d76aa09d6d 100644
(file)
--- a/
SugarCubes.pde
+++ b/
SugarCubes.pde
@@
-24,33
+24,68
@@
*/
LXPattern[] patterns(GLucose glucose) {
*/
LXPattern[] patterns(GLucose glucose) {
- return new LXPattern[] {
-
+ return new LXPattern[] {
+
+ new SineSphere(glucose),
+ //new CubeCurl(glucose),
+
// Slee
// Slee
- new Flitters(glucose),
- 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 Blinders(glucose),
new CrossSections(glucose),
new Psychedelia(glucose),
new SpaceTime(glucose),
new ShiftingPlane(glucose),
new AskewPlanes(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),
// DanH
new Noise(glucose),
- new Play(glucose),
- new Pong(glucose),
+ new Play (glucose),
+ new Pong (glucose),
+ new Worms(glucose),
+ // JR
+ new Gimbal(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),
+
+ // L8on
+ new L8onAutomata(glucose),
+ new L8onLife(glucose),
+ new L8onStripLife(glucose),
+
+ // Vincent
+ new VSTowers(glucose),
// Toby
new GlitchPlasma(glucose),
// Toby
new GlitchPlasma(glucose),
@@
-63,23
+98,17
@@
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),
- //
JR
-
new Gimbal(gluco
se),
+ //
Shaheen
+
//new HelixPattern(glucose).setEligible(fal
se),
// Sam
new JazzRainbow(glucose),
// Sam
new JazzRainbow(glucose),
@@
-108,28
+137,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
};
}
// Handles to globally triggerable effects
};
}
// Handles to globally triggerable effects
-BoomEffect boom;
-
-LXEffect[] effects(GLucose glucose) {
- return new LXEffect[] {
- new FlashEffect(lx),
- boom = new BoomEffect(glucose),
- new BlurEffect(glucose),
- new DesaturationEffect(lx),
- new ColorFuckerEffect(glucose),
- };
+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();
+ }
}
}
+