Simulation keys (spacebar and dot/period key) now in accordance with …

…requirements
muraliavarma · Feb 6, 2013 · 6a7e8e4 · 6a7e8e4
1 parent 587e653
commit 6a7e8e4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/murali_varma_hw2/build-tmp/murali_varma_hw2$Creature.class b/murali_varma_hw2/build-tmp/murali_varma_hw2$Creature.class
diff --git a/murali_varma_hw2/build-tmp/murali_varma_hw2.class b/murali_varma_hw2/build-tmp/murali_varma_hw2.class
diff --git a/murali_varma_hw2/build-tmp/source/murali_varma_hw2.java b/murali_varma_hw2/build-tmp/source/murali_varma_hw2.java
@@ -34,6 +34,8 @@ public class murali_varma_hw2 extends PApplet {
 final float VELOCITY_MATCHING_WEIGHT = 0.1f;
 final float WANDERING_WEIGHT = 0.0002f;
 
+boolean isLoop = true;
+
 int edgeBehavior = TOROIDAL_MODE;
 int backgroundAlpha = 10;	//0 for full trail, 255 for no trail
 
@@ -95,15 +97,18 @@ public void clearBackground() {
 
 public void keyPressed() {
 	//simulation
-	if (key == 'q') {
-		noLoop();
+	if (key == ' ') {
+		isLoop = !isLoop;
 	}
-	else if(key == 'w') {
+
+	if (isLoop) {
+		loop();
+	}
+
+	if(key == '.' || !isLoop) {
 		noLoop();
 		redraw();
-	}
-	else {
-		loop();
+		isLoop = false;
 	}
 
 	//commands

diff --git a/murali_varma_hw2/murali_varma_hw2.pde b/murali_varma_hw2/murali_varma_hw2.pde
@@ -19,6 +19,8 @@ final float COLLISION_AVOIDANCE_WEIGHT = 0.001;
 final float VELOCITY_MATCHING_WEIGHT = 0.1;
 final float WANDERING_WEIGHT = 0.0002;
 
+boolean isLoop = true;
+
 int edgeBehavior = TOROIDAL_MODE;
 int backgroundAlpha = 10;	//0 for full trail, 255 for no trail
 
@@ -80,15 +82,18 @@ void clearBackground() {
 
 void keyPressed() {
 	//simulation
-	if (key == 'q') {
-		noLoop();
+	if (key == ' ') {
+		isLoop = !isLoop;
 	}
-	else if(key == 'w') {
+
+	if (isLoop) {
+		loop();
+	}
+
+	if(key == '.' || !isLoop) {
 		noLoop();
 		redraw();
-	}
-	else {
-		loop();
+		isLoop = false;
 	}
 
 	//commands