diff --git a/game/game_logic/src/project_constants.rs b/game/game_logic/src/project_constants.rs index b0a32061..bd821f43 100644 --- a/game/game_logic/src/project_constants.rs +++ b/game/game_logic/src/project_constants.rs @@ -44,5 +44,5 @@ pub struct ProjectConstants { pub target_fps: u32, /// The size of the game tiles - pub tile_size: u8, + pub tile_size: u32, } diff --git a/game/game_logic/src/scenes/mod.rs b/game/game_logic/src/scenes/mod.rs index 940ccafd..bd0d0280 100644 --- a/game/game_logic/src/scenes/mod.rs +++ b/game/game_logic/src/scenes/mod.rs @@ -56,6 +56,9 @@ impl SceneRenderDelegate { self.scene_playable .render_frame(raylib, rl_thread, &discord, global_resources, constants) .await; + self.scene_playable + .update_physics(raylib) + .await; } } diff --git a/game/game_logic/src/scenes/player_interaction.rs b/game/game_logic/src/scenes/player_interaction.rs index fb7e25e9..cd1d269d 100644 --- a/game/game_logic/src/scenes/player_interaction.rs +++ b/game/game_logic/src/scenes/player_interaction.rs @@ -2,6 +2,7 @@ use nalgebra as na; use raylib::prelude::*; +use std::time::SystemTime; use crate::{ discord::{DiscordChannel, DiscordRpcSignal}, @@ -15,26 +16,41 @@ use crate::{ pub struct PlayableScene { has_updated_discord_rpc: bool, player: Player, + camera: raylib::camera::Camera2D, + last_update: SystemTime, } impl PlayableScene { /// Construct a new `PlayableScene` pub fn new( - raylib_handle: &mut RaylibHandle, - thread: &RaylibThread, + raylib_handle: &mut raylib::RaylibHandle, + thread: & raylib::RaylibThread, constants: &ProjectConstants, ) -> Self { Self { has_updated_discord_rpc: false, player: Player::new(na::Vector2::new(10.0, 10.0)), + camera: raylib::camera::Camera2D { + target: raylib::math::Vector2 { + x: 0.0, + y: 0.0, + }, + offset: raylib::math::Vector2 { + x: (constants.base_window_size.0 as f32 / 2.0), + y: (constants.base_window_size.1 as f32 / 2.0) + }, + rotation: 0.0, + zoom: 1.0 + }, + last_update: SystemTime::UNIX_EPOCH } } /// Handler for each frame pub async fn render_frame( &mut self, - raylib: &mut RaylibHandle, - rl_thread: &RaylibThread, + raylib: &mut raylib::RaylibHandle, + rl_thread: &raylib::RaylibThread, discord: &DiscordChannel, global_resources: &GlobalResources, constants: &ProjectConstants, @@ -61,16 +77,49 @@ impl PlayableScene { // Clear the screen draw.clear_background(Color::WHITE); - draw.draw_rectangle_lines( - 0, - 0, + for i in 0..100 { + for j in 0..100 { + draw.draw_rectangle( + constants.tile_size as i32 * (i * 2), + constants.tile_size as i32 * (j * 2) * -1, + constants.tile_size as i32, + constants.tile_size as i32, + Color::RED + ) + } + } + + draw.draw_rectangle( + self.player.position[0] as i32, + self.player.position[1] as i32 * -1, (constants.tile_size as f32 * self.player.size) as i32, (constants.tile_size as f32 * self.player.size) as i32, Color::GREEN ); + } + + // Physics + pub async fn update_physics( + &mut self, + raylib: & raylib::RaylibHandle, + ) { + let time = SystemTime::now(); + if time + .duration_since(self.last_update) + .expect("Time Appears to Have Moved Backwards!") + .as_millis() < 16 + { + return + } + + self.last_update = time; - // TODO: Render stuff - // self.player. + let player = &mut self.player; + let h_axis = raylib.is_key_down(KeyboardKey::KEY_D) as i8 - raylib.is_key_down(KeyboardKey::KEY_A) as i8; + let v_axis = raylib.is_key_down(KeyboardKey::KEY_W) as i8 - raylib.is_key_down(KeyboardKey::KEY_S) as i8; + let direction = na::Vector2::new(h_axis as f32, v_axis as f32); + player.velocity += &direction; + player.position += &player.velocity; } }