Keys for adding/deleting creatures

muraliavarma · Feb 6, 2013 · 8e7a96d · 8e7a96d
1 parent 6a7e8e4
commit 8e7a96d
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 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
@@ -21,7 +21,8 @@ public class murali_varma_hw2 extends PApplet {
 final int REFLECT_MODE = 0;
 final int TOROIDAL_MODE = 1;
 
-final int NUM_CREATURES = 100;
+final int MIN_CREATURES = 1;
+final int MAX_CREATURES = 100;
 
 final float EPSILON = 0.01f;
 
@@ -34,8 +35,9 @@ public class murali_varma_hw2 extends PApplet {
 final float VELOCITY_MATCHING_WEIGHT = 0.1f;
 final float WANDERING_WEIGHT = 0.0002f;
 
-boolean isLoop = true;
+int NUM_CREATURES = 10;
 
+boolean isLoop = true;
 int edgeBehavior = TOROIDAL_MODE;
 int backgroundAlpha = 10;	//0 for full trail, 255 for no trail
 
@@ -62,8 +64,8 @@ public void drawBackground() {
 }
 
 public void initCreatures() {
-	creatures = new Creature[NUM_CREATURES];
-	for (int i = 0; i < NUM_CREATURES; i++) {
+	creatures = new Creature[MAX_CREATURES];
+	for (int i = 0; i < MAX_CREATURES; i++) {
 		creatures[i] = new Creature(i);
 	}
 }
@@ -134,6 +136,16 @@ public void keyPressed() {
 		clearBackground();
 	}
 
+	if (key == '=' || key == '+') {
+		NUM_CREATURES = min(NUM_CREATURES+1, MAX_CREATURES);
+		//reinit this newly added creature
+		creatures[NUM_CREATURES-1].init();
+	}
+
+	if (key == '-' || key == '-') {
+		NUM_CREATURES = max(NUM_CREATURES-1, MIN_CREATURES);
+	}
+
 	//forces
 	if (key == '1') {
 		flockCenteringForce = !flockCenteringForce;

diff --git a/murali_varma_hw2/murali_varma_hw2.pde b/murali_varma_hw2/murali_varma_hw2.pde
@@ -6,7 +6,8 @@ final int CONTROLS_WIDTH = 100;
 final int REFLECT_MODE = 0;
 final int TOROIDAL_MODE = 1;
 
-final int NUM_CREATURES = 100;
+final int MIN_CREATURES = 1;
+final int MAX_CREATURES = 100;
 
 final float EPSILON = 0.01;
 
@@ -19,8 +20,9 @@ final float COLLISION_AVOIDANCE_WEIGHT = 0.001;
 final float VELOCITY_MATCHING_WEIGHT = 0.1;
 final float WANDERING_WEIGHT = 0.0002;
 
-boolean isLoop = true;
+int NUM_CREATURES = 10;
 
+boolean isLoop = true;
 int edgeBehavior = TOROIDAL_MODE;
 int backgroundAlpha = 10;	//0 for full trail, 255 for no trail
 
@@ -47,8 +49,8 @@ void drawBackground() {
 }
 
 void initCreatures() {
-	creatures = new Creature[NUM_CREATURES];
-	for (int i = 0; i < NUM_CREATURES; i++) {
+	creatures = new Creature[MAX_CREATURES];
+	for (int i = 0; i < MAX_CREATURES; i++) {
 		creatures[i] = new Creature(i);
 	}
 }
@@ -119,6 +121,16 @@ void keyPressed() {
 		clearBackground();
 	}
 
+	if (key == '=' || key == '+') {
+		NUM_CREATURES = min(NUM_CREATURES+1, MAX_CREATURES);
+		//reinit this newly added creature
+		creatures[NUM_CREATURES-1].init();
+	}
+
+	if (key == '-' || key == '-') {
+		NUM_CREATURES = max(NUM_CREATURES-1, MIN_CREATURES);
+	}
+
 	//forces
 	if (key == '1') {
 		flockCenteringForce = !flockCenteringForce;