repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add mask transition to do MULTIPLY burn on crossfader
[SugarCubes.git]
/
SugarCubes.pde
diff --git
a/SugarCubes.pde
b/SugarCubes.pde
index c80a4da38fd826b5ff3616cf98f742e93691d060..6b1a6c6f07dd7577f312c06e71e98dcafdcc25b2 100644
(file)
--- a/
SugarCubes.pde
+++ b/
SugarCubes.pde
@@
-22,10
+22,13
@@
* 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.
*/
+
+// TODO(mcslee): get rid of this global, make engine support two decks
+LXPattern gplay;
LXPattern[] patterns(GLucose glucose) {
return new LXPattern[] {
LXPattern[] patterns(GLucose glucose) {
return new LXPattern[] {
-
+
// Slee
new Swarm(glucose),
new SpaceTime(glucose),
// Slee
new Swarm(glucose),
new SpaceTime(glucose),
@@
-40,9
+43,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),
@@
-71,11
+75,14
@@
LXPattern[] patterns(GLucose glucose) {
new TimSpheres(glucose),
// Ben
new TimSpheres(glucose),
// Ben
- //new Sandbox(glucose),
+ //
new Sandbox(glucose),
new TowerParams(glucose),
new DriveableCrossSections(glucose),
new GranimTestPattern2(glucose),
new TowerParams(glucose),
new DriveableCrossSections(glucose),
new GranimTestPattern2(glucose),
-
+
+ //JR
+ new Gimbal(glucose),
+
// Sam
new JazzRainbow(glucose),
// Sam
new JazzRainbow(glucose),
@@
-83,7
+90,7
@@
LXPattern[] patterns(GLucose glucose) {
new TelevisionStatic(glucose),
new AbstractPainting(glucose),
new Spirality(glucose),
new TelevisionStatic(glucose),
new AbstractPainting(glucose),
new Spirality(glucose),
-
+
// Basic test patterns for reference, not art
new TestCubePattern(glucose),
new TestTowerPattern(glucose),
// Basic test patterns for reference, not art
new TestCubePattern(glucose),
new TestTowerPattern(glucose),
@@
-103,6
+110,7
@@
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 MaskTransition(glucose),
new SwipeTransition(glucose),
new FadeTransition(lx),
};
new SwipeTransition(glucose),
new FadeTransition(lx),
};
@@
-112,8
+120,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 DualBlender(glucose),
+ // new DesaturationEffect(lx),
new ColorFuckerEffect(glucose),
};
}
new ColorFuckerEffect(glucose),
};
}
-