repositories
/
SugarCubes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'alexdesktopworking' of https://github.com/sugarcubes/SugarCubes into...
[SugarCubes.git]
/
SugarCubes.pde
diff --git
a/SugarCubes.pde
b/SugarCubes.pde
index 472285283397867711152f1d6d1a4946dfea190e..7f8be7b14a9837d7f5fb5bb5453030b94f804110 100644
(file)
--- a/
SugarCubes.pde
+++ b/
SugarCubes.pde
@@
-78,12
+78,19
@@
LXPattern[] patterns(GLucose glucose) {
new TimSpheres(glucose),
// Ben
new TimSpheres(glucose),
// Ben
+ //new Sandbox(glucose),
+ new TowerParams(glucose),
new DriveableCrossSections(glucose),
new GranimTestPattern2(glucose),
// Sam
new JazzRainbow(glucose),
new DriveableCrossSections(glucose),
new GranimTestPattern2(glucose),
// Sam
new JazzRainbow(glucose),
+ // Arjun
+ 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),