From 700f50ab8ea3927cf1de864986cb5c474aaacd25 Mon Sep 17 00:00:00 2001 From: HampusM Date: Thu, 2 Jul 2026 17:01:31 +0200 Subject: refactor(engine): remove windowing panic hook --- engine/Cargo.toml | 6 ------ engine/src/windowing.rs | 37 ------------------------------------- 2 files changed, 43 deletions(-) (limited to 'engine') diff --git a/engine/Cargo.toml b/engine/Cargo.toml index 6bd7985..f2efec4 100644 --- a/engine/Cargo.toml +++ b/engine/Cargo.toml @@ -11,7 +11,6 @@ bitflags = "2.4.0" tracing = "0.1.39" seq-macro = "0.3.5" paste = "1.0.14" -parking_lot = "0.12.3" safer-ffi = "0.1.13" nu-ansi-term = "0.46.0" crossbeam-queue = "0.3.12" @@ -46,11 +45,6 @@ version = "=1.13.1" default-features = false # The "fallback" feature should not be enabled features = ["require-cas"] -[dependencies.rfd] -version = "0.17.2" -default-features = false -features = ["wayland", "gtk3"] - [dependencies.dear-imgui-rs] git = "https://github.com/HampusMat/dear-imgui-rs" branch = "windows-always-static-libstdc++" diff --git a/engine/src/windowing.rs b/engine/src/windowing.rs index 75d0c18..38b8ab1 100644 --- a/engine/src/windowing.rs +++ b/engine/src/windowing.rs @@ -1,5 +1,3 @@ -use std::borrow::Cow; -use std::env::consts::EXE_SUFFIX; use std::hint::cold_path; use std::panic::catch_unwind; use std::sync::atomic::{AtomicBool, Ordering}; @@ -9,7 +7,6 @@ use std::thread::Builder as ThreadBuilder; use crossbeam_queue::ArrayQueue; use ecs::error::Error as EcsError; use raw_window_handle::{DisplayHandle, HandleError, HasDisplayHandle, WindowHandle}; -use rfd::{MessageButtons, MessageDialog, MessageLevel}; use winit::application::ApplicationHandler; use winit::error::EventLoopError; use winit::event::{DeviceEvent, DeviceId, StartCause, WindowEvent}; @@ -82,40 +79,6 @@ impl crate::ecs::extension::Extension for Extension { fn collect(self, mut collector: crate::ecs::extension::Collector<'_>) { - if cfg!(not(debug_assertions)) { - std::panic::set_hook(Box::new(|panic_info| { - let panic_message: Cow<'static, str> = if let Some(panic_message) = - panic_info.payload().downcast_ref::<&'static str>() - { - (*panic_message).into() - } else if let Some(panic_message) = - panic_info.payload().downcast_ref::() - { - panic_message.clone().into() - } else { - "(unknown panic payload type)".into() - }; - - MessageDialog::new() - .set_level(MessageLevel::Error) - .set_title(format!( - "{}: A critical error occurred", - std::env::current_exe().map_or_else( - |_| env!("CARGO_CRATE_NAME").to_owned(), - |current_exe_path| current_exe_path - .file_name() - .unwrap() - .to_string_lossy() - .trim_end_matches(EXE_SUFFIX) - .to_owned() - ) - )) - .set_description(panic_message) - .set_buttons(MessageButtons::Ok) - .show(); - })); - } - if !CONTEXT_CREATED.load(Ordering::Relaxed) { collector.add_sole(Context::new()).ok(); } -- cgit v1.2.3-18-g5258