dusk/godot_boids
dusk/godot_boids
1
0
Fork 0
Code Issues Pull Requests Actions Releases 1 Activity

refactor: minor code refactor so it looks slightly better

Browse Source
This commit is contained in:
dusk 2024-09-29 04:27:36 +03:00
parent 8c88cf9cac
commit 742dc85414
Signed by: dusk
SSH Key Fingerprint: SHA256:Abmvag+juovVufZTxyWY8KcVgrznxvBjQpJesv071Aw
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rust/src/boid/boid_2d.rs
View File

@ -83,9 +83,9 @@ impl Boid for Boid2D {
#[inline(always)] #[inline(always)]
fn apply_force(&mut self, force: Vec3) { fn apply_force(&mut self, force: Vec3) {
self.vel += force.xy(); self.vel += force.xy();
let new_vel = self.vel.clamp_length_max(self.props.max_speed); self.vel = self.vel.clamp_length_max(self.props.max_speed);
self.vel = new_vel; let force_to_apply = Vector2::new(self.vel.x, self.vel.y);
self.base_mut().translate(Vector2::new(new_vel.x, new_vel.y)); self.base_mut().translate(force_to_apply);
} }
#[inline(always)] #[inline(always)]

7
rust/src/boid/boid_3d.rs
View File

@ -82,10 +82,9 @@ impl Boid for Boid3D {
#[inline(always)] #[inline(always)]
fn apply_force(&mut self, force: Vec3) { fn apply_force(&mut self, force: Vec3) {
self.vel += force; self.vel += force;
let new_vel = self.vel.clamp_length_max(self.props.max_speed); self.vel = self.vel.clamp_length_max(self.props.max_speed);
self.vel = new_vel; let force_to_apply = Vector3::new(self.vel.x, self.vel.y, self.vel.z);
self.base_mut() self.base_mut().translate(force_to_apply);
.translate(Vector3::new(new_vel.x, new_vel.y, new_vel.z));
} }
#[inline(always)] #[inline(always)]

2
rust/src/boid_properties.rs
View File

@ -28,4 +28,4 @@ pub struct BoidProperties {
#[init(val = 0.8)] #[init(val = 0.8)]
/// How much to follow a flock target (if there is one). /// How much to follow a flock target (if there is one).
pub targeting: f32, pub targeting: f32,
} }

2
rust/src/flock_properties.rs
View File

@ -16,4 +16,4 @@ pub struct FlockProperties {
#[init(val = 2500.0)] #[init(val = 2500.0)]
/// Distance (squared) to apply cohesion force between boids in a flock. /// Distance (squared) to apply cohesion force between boids in a flock.
pub goal_cohesion: f32, pub goal_cohesion: f32,
} }