Permalink
Browse files

Add all routines, remove unused predraw() function

  • Loading branch information...
1 parent d4c4273 commit e9ae0fb6e66c4bacd1842c65f8e9896fce0e164c @cibomahto cibomahto committed Sep 4, 2012
Showing with 11 additions and 36 deletions.
  1. +0 −27 Routine.pde
  2. +11 −9 domeTransmitter.pde
View
@@ -1,38 +1,11 @@
class Routine {
PApplet parent;
public boolean isDone = false;
- boolean aDown = false;
- boolean bDown = false;
void setup(PApplet parent) {
this.parent = parent;
}
- void predraw() {
- if (controller.buttonB) {
- bDown = true;
- }
- else if (bDown) {
- bDown = false;
- buttonBPressed();
- }
-
- if (controller.buttonA) {
- aDown = true;
- }
- else if (aDown) {
- aDown = false;
- buttonAPressed();
- }
- }
-
- void buttonBPressed() {
- newMode();
- }
-
- void buttonAPressed() {
- }
-
void reset() {}
void draw() {}
void newmode() {
View
@@ -26,15 +26,18 @@ Routine drop = new Seizure();
Routine pong = new Pong();
Routine[] enabledRoutines = new Routine[] {
-// new Bursts(),
-// new Chase(),
-// new ColorDrop(),
-// new Fire(),
+ new Bursts(),
+ new Chase(),
+ new ColorDrop(),
+ new DropTheBomb(),
+ new FFTDemo(),
+ new Fire(),
+ new Greetz(),
new RGBRoutine(),
-// new RainbowColors(),
-// new Waves(),
-// new Warp(new WarpSpeedMrSulu(), false, true, 0.5, 0.5),
-// new Warp(null, true, false, 0.5, 0.5),
+ new RainbowColors(),
+ new Warp(null, true, false, 0.5, 0.5),
+ new Warp(new WarpSpeedMrSulu(), false, true, 0.5, 0.5),
+ new Waves(),
};
int w = 0;
@@ -138,7 +141,6 @@ void draw() {
}
}
else if (currentRoutine != null) {
- currentRoutine.predraw();
currentRoutine.draw();
}
else {

0 comments on commit e9ae0fb

Please sign in to comment.