summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.lock237
-rw-r--r--engine/Cargo.toml6
-rw-r--r--engine/src/windowing.rs37
3 files changed, 14 insertions, 266 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 6a70f80..721e3fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -106,18 +106,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
[[package]]
-name = "atk-sys"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
name = "atomic-waker"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -212,15 +200,6 @@ dependencies = [
]
[[package]]
-name = "block2"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
-dependencies = [
- "objc2 0.6.4",
-]
-
-[[package]]
name = "build-rs"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -254,16 +233,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
[[package]]
-name = "cairo-sys-rs"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
-dependencies = [
- "libc",
- "system-deps",
-]
-
-[[package]]
name = "calloop"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -323,16 +292,6 @@ dependencies = [
]
[[package]]
-name = "cfg-expr"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
-dependencies = [
- "smallvec",
- "target-lexicon",
-]
-
-[[package]]
name = "cfg-if"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -600,8 +559,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
dependencies = [
"bitflags 2.11.1",
- "block2 0.6.2",
- "libc",
"objc2 0.6.4",
]
@@ -647,11 +604,9 @@ dependencies = [
"image",
"nu-ansi-term 0.46.0",
"opengl-bindings",
- "parking_lot",
"paste",
"portable-atomic",
"raw-window-handle",
- "rfd",
"safer-ffi",
"seq-macro",
"serde",
@@ -860,36 +815,6 @@ dependencies = [
]
[[package]]
-name = "gdk-pixbuf-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
-dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gdk-sys"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7"
-dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "pkg-config",
- "system-deps",
-]
-
-[[package]]
name = "gethostname"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -929,19 +854,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
[[package]]
-name = "gio-sys"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
- "winapi",
-]
-
-[[package]]
name = "gl_generator"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -953,16 +865,6 @@ dependencies = [
]
[[package]]
-name = "glib-sys"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
-dependencies = [
- "libc",
- "system-deps",
-]
-
-[[package]]
name = "glob"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1023,17 +925,6 @@ dependencies = [
]
[[package]]
-name = "gobject-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
name = "graphviz-sys"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1043,24 +934,6 @@ dependencies = [
]
[[package]]
-name = "gtk-sys"
-version = "0.18.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414"
-dependencies = [
- "atk-sys",
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "system-deps",
-]
-
-[[package]]
name = "half"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1088,12 +961,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
name = "hermit-abi"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1493,7 +1360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
dependencies = [
"bitflags 2.11.1",
- "block2 0.5.1",
+ "block2",
"libc",
"objc2 0.5.2",
"objc2-core-data",
@@ -1509,7 +1376,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc"
dependencies = [
"bitflags 2.11.1",
- "block2 0.6.2",
"objc2 0.6.4",
"objc2-core-foundation",
"objc2-foundation 0.3.1",
@@ -1522,7 +1388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
dependencies = [
"bitflags 2.11.1",
- "block2 0.5.1",
+ "block2",
"objc2 0.5.2",
"objc2-core-location",
"objc2-foundation 0.2.2",
@@ -1534,7 +1400,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
dependencies = [
- "block2 0.5.1",
+ "block2",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
]
@@ -1546,7 +1412,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
dependencies = [
"bitflags 2.11.1",
- "block2 0.5.1",
+ "block2",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
]
@@ -1568,7 +1434,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
dependencies = [
- "block2 0.5.1",
+ "block2",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
"objc2-metal",
@@ -1580,7 +1446,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
dependencies = [
- "block2 0.5.1",
+ "block2",
"objc2 0.5.2",
"objc2-contacts",
"objc2-foundation 0.2.2",
@@ -1599,7 +1465,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
dependencies = [
"bitflags 2.11.1",
- "block2 0.5.1",
+ "block2",
"dispatch",
"libc",
"objc2 0.5.2",
@@ -1622,7 +1488,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
dependencies = [
- "block2 0.5.1",
+ "block2",
"objc2 0.5.2",
"objc2-app-kit 0.2.2",
"objc2-foundation 0.2.2",
@@ -1635,7 +1501,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
dependencies = [
"bitflags 2.11.1",
- "block2 0.5.1",
+ "block2",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
]
@@ -1647,7 +1513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
dependencies = [
"bitflags 2.11.1",
- "block2 0.5.1",
+ "block2",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
"objc2-metal",
@@ -1670,7 +1536,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
dependencies = [
"bitflags 2.11.1",
- "block2 0.5.1",
+ "block2",
"objc2 0.5.2",
"objc2-cloud-kit",
"objc2-core-data",
@@ -1690,7 +1556,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
dependencies = [
- "block2 0.5.1",
+ "block2",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
]
@@ -1702,7 +1568,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
dependencies = [
"bitflags 2.11.1",
- "block2 0.5.1",
+ "block2",
"objc2 0.5.2",
"objc2-core-location",
"objc2-foundation 0.2.2",
@@ -1759,18 +1625,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
-name = "pango-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
name = "parking_lot"
version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2032,35 +1886,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
-name = "rfd"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20dafead71c16a34e1ff357ddefc8afc11e7d51d6d2b9fbd07eaa48e3e540220"
-dependencies = [
- "block2 0.6.2",
- "dispatch2",
- "glib-sys",
- "gobject-sys",
- "gtk-sys",
- "js-sys",
- "libc",
- "log",
- "objc2 0.6.4",
- "objc2-app-kit 0.3.1",
- "objc2-core-foundation",
- "objc2-foundation 0.3.1",
- "percent-encoding",
- "raw-window-handle",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols",
- "web-sys",
- "windows-sys 0.61.2",
-]
-
-[[package]]
name = "ring"
version = "0.17.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2439,19 +2264,6 @@ dependencies = [
]
[[package]]
-name = "system-deps"
-version = "6.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
-dependencies = [
- "cfg-expr",
- "heck",
- "pkg-config",
- "toml",
- "version-compare",
-]
-
-[[package]]
name = "tar"
version = "0.4.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2463,12 +2275,6 @@ dependencies = [
]
[[package]]
-name = "target-lexicon"
-version = "0.12.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
-
-[[package]]
name = "thiserror"
version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2708,12 +2514,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
[[package]]
-name = "version-compare"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e"
-
-[[package]]
name = "version_check"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3065,15 +2865,6 @@ dependencies = [
]
[[package]]
-name = "windows-sys"
-version = "0.61.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
name = "windows-targets"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3261,7 +3052,7 @@ dependencies = [
"android-activity",
"atomic-waker",
"bitflags 2.11.1",
- "block2 0.5.1",
+ "block2",
"bytemuck",
"calloop",
"cfg_aliases",
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::<String>()
- {
- 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();
}
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2026-07-04 10:55:42 +0000