nonsensical-dev/zenyx-engine
nonsensical-dev/zenyx-engine
3
0
Fork 2
Code Issues 6 Pull requests 2 Projects 1 Releases Activity Actions

feat: handle spawning multiple windows

Browse source
This commit is contained in:
Chance 2025-03-24 19:42:32 -04:00 • committed by BitSyndicate
parent ae2316bb88
commit d26499823b
Signed by: bitsyndicate
GPG key ID: 443E4198D6BBA6DE
6 changed files with 61 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

86
engine/src/core/render/mod.rs
View file

@ -1,7 +1,7 @@
use std::sync::Arc;
use ctx::WgpuCtx;
use log::{debug, trace};
use tracing::{debug, error, info, trace, warn};
use winit::application::ApplicationHandler;
use winit::event::WindowEvent;
use winit::event_loop::ControlFlow;
@ -11,20 +11,20 @@ pub mod ctx;
#[derive(Default)]
pub struct App<'window> {
window: Option<Arc<Window>>,
window: Vec<Arc<Window>>,
ctx: Option<WgpuCtx<'window>>,
}
impl ApplicationHandler for App<'_> {
fn resumed(&mut self, event_loop: &ActiveEventLoop) {
if self.window.is_none() {
if self.window.is_empty() {
let win_attr = Window::default_attributes().with_title("Zenyx");
let window = Arc::new(
event_loop
.create_window(win_attr)
.expect("create window err."),
);
self.window = Some(window.clone());
self.window.push(window.clone());
let wgpu_ctx = WgpuCtx::new_blocking(window.clone()).unwrap();
self.ctx = Some(wgpu_ctx)
}
@ -33,53 +33,77 @@ impl ApplicationHandler for App<'_> {
fn window_event(
&mut self,
event_loop: &ActiveEventLoop,
_window_id: WindowId,
window_id: WindowId,
event: WindowEvent,
) {
match event {
WindowEvent::CloseRequested => {
event_loop.exit();
debug!("Window closed, exiting");
std::process::exit(0)
if let Some(index) = self.window.iter().position(|window| window.id() == window_id) {
let window = self.window.remove(index);
// how do i close a window :(
window.set_title("Dead window");
debug!("Window closed, exiting");
}
if self.window.is_empty() {
event_loop.exit();
}
}
WindowEvent::KeyboardInput { device_id, event, is_synthetic } => {
match event.physical_key {
winit::keyboard::PhysicalKey::Code(code) => {
if event.state.is_pressed() == false {
return;
}
if code == winit::keyboard::KeyCode::Escape {
// event_loop.exit();
debug!("Window closed, exiting");
WindowEvent::KeyboardInput {
device_id,
event,
is_synthetic,
} => match event.physical_key {
winit::keyboard::PhysicalKey::Code(code) => {
if event.state.is_pressed() == false {
return;
}
match code {
winit::keyboard::KeyCode::Space => {
debug!("Space key pressed");
if let Some(ctx) = &mut self.ctx {
match ctx.bg_color() {
wgpu::Color::WHITE => ctx.change_bg_color(wgpu::Color::BLACK),
wgpu::Color::BLACK => ctx.change_bg_color(wgpu::Color::WHITE),
_ => ctx.change_bg_color(wgpu::Color::WHITE),
}
}
// std::process::exit(0)
}
winit::keyboard::KeyCode::Escape => {
debug!("Escape key pressed, spawning new window");
let win_attr =
Window::default_attributes().with_title("Zenyx - New Window");
let new_window = Arc::new(
event_loop
.create_window(win_attr)
.expect("create window err."),
);
self.window.push(new_window.clone());
let wgpu_ctx = WgpuCtx::new_blocking(new_window.clone()).unwrap();
self.ctx = Some(wgpu_ctx);
}
_ => info!("Unimplemented keycode: {:?}", code),
}
}
_ => {}
}
}
},
WindowEvent::RedrawRequested => {
if let Some(ctx) = &mut self.ctx {
ctx.draw();
}
if let Some(window) = &self.window {
for window in &self.window {
if let Some(ctx) = &mut self.ctx {
ctx.draw();
}
window.request_redraw();
}
}
WindowEvent::Resized(size) => {
if let (Some(wgpu_ctx), Some(window)) = (&mut self.ctx, &self.window) {
wgpu_ctx.resize(size.into());
window.request_redraw();
let size_str: String = size.height.to_string() + "x" + &size.width.to_string();
//self.window.as_ref().unwrap().set_title(&format!("you reszed the window to
// {size_str}"));
debug!("Window resized to {:?}", size_str);
if let Some(window) = self.window.iter().find(|w| w.id() == window_id) {
if let Some(wgpu_ctx) = &mut self.ctx {
wgpu_ctx.resize(size.into());
window.request_redraw();
let size_str: String =
size.height.to_string() + "x" + &size.width.to_string();
debug!("Window resized to {:?}", size_str);
}
}
}
_ => trace!("Unhandled window event"),