Remove the older debug system, rename FPSDebugCameraSystem
This commit is contained in:
parent
7732280229
commit
6e42d94b44
1 changed files with 2 additions and 57 deletions
|
|
@ -13,53 +13,12 @@ use raidillon_glium::GliumPlatform;
|
||||||
use winit::event::{ElementState, Event, WindowEvent};
|
use winit::event::{ElementState, Event, WindowEvent};
|
||||||
use winit::event::DeviceEvent::MouseMotion;
|
use winit::event::DeviceEvent::MouseMotion;
|
||||||
use winit::keyboard::{KeyCode, PhysicalKey};
|
use winit::keyboard::{KeyCode, PhysicalKey};
|
||||||
use raidillon_engine::systems::fps_camera::FPSCameraSystem;
|
use raidillon_engine::systems::fps_camera::FPSDebugCameraSystem;
|
||||||
|
|
||||||
const TEST_GLTF: &str = "pink-monkey.gltf";
|
const TEST_GLTF: &str = "pink-monkey.gltf";
|
||||||
|
|
||||||
const MAIN_SCENE_ID: &str = "main_scene";
|
const MAIN_SCENE_ID: &str = "main_scene";
|
||||||
|
|
||||||
#[derive(Default)]
|
|
||||||
struct InputTestSystem {
|
|
||||||
mouse_delta: (f64, f64),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl System for InputTestSystem {
|
|
||||||
fn handle_event(&mut self, ctx: &mut SystemContext) {
|
|
||||||
let event2 = ctx.platform_context.current_event.clone();
|
|
||||||
match event2 {
|
|
||||||
Event::DeviceEvent { device_id, event} => {
|
|
||||||
match event {
|
|
||||||
MouseMotion { delta } => {
|
|
||||||
self.mouse_delta.0 += delta.0;
|
|
||||||
self.mouse_delta.1 += delta.1;
|
|
||||||
println!("UPDATED mouse delta: ({},{})", self.mouse_delta.0, self.mouse_delta.1);
|
|
||||||
},
|
|
||||||
_ => {}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Event::WindowEvent { event, .. } => match event {
|
|
||||||
WindowEvent::KeyboardInput { device_id, event, is_synthetic} => {
|
|
||||||
let PhysicalKey::Code(key_code) = event.physical_key else {
|
|
||||||
return;
|
|
||||||
};
|
|
||||||
|
|
||||||
match event.state {
|
|
||||||
ElementState::Pressed => {
|
|
||||||
println!("Pressed Key: {:?}", key_code);
|
|
||||||
}
|
|
||||||
ElementState::Released => {
|
|
||||||
println!("Released Key: {:?}", key_code);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ => {},
|
|
||||||
}
|
|
||||||
_ => {},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
struct UpdateAspectRatioSystem;
|
struct UpdateAspectRatioSystem;
|
||||||
impl System for UpdateAspectRatioSystem {
|
impl System for UpdateAspectRatioSystem {
|
||||||
|
|
@ -106,20 +65,6 @@ impl System for RenderingTestSystem {
|
||||||
dbg_ui.text(format!("Frame Delta: {}", ctx.platform_context.time_ctx.frame_dt));
|
dbg_ui.text(format!("Frame Delta: {}", ctx.platform_context.time_ctx.frame_dt));
|
||||||
dbg_ui.text(format!("Fixed Delta: {}", ctx.platform_context.time_ctx.fixed_dt));
|
dbg_ui.text(format!("Fixed Delta: {}", ctx.platform_context.time_ctx.fixed_dt));
|
||||||
dbg_ui.slider_f32("Rotation Speed", -10.0, 10.0, self.rotation_speed.clone());
|
dbg_ui.slider_f32("Rotation Speed", -10.0, 10.0, self.rotation_speed.clone());
|
||||||
|
|
||||||
let input = ctx.input_state.borrow();
|
|
||||||
if input.key_held(KeyCode::KeyW) {
|
|
||||||
dbg_ui.text("W".to_owned());
|
|
||||||
}
|
|
||||||
if input.key_held(KeyCode::KeyA) {
|
|
||||||
dbg_ui.text("A".to_owned());
|
|
||||||
}
|
|
||||||
if input.key_held(KeyCode::KeyS) {
|
|
||||||
dbg_ui.text("S".to_owned());
|
|
||||||
}
|
|
||||||
if input.key_held(KeyCode::KeyD) {
|
|
||||||
dbg_ui.text("D".to_owned());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn fixed_update(&mut self, ctx: &mut SystemContext) {
|
fn fixed_update(&mut self, ctx: &mut SystemContext) {
|
||||||
|
|
@ -133,7 +78,7 @@ impl System for RenderingTestSystem {
|
||||||
fn main() {
|
fn main() {
|
||||||
let mut engine = Engine::new();
|
let mut engine = Engine::new();
|
||||||
// Define systems
|
// Define systems
|
||||||
engine.system_manager.add::<FPSCameraSystem>();
|
engine.system_manager.add::<FPSDebugCameraSystem>();
|
||||||
engine.system_manager.add::<RenderingTestSystem>();
|
engine.system_manager.add::<RenderingTestSystem>();
|
||||||
engine.system_manager.add::<UpdateAspectRatioSystem>();
|
engine.system_manager.add::<UpdateAspectRatioSystem>();
|
||||||
// engine.system_manager.add::<InputTestSystem>();
|
// engine.system_manager.add::<InputTestSystem>();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue