repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Model is now in processing, not glucose
[SugarCubes.git]
/
SugarCubes.pde
diff --git
a/SugarCubes.pde
b/SugarCubes.pde
index 389700dc4db1831735692526edbcf166dc71f617..5fe3c7bb5f412a83a63e07129e44a0ec35dcca09 100644
(file)
--- a/
SugarCubes.pde
+++ b/
SugarCubes.pde
@@
-15,8
+15,8
@@
*
* Welcome to the Sugar Cubes! This Processing sketch is a fun place to build
* animations, effects, and interactions for the platform. Most of the icky
*
* Welcome to the Sugar Cubes! This Processing sketch is a fun place to build
* animations, effects, and interactions for the platform. Most of the icky
- * code guts are embedded in the
GLucose library extension. If you're an
- * a
rtist, you shouldn't need to worry about any of
that.
+ * code guts are embedded in the
HeronLX library, or files prefixed with
+ * a
n underscore. If you're an artist, you shouldn't need to worry about
that.
*
* Below, you will find definitions of the Patterns, Effects, and Interactions.
* If you're an artist, create a new tab in the Processing environment with
*
* Below, you will find definitions of the Patterns, Effects, and Interactions.
* If you're an artist, create a new tab in the Processing environment with
@@
-24,14
+24,14
@@
*/
LXPattern[] patterns(GLucose glucose) {
*/
LXPattern[] patterns(GLucose glucose) {
- return new LXPattern[] {
-
+ return new LXPattern[] {
+
new SineSphere(glucose),
new SineSphere(glucose),
-
//new CubeCurl(glucose),
+ //new CubeCurl(glucose),
// Slee
// new Cathedrals(glucose),
// Slee
// new Cathedrals(glucose),
-
new Swarm(glucose),
+ new Swarm(glucose),
new MidiMusic(glucose),
new Pulley(glucose),
new MidiMusic(glucose),
new Pulley(glucose),
@@
-51,15
+51,21
@@
LXPattern[] patterns(GLucose glucose) {
new CubeEQ(glucose).setEligible(false),
new PianoKeyPattern(glucose).setEligible(false),
new CubeEQ(glucose).setEligible(false),
new PianoKeyPattern(glucose).setEligible(false),
+ // AntonK
+ new AKPong(glucose),
+
// DanH
new Noise(glucose),
new Play (glucose),
new Pong (glucose),
new Worms(glucose),
// DanH
new Noise(glucose),
new Play (glucose),
new Pong (glucose),
new Worms(glucose),
+ // JR
+ new Gimbal(glucose),
+
// Alex G
// Alex G
-
// Tim
+ // Tim
new TimMetronome(glucose),
new TimPlanes(glucose),
new TimPinwheels(glucose),
new TimMetronome(glucose),
new TimPlanes(glucose),
new TimPinwheels(glucose),
@@
-67,15
+73,16
@@
LXPattern[] patterns(GLucose glucose) {
new TimCubes(glucose),
// new TimTrace(glucose),
new TimSpheres(glucose),
new TimCubes(glucose),
// new TimTrace(glucose),
new TimSpheres(glucose),
-
-
// Jackie
new JackieSquares(glucose),
new JackieLines(glucose),
new JackieDots(glucose),
// Jackie
new JackieSquares(glucose),
new JackieLines(glucose),
new JackieDots(glucose),
-
+ // L8on
+ new L8onAutomata(glucose),
+ new L8onLife(glucose),
+ new L8onStripLife(glucose),
// Vincent
new VSTowers(glucose),
// Vincent
new VSTowers(glucose),
@@
-91,7
+98,6
@@
LXPattern[] patterns(GLucose glucose) {
// Jack
new Swim(glucose),
new Balance(glucose),
// Jack
new Swim(glucose),
new Balance(glucose),
-
// Ben
// new Sandbox(glucose),
// Ben
// new Sandbox(glucose),
@@
-100,10
+106,7
@@
LXPattern[] patterns(GLucose glucose) {
new GranimTestPattern2(glucose),
// Shaheen
new GranimTestPattern2(glucose),
// Shaheen
- //new HelixPattern(glucose).setEligible(false),
-
- //JR
- new Gimbal(glucose),
+ // new HelixPattern(glucose).setEligible(false),
// Sam
new JazzRainbow(glucose),
// Sam
new JazzRainbow(glucose),
@@
-118,9
+121,6
@@
LXPattern[] patterns(GLucose glucose) {
new TestTowerPattern(glucose),
new TestProjectionPattern(glucose),
new TestStripPattern(glucose),
new TestTowerPattern(glucose),
new TestProjectionPattern(glucose),
new TestStripPattern(glucose),
- new TestBassMapping(glucose),
- new TestFloorMapping(glucose),
- new TestSpeakerMapping(glucose),
// new TestHuePattern(glucose),
// new TestXPattern(glucose),
// new TestYPattern(glucose),
// new TestHuePattern(glucose),
// new TestXPattern(glucose),
// new TestYPattern(glucose),
@@
-139,8
+139,8
@@
LXTransition[] transitions(GLucose glucose) {
new SwipeTransition(glucose),
new FadeTransition(lx),
// new SubtractTransition(glucose), // similar to multiply - dh
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 BurnTransition(glucose), // similar to multiply - dh
+// new ScreenTransition(glucose), // same as add -dh
// new SoftLightTransition(glucose), // same as overlay -dh
};
}
// new SoftLightTransition(glucose), // same as overlay -dh
};
}