repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'newlayout' of https://github.com/sugarcubes/SugarCubes
[SugarCubes.git]
/
SugarCubes.pde
diff --git
a/SugarCubes.pde
b/SugarCubes.pde
index 8428367fd1e209e9bf78489f8fb8b24a9f55ca63..801e2930f0f66bd01619db6414726f677bf28726 100644
(file)
--- a/
SugarCubes.pde
+++ b/
SugarCubes.pde
@@
-25,29
+25,39
@@
LXPattern[] patterns(GLucose glucose) {
return new LXPattern[] {
LXPattern[] patterns(GLucose glucose) {
return new LXPattern[] {
- new SpaceTime(glucose),
+ new ShiftingPlane(glucose),
+ new AskewPlanes(glucose),
new Swarm(glucose),
new Swarm(glucose),
+ new SpaceTime(glucose),
+ new Blinders(glucose),
+ new CrossSections(glucose),
+ new Psychedelia(glucose),
new CubeEQ(glucose),
new CubeEQ(glucose),
+ new PianoKeyPattern(glucose),
- // Basic test patterns for reference, not art
+ // Basic test patterns for reference, not art
+// new TestCubePattern(glucose),
// new TestHuePattern(glucose),
// new TestXPattern(glucose),
// new TestYPattern(glucose),
// new TestZPattern(glucose),
// new TestHuePattern(glucose),
// new TestXPattern(glucose),
// new TestYPattern(glucose),
// new TestZPattern(glucose),
+// new TestProjectionPattern(glucose),
+
};
}
LXTransition[] transitions(GLucose glucose) {
return new LXTransition[] {
};
}
LXTransition[] transitions(GLucose glucose) {
return new LXTransition[] {
- new DissolveTransition(lx)
.setDuration(3000)
,
+ new DissolveTransition(lx),
new SwipeTransition(glucose),
new SwipeTransition(glucose),
- new FadeTransition(lx)
.setDuration(2000)
,
+ new FadeTransition(lx),
};
}
LXEffect[] effects(GLucose glucose) {
return new LXEffect[] {
new FlashEffect(lx),
};
}
LXEffect[] effects(GLucose glucose) {
return new LXEffect[] {
new FlashEffect(lx),
+ new BoomEffect(glucose),
new DesaturationEffect(lx),
};
}
new DesaturationEffect(lx),
};
}