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

Merge remote-tracking branch 'origin/master' into cave_rendering

Browse Source
This commit is contained in:
Evan Pratten 2021-04-24 14:51:07 -04:00
commit ab0fe7b693
3 changed files with 17 additions and 8 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

@ -122,9 +122,9 @@ impl Screen for InGameScreen {
self.render_colliders(&mut context_2d, game_core); self.render_colliders(&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);
} }

11
src/logic/pausemenu.rs
View File

@ -7,7 +7,7 @@ use crate::{
use super::screen::Screen; use super::screen::Screen;
const SCREEN_PANEL_SIZE: Vector2 = Vector2 { x: 300.0, y: 300.0 }; const SCREEN_PANEL_SIZE: Vector2 = Vector2 { x: 300.0, y: 380.0 };
pub struct PauseMenuScreen {} pub struct PauseMenuScreen {}
@ -118,6 +118,15 @@ impl Screen for PauseMenuScreen {
} }
} }
// Render credits
draw_handle.draw_text(
"Credits:\n\t- @ewpratten\n\t- @rsninja722\n\t- @wm-c\n\t- @catarinaburghi",
(win_width / 2) - (SCREEN_PANEL_SIZE.x as i32 / 2) + 10,
(win_height / 2) - (SCREEN_PANEL_SIZE.y as i32 / 2) + 120,
20,
Color::BLACK,
);
// Close and quit buttons // Close and quit buttons
let bottom_left_button_dimensions = Rectangle { let bottom_left_button_dimensions = Rectangle {
x: (win_width as f32 / 2.0) - (SCREEN_PANEL_SIZE.x / 2.0) + 5.0, x: (win_width as f32 / 2.0) - (SCREEN_PANEL_SIZE.x / 2.0) + 5.0,