priyatham
/
GameAILab1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert to my most recent change

This commit is contained in:
JH159753 2022-09-27 20:57:11 -07:00
parent b5b641fe64
commit 6c01c80bfa
1 changed files with 155 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Boid.pde
View File

@ -49,7 +49,7 @@ class Boid
//println(atan2(direction.y, direction.x) + " " + normalize_angle_left_right(kinematic.getHeading())); //println(atan2(direction.y, direction.x) + " " + normalize_angle_left_right(kinematic.getHeading()));
float directionalThreshold = .1; float directionalThreshold = .1;
float angleToTarget = normalize_angle_left_right(atan2(direction.y, direction.x) - normalize_angle_left_right(kinematic.getHeading())); float angleToTarget = atan2(direction.y, direction.x) - normalize_angle_left_right(kinematic.getHeading());
float arrivalThreshold = 60.0; float arrivalThreshold = 60.0;
//This just draws a circle for visual debugging purposes //This just draws a circle for visual debugging purposes
@ -59,13 +59,13 @@ class Boid
//println(angleToTarget); //println(angleToTarget);
//if the angle is larger than the threshold in the positive direction, rotate counterclockwise //if the angle is larger than the threshold in the positive direction, rotate counterclockwise
if (angleToTarget >= .1) { //Need to rotate slower when the boid is closer to the target
println("positive angle");
kinematic.increaseSpeed(0.0, 2);
if (angleToTarget > directionalThreshold && direction.mag() > arrivalThreshold) {
kinematic.increaseSpeed(0.0, +1);
//if the angle is smaller than the threshold in the negative direction, rotate clockwise //if the angle is smaller than the threshold in the negative direction, rotate clockwise
} else if (angleToTarget < -.1) { } else if (angleToTarget < -directionalThreshold && direction.mag() > arrivalThreshold) {
kinematic.increaseSpeed(0.0, -1); kinematic.increaseSpeed(0.0, -1);
//if the angle is within our threshold, stop our rotational velocity by rotating opposite //if the angle is within our threshold, stop our rotational velocity by rotating opposite
@ -73,9 +73,9 @@ class Boid
if (kinematic.getRotationalVelocity() > 0) { if (kinematic.getRotationalVelocity() > 0) {
kinematic.increaseSpeed(0.0, -1); kinematic.increaseSpeed(0.0, -1);
} else if (kinematic.getRotationalVelocity() < 0) { }
else if (kinematic.getRotationalVelocity() < 0) {
kinematic.increaseSpeed(0.0, 1); kinematic.increaseSpeed(0.0, 1);
} }
} }
@ -86,35 +86,39 @@ class Boid
//if the target is outside its arrival threshold, accelerate. //if the target is outside its arrival threshold, accelerate.
//if the target is inside its arrival threshold, accelerate backwards until the speed is 0. //if the target is inside its arrival threshold, accelerate backwards until the speed is 0.
if (direction.mag() > arrivalThreshold) { if (direction.mag() > arrivalThreshold) {
//println("main if"); kinematic.increaseSpeed(1,0);
kinematic.increaseSpeed(.5, 0);
} else if (direction.mag() < arrivalThreshold) { } else if (direction.mag() < arrivalThreshold) {
//Need more specific code here to handle arrivals correctly //Need more specific code here to handle arrivals correctly
if (kinematic.getSpeed() < 40 && direction.mag() > 30) { if (kinematic.getSpeed() < 40 && direction.mag() > 30) {
//println("if 1");
kinematic.increaseSpeed(1,0); kinematic.increaseSpeed(1,0);
} else if (kinematic.getSpeed() < 20 && direction.mag() > 15) { } else if (kinematic.getSpeed() < 20 && direction.mag() > 15) {
//println("if .75");
kinematic.increaseSpeed(.75,0); kinematic.increaseSpeed(.75,0);
} else if (kinematic.getSpeed() < 10 && direction.mag() > 5) { } else if (kinematic.getSpeed() < 10 && direction.mag() > 5) {
//println("if .5");
kinematic.increaseSpeed(.5,0); kinematic.increaseSpeed(.5,0);
} else if (kinematic.getSpeed() < 5 && direction.mag() < 5) { } else if (kinematic.getSpeed() < 5 && direction.mag() < 5) {
//println("if -kin");
//This should ensure that the boid's speed can be dropped to exactly 0 so we don't have stuttering //This should ensure that the boid's speed can be dropped to exactly 0 so we don't have stuttering
kinematic.increaseSpeed(-kinematic.getSpeed(),0); kinematic.increaseSpeed(-kinematic.getSpeed(),0);
} else { } else {
println("else");
kinematic.increaseSpeed(-1,0); kinematic.increaseSpeed(-1,0);
} }
} }
//drawing a line for testing purposes //drawing a line for testing purposes
//line(kinematic.position.x, kinematic.position.y, kinematic.position.x + direction.x, kinematic.position.y + direction.y); //line(kinematic.position.x, kinematic.position.y, kinematic.position.x + direction.x, kinematic.position.y + direction.y);
} }
// place crumbs, do not change // place crumbs, do not change
@ -162,43 +166,13 @@ class Boid
void seek(PVector target) void seek(PVector target)
{ {
this.target = target; this.target = target;
} }
int count = 0;
//void follow(ArrayList<PVector> waypoints)
//{
// //println("func count " + count);
// if(count > waypoints.size() - 1){
// this.target = waypoints.get(0);
// return;
// }
// else {
// // TODO: change to follow *all* waypoints
// println("count " + count);
// this.target = waypoints.get(count);
// PVector temp = waypoints.remove(count);
// count++;
// //count--;
// follow(waypoints);
// }
//}
void follow(ArrayList<PVector> waypoints) void follow(ArrayList<PVector> waypoints)
{ {
int count = 0; // TODO: change to follow *all* waypoints
//this.target = waypoints.get(0); this.target = waypoints.get(0);
do{
print("in while");
this.target = waypoints.get(count);
count++;
}while(PVector.sub(this.target,this.kinematic.position).mag() < 40);
} }
} }