nora
/
asteroids-genetic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup

This commit is contained in:
sparshg 2023-01-05 22:16:08 +05:30
parent 8196383515
commit 1c036ec097
3 changed files with 53 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/asteroids.rs
View File

@ -1,10 +1,13 @@
use macroquad::{prelude::*, rand::gen_range};
#[derive(Clone)]
pub enum AsteroidSize {
Large,
Medium,
Small,
}
#[derive(Clone)]
pub struct Asteroid {
pub pos: Vec2,
pub vel: Vec2,
@ -63,7 +66,7 @@ impl Asteroid {
asteroid
}
pub fn check_collision(&mut self, pos: Vec2, rad: f32) -> bool {
pub fn check_collision(&self, pos: Vec2, rad: f32) -> bool {
(pos.x - self.pos.x) * (pos.x - self.pos.x) + (pos.y - self.pos.y) * (pos.y - self.pos.y)
<= (self.radius + rad) * (self.radius + rad)
}

81
src/player.rs
View File

@ -13,7 +13,7 @@ pub struct Player {
rot: f32,
drag: f32,
bullets: Vec<Bullet>,
raycasts: Vec<f32>,
asteroid: Option<Asteroid>,
last_shot: u8,
shot_interval: u8,
pub brain: Option<NN>,
@ -36,7 +36,7 @@ impl Player {
alive: true,
debug: false,
shots: 4,
raycasts: vec![f32::MAX; 3],
..Default::default()
}
}
@ -56,18 +56,18 @@ impl Player {
p
}
pub fn check_player_collision(&mut self, asteroid: &mut Asteroid) -> bool {
pub fn check_player_collision(&mut self, asteroid: &Asteroid) -> bool {
// self.raycasts.extend([
if (asteroid.pos).distance_squared(self.pos)
< vec2(
self.raycasts[0] * screen_width(),
self.raycasts[1] * screen_height(),
)
.distance_squared(self.pos)
if self.asteroid.is_none()
|| (asteroid.pos).distance_squared(self.pos)
< self
.asteroid
.as_ref()
.unwrap()
.pos
.distance_squared(self.pos)
{
self.raycasts[0] = asteroid.pos.x / screen_width();
self.raycasts[1] = asteroid.pos.y / screen_height();
self.raycasts[2] = asteroid.radius / 50.;
self.asteroid = Some(asteroid.clone());
}
// ]);
// if self.raycasts[0] > (asteroid.pos - self.pos).length_squared() {
@ -101,6 +101,7 @@ impl Player {
if asteroid.check_collision(bullet.pos, 0.) {
asteroid.alive = false;
bullet.alive = false;
self.asteroid = None;
return true;
}
}
@ -113,21 +114,11 @@ impl Player {
self.acc = 0.;
let mut keys = vec![false, false, false, false];
let mut inputs = vec![
(vec2(
self.raycasts[0] * screen_width(),
self.raycasts[1] * screen_height(),
) - self.pos)
.length()
* 0.707
/ screen_width(),
(self.asteroid.as_ref().unwrap().pos - self.pos).length() * 0.707 / screen_width(),
// self.raycasts[0] - self.pos.x / screen_width(),
// self.raycasts[1] - self.pos.y / screen_height(),
self.dir.angle_between(
vec2(
self.raycasts[0] * screen_width(),
self.raycasts[1] * screen_height(),
) - self.pos,
),
self.dir
.angle_between(self.asteroid.as_ref().unwrap().pos - self.pos),
// self.vel.x / 11.,
// self.vel.y / 11.,
self.rot, // self.rot.sin(),
@ -188,7 +179,7 @@ impl Player {
self.bullets.retain(|b| {
b.alive && b.pos.x.abs() * 2. < screen_width() && b.pos.y.abs() * 2. < screen_height()
});
self.raycasts = vec![100.; 3];
self.asteroid = None;
}
pub fn draw(&self) {
@ -196,12 +187,12 @@ impl Player {
Some(c) => c,
None => Color::new(1., 1., 1., 0.3),
};
let p1 = self.pos + self.dir.rotate(vec2(20., 0.));
let p1 = self.pos + self.dir * 20.;
let p2 = self.pos + self.dir.rotate(vec2(-18., -12.667));
let p3 = self.pos + self.dir.rotate(vec2(-18., 12.667));
let p4 = self.pos + self.dir.rotate(vec2(-10., -10.));
let p5 = self.pos + self.dir.rotate(vec2(-10., 10.));
let p6 = self.pos + self.dir.rotate(vec2(-25., 0.));
let p6 = self.pos + self.dir * -25.;
let p7 = self.pos + self.dir.rotate(vec2(-10., -6.));
let p8 = self.pos + self.dir.rotate(vec2(-10., 6.));
draw_line(p1.x, p1.y, p2.x, p2.y, 2., color);
@ -210,25 +201,23 @@ impl Player {
if self.acc > 0. && gen_range(0., 1.) < 0.4 {
draw_triangle_lines(p6, p7, p8, 2., color);
}
if self.debug && self.asteroid.is_some() {
draw_circle_lines(
self.asteroid.as_ref().unwrap().pos.x,
self.asteroid.as_ref().unwrap().pos.y,
self.asteroid.as_ref().unwrap().radius,
1.,
GRAY,
);
draw_line(
self.pos.x,
self.pos.y,
self.asteroid.as_ref().unwrap().pos.x,
self.asteroid.as_ref().unwrap().pos.y,
1.,
GRAY,
);
if self.debug {
for a in self.raycasts.chunks(3) {
draw_circle_lines(
a[0] * screen_width(),
a[1] * screen_height(),
a[2] * 50.,
1.,
GRAY,
);
draw_line(
self.pos.x,
self.pos.y,
a[0] * screen_width(),
a[1] * screen_height(),
1.,
GRAY,
)
}
// for (i, r) in self.raycasts.iter().enumerate() {
// let dir = Vec2::from_angle(PI / 4. * i as f32).rotate(self.dir);
// draw_line(

23
src/world.rs
View File

@ -63,7 +63,6 @@ impl World {
// }
pub fn update(&mut self) {
self.player.update();
// if self.player.lifespan > 150 {
// self.fitness = 1.
// / ((self.player.pos * vec2(2. / screen_width(), 2. / screen_height()))
@ -77,13 +76,6 @@ impl World {
let mut to_add: Vec<Asteroid> = Vec::new();
for asteroid in &mut self.asteroids {
asteroid.update();
if self.player.check_player_collision(asteroid) {
self.over = true;
self.fitness =
(self.score / self.player.shots as f32).powi(2) * self.player.lifespan as f32;
// println!("{} {} {}", self.score, self.player.lifespan, self.fitness);
}
if self.player.check_bullet_collisions(asteroid) {
self.score += 1.;
match asteroid.size {
@ -117,8 +109,18 @@ impl World {
}
}
}
for asteroid in self.asteroids.iter() {
if self.player.check_player_collision(&*asteroid) {
self.over = true;
self.fitness =
(self.score / self.player.shots as f32).powi(2) * self.player.lifespan as f32;
// println!("{} {} {}", self.score, self.player.lifespan, self.fitness);
}
}
self.asteroids.append(&mut to_add);
self.asteroids.retain(|asteroid| asteroid.alive);
self.player.update();
// if self.asteroids.iter().fold(0, |acc, x| {
// acc + match x.size {
// AsteroidSize::Large => 4,
@ -139,7 +141,10 @@ impl World {
asteroid.draw();
}
draw_text(
&format!("{}", (self.score / self.player.shots as f32).powi(2) as f32),
&format!(
"{}",
(self.score / self.player.shots as f32).powi(2) * self.player.lifespan as f32
),
// 20. - screen_width() * 0.5,
// 30. - screen_height() * 0.5,
self.player.pos.x - 20.,