evan/ludum-dare-48
Archived
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fishy fish

Browse Source
This commit is contained in:
Evan Pratten 2021-04-24 13:59:08 -04:00
parent 5abedb7762
commit ef90e1ce66
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/entities/fish.rs
View File

@ -1,7 +1,7 @@
use rand::{Rng, prelude::ThreadRng}; use rand::{Rng, prelude::ThreadRng};
use raylib::prelude::*; use raylib::prelude::*;
use crate::{gamecore::GameCore, lib::utils::triangles::rotate_vector, player::Player}; use crate::{gamecore::GameCore, lib::utils::triangles::rotate_vector, player::Player, world::World};
const FISH_FOLLOW_PLAYER_DISTANCE: f32 = 30.0; const FISH_FOLLOW_PLAYER_DISTANCE: f32 = 30.0;
const FISH_FOLLOW_PLAYER_SPEED: f32 = 1.8; const FISH_FOLLOW_PLAYER_SPEED: f32 = 1.8;
@ -36,7 +36,7 @@ impl FishEntity {
return output; return output;
} }
pub fn handle_follow_player(&mut self, player: &Player, dt: f64) { pub fn handle_follow_player(&mut self, player: &Player, dt: f64, other_fish: &Vec<FishEntity>) {
// Distance and direction to player // Distance and direction to player
let dist_to_player = player.position - self.position; let dist_to_player = player.position - self.position;
let dist_to_player_lin = self.position.distance_to(player.position); let dist_to_player_lin = self.position.distance_to(player.position);
@ -86,9 +86,9 @@ impl FishEntity {
self.direction = direction_to_player; self.direction = direction_to_player;
} }
pub fn update_position(&mut self, player: &mut Player, dt: f64) { pub fn update_position(&mut self, player: &mut Player, dt: f64, other_fish: &Vec<FishEntity>) {
if self.following_player { if self.following_player {
self.handle_follow_player(player, dt); self.handle_follow_player(player, dt, other_fish);
} else { } else {
self.handle_free_movement(player, dt); self.handle_free_movement(player, dt);
} }

6
src/logic/ingame/mod.rs
View File

@ -74,9 +74,9 @@ impl Screen for InGameScreen {
self.render_world(&mut context_2d, game_core); self.render_world(&mut context_2d, game_core);
// Render entities // Render entities
let mut fish = &mut game_core.world.fish; let fish_clone = game_core.world.fish.clone();
for fish in fish.iter_mut() { for fish in game_core.world.fish.iter_mut() {
fish.update_position(&mut game_core.player, dt); fish.update_position(&mut game_core.player, dt, &fish_clone);
fish.render(&mut context_2d); fish.render(&mut context_2d);
} }