From d85293d9bf75fd8c2b9d02bc3cbf5519a4d85993 Mon Sep 17 00:00:00 2001 From: gered Date: Sat, 8 Apr 2023 21:04:45 -0400 Subject: [PATCH] remove need to pass a system struct to prepare a new imgui frame just needed the destination bitmap dimensions and we don't need the whole system struct for that --- ggdt_imgui/src/lib.rs | 6 ++---- ggdt_imgui/src/platform.rs | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ggdt_imgui/src/lib.rs b/ggdt_imgui/src/lib.rs index 4eec597..b4fb4b6 100644 --- a/ggdt_imgui/src/lib.rs +++ b/ggdt_imgui/src/lib.rs @@ -2,8 +2,6 @@ use crate::platform::Platform; use crate::renderer::Renderer; use ggdt::graphics::bitmap::rgb::RgbaBitmap; use ggdt::system::event::{SystemEvent, SystemEventHandler}; -use ggdt::system::res::standard::Standard; -use ggdt::system::System; pub mod platform; pub mod renderer; @@ -24,8 +22,8 @@ impl ImGui { ImGui { context, platform, renderer } } - pub fn new_frame(&mut self, system: &mut System) -> &mut imgui::Ui { - self.platform.prepare_frame(&mut self.context, system); + pub fn new_frame(&mut self, dest: &RgbaBitmap) -> &mut imgui::Ui { + self.platform.prepare_frame(&mut self.context, dest); self.context.new_frame() } diff --git a/ggdt_imgui/src/platform.rs b/ggdt_imgui/src/platform.rs index 26719e2..0418993 100644 --- a/ggdt_imgui/src/platform.rs +++ b/ggdt_imgui/src/platform.rs @@ -1,9 +1,7 @@ +use ggdt::graphics::bitmap::rgb::RgbaBitmap; use ggdt::system::event::{KeyModifiers, KeyboardEvent, MouseEvent, SystemEvent}; use ggdt::system::input_devices::keyboard::scancodes::Scancode; use ggdt::system::input_devices::mouse::buttons::MouseButton; -use ggdt::system::res::standard::Standard; -use ggdt::system::res::SystemResources; -use ggdt::system::System; use std::time::Instant; fn handle_key(io: &mut imgui::Io, key: Scancode, down: bool) { @@ -201,14 +199,14 @@ impl Platform { } } - pub fn prepare_frame(&mut self, context: &mut imgui::Context, system: &System) { + pub fn prepare_frame(&mut self, context: &mut imgui::Context, dest: &RgbaBitmap) { let io = context.io_mut(); let now = Instant::now(); io.update_delta_time(now.duration_since(self.last_frame)); self.last_frame = now; - io.display_size = [system.res.width() as f32, system.res.height() as f32]; + io.display_size = [dest.width() as f32, dest.height() as f32]; io.display_framebuffer_scale = [1.0, 1.0]; } }