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

improved boost logic and hud

Browse Source
This commit is contained in:
Evan Pratten 2021-04-24 09:43:38 -04:00
parent 68f90199a7
commit 7836d5e889
2 changed files with 94 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/logic/ingame/hud.rs
View File

@ -1,6 +1,6 @@
use raylib::prelude::*;
use crate::gamecore::GameCore;
use crate::{gamecore::GameCore, pallette::TRANSLUCENT_WHITE_96};
pub fn render_hud(
draw_handle: &mut RaylibDrawHandle,
@ -8,35 +8,94 @@ pub fn render_hud(
window_center: Vector2,
) {
// Get the relevant data
let breath = game_core.player.breath_percent;
let dist_from_player_to_end = game_core
.player
.position
.distance_to(game_core.world.end_position);
let dist_from_start_to_end = Vector2::zero().distance_to(game_core.world.end_position);
let progress = (dist_from_start_to_end - dist_from_player_to_end) / dist_from_start_to_end;
let progress = ((dist_from_start_to_end - dist_from_player_to_end) / dist_from_start_to_end)
.clamp(0.0, 1.0);
// Render the base of the progress bar
// let progress_bar_rect = Rectangle {
// x: 20.0,
// y: (window_center.y * 2.0) - 20.0 - 40.0,
// width: (window_center.x * 2.0) - 40.0,
// height: 40.0,
// };
// draw_handle.draw_rectangle_rec(progress_bar_rect, Color::BLUE);
// draw_handle.draw_rectangle_lines_ex(progress_bar_rect, 6, Color::WHITE);
// Determine the progress slider position
let slider_bound_height = 20.0;
let progress_slider_position = Vector2 {
x: window_center.x * 2.0,
y: (((window_center.y * 2.0) - (slider_bound_height * 2.0)) * progress)
+ slider_bound_height,
};
// // Render the slider of the progress bar
// let progress_bar_slider = Rectangle {
// x: (((window_center.x * 2.0) - 40.0) * progress.abs().clamp(0.0, 1.0)) + 10.0,
// y: (window_center.y * 2.0) - 20.0 - 50.0,
// width: 40.0,
// height: 60.0,
// };
// draw_handle.draw_rectangle_rec(progress_bar_slider, Color::BLUE);
// //TODO: This causes a render bug
// draw_handle.draw_rectangle_lines_ex(progress_bar_slider, 6, Color::WHITE);
// Render the base of the slider
draw_handle.draw_rectangle(
(progress_slider_position.x - slider_bound_height) as i32,
(progress_slider_position.y - slider_bound_height / 2.0) as i32,
slider_bound_height as i32,
slider_bound_height as i32,
TRANSLUCENT_WHITE_96,
);
draw_handle.draw_triangle(
Vector2 {
x: (progress_slider_position.x - slider_bound_height),
y: (progress_slider_position.y - slider_bound_height / 2.0),
},
Vector2 {
x: (progress_slider_position.x - slider_bound_height - (slider_bound_height / 2.0)),
y: progress_slider_position.y,
},
Vector2 {
x: (progress_slider_position.x - slider_bound_height),
y: (progress_slider_position.y + slider_bound_height / 2.0),
},
TRANSLUCENT_WHITE_96,
);
// Render the outline of the slider
draw_handle.draw_line_ex(
Vector2 {
x: (progress_slider_position.x - slider_bound_height),
y: (progress_slider_position.y - slider_bound_height / 2.0),
},
Vector2 {
x: progress_slider_position.x,
y: (progress_slider_position.y - slider_bound_height / 2.0),
},
3.0,
Color::BLACK,
);
draw_handle.draw_line_ex(
Vector2 {
x: (progress_slider_position.x - slider_bound_height),
y: (progress_slider_position.y + slider_bound_height / 2.0),
},
Vector2 {
x: progress_slider_position.x,
y: (progress_slider_position.y + slider_bound_height / 2.0),
},
3.0,
Color::BLACK,
);
draw_handle.draw_line_ex(
Vector2 {
x: (progress_slider_position.x - slider_bound_height),
y: (progress_slider_position.y - slider_bound_height / 2.0),
},
Vector2 {
x: (progress_slider_position.x - slider_bound_height - (slider_bound_height / 2.0)),
y: progress_slider_position.y,
},
3.0,
Color::BLACK,
);
draw_handle.draw_line_ex(
Vector2 {
x: (progress_slider_position.x - slider_bound_height),
y: (progress_slider_position.y + slider_bound_height / 2.0),
},
Vector2 {
x: (progress_slider_position.x - slider_bound_height - (slider_bound_height / 2.0)),
y: progress_slider_position.y,
},
3.0,
Color::BLACK,
);
// TODO: Breath bar
// TODO: Boost bar
}

15
src/logic/ingame/playerlogic.rs
View File

@ -1,6 +1,9 @@
use raylib::prelude::*;
use crate::{gamecore::GameCore, pallette::{TRANSLUCENT_WHITE_128, TRANSLUCENT_WHITE_64, TRANSLUCENT_WHITE_96}};
use crate::{
gamecore::GameCore,
pallette::{TRANSLUCENT_WHITE_128, TRANSLUCENT_WHITE_64, TRANSLUCENT_WHITE_96},
};
const NORMAL_PLAYER_SPEED: i32 = 4;
const BOOST_PLAYER_SPEED: i32 = NORMAL_PLAYER_SPEED * 2;
@ -47,12 +50,16 @@ pub fn update_player_movement(
speed_multiplier = NORMAL_PLAYER_SPEED as f32;
// Handle boost regen
game_core.player.boost_percent =
(game_core.player.boost_percent + BOOST_REGEN_PER_SECOND * dt as f32).clamp(0.0, 1.0);
if !user_request_boost {
game_core.player.boost_percent = (game_core.player.boost_percent
+ BOOST_REGEN_PER_SECOND * dt as f32)
.clamp(0.0, 1.0);
}
}
// Update the player's breath
game_core.player.breath_percent = (game_core.player.breath_percent - BREATH_DECREASE_PER_SECOND * dt as f32).clamp(0.0, 1.0);
game_core.player.breath_percent =
(game_core.player.breath_percent - BREATH_DECREASE_PER_SECOND * dt as f32).clamp(0.0, 1.0);
// Only do this if the mouse is far enough away
let player_real_movement = game_core.player.direction * speed_multiplier;