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

turns smoother

Browse Source
This commit is contained in:
rsninja722 2021-04-24 00:06:37 -04:00
parent 97f6af1dde
commit 1c34ba9058
1 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ use super::screen::Screen;
const NORMAL_PLAYER_SPEED: i32 = 4; const NORMAL_PLAYER_SPEED: i32 = 4;
const BOOST_PLAYER_SPEED: i32 = NORMAL_PLAYER_SPEED * 2; const BOOST_PLAYER_SPEED: i32 = NORMAL_PLAYER_SPEED * 2;
const CAMERA_FOLLOW_SPEED: f32 = 0.7; const CAMERA_FOLLOW_SPEED: f32 = 0.7;
const TURN_SPEED: f32 = 0.05;
pub enum InGameState { pub enum InGameState {
BUYING, BUYING,
@ -41,7 +42,41 @@ impl InGameScreen {
let raw_movement_direction = mouse_world_pose - game_core.player.position; let raw_movement_direction = mouse_world_pose - game_core.player.position;
let mut normalized_movement_direction = raw_movement_direction; let mut normalized_movement_direction = raw_movement_direction;
normalized_movement_direction.normalize(); normalized_movement_direction.normalize();
game_core.player.direction = normalized_movement_direction;
let tau: f32 = PI as f32 * 2.0;
let mut player_angle: f32 = Vector2::zero().angle_to(game_core.player.direction);
let mut desired_angle: f32 = Vector2::zero().angle_to(normalized_movement_direction);
if desired_angle < 0.0 {
desired_angle += tau;
}
if player_angle % tau > desired_angle {
if (player_angle % tau) - desired_angle > PI as f32 {
player_angle += TURN_SPEED;
} else {
player_angle -= TURN_SPEED;
}
} else {
if desired_angle - (player_angle % tau) > PI as f32 {
player_angle -= TURN_SPEED;
} else {
player_angle += TURN_SPEED;
}
}
if f32::abs(player_angle - desired_angle) < (TURN_SPEED * 1.1) {
player_angle = desired_angle;
}
if player_angle > tau {
player_angle -= tau;
}
if player_angle < 0.0 {
player_angle += tau;
}
game_core.player.direction = Vector2::new(f32::cos(player_angle), f32::sin(player_angle));
// In the case the player is in "null", just jump the camera to them // In the case the player is in "null", just jump the camera to them
if game_core.player.position == Vector2::zero() { if game_core.player.position == Vector2::zero() {