From 9c44fe09d0ffd77070cec4ae606c25b3c4764050 Mon Sep 17 00:00:00 2001
From: Reuben Thomas <40617058+reuben-thomas@users.noreply.github.com>
Date: Tue, 2 Jul 2024 13:54:53 +0800
Subject: [PATCH] Improved camera controls (#218)

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>
---
 Cargo.lock                                    | 1138 +++++++----------
 rmf_site_editor/Cargo.toml                    |    1 +
 rmf_site_editor/src/interaction/assets.rs     |   25 +
 .../src/interaction/camera_controls/cursor.rs |  426 ++++++
 .../interaction/camera_controls/keyboard.rs   |  330 +++++
 .../mod.rs}                                   |  288 ++---
 .../src/interaction/camera_controls/utils.rs  |  124 ++
 rmf_site_editor/src/site/site.rs              |    2 +-
 rmf_site_editor/src/widgets/mod.rs            |   14 +-
 .../src/widgets/user_camera_display.rs        |   62 +
 10 files changed, 1610 insertions(+), 800 deletions(-)
 create mode 100644 rmf_site_editor/src/interaction/camera_controls/cursor.rs
 create mode 100644 rmf_site_editor/src/interaction/camera_controls/keyboard.rs
 rename rmf_site_editor/src/interaction/{camera_controls.rs => camera_controls/mod.rs} (67%)
 create mode 100644 rmf_site_editor/src/interaction/camera_controls/utils.rs
 create mode 100644 rmf_site_editor/src/widgets/user_camera_display.rs

diff --git a/Cargo.lock b/Cargo.lock
index 8dde6c84..f5c566d3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.26"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd"
+checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
 name = "accesskit"
-version = "0.12.3"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b"
+checksum = "6cb10ed32c63247e4e39a8f42e8e30fb9442fbf7878c8e4a9849e7e381619bea"
 
 [[package]]
 name = "accesskit_consumer"
@@ -41,7 +41,7 @@ checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
- "objc2 0.3.0-beta.3.patch-leaks.3",
+ "objc2",
  "once_cell",
 ]
 
@@ -73,9 +73,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
  "gimli",
 ]
@@ -101,18 +101,18 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "alsa"
@@ -121,7 +121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce"
 dependencies = [
  "alsa-sys",
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "libc",
 ]
 
@@ -182,48 +182,47 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.14"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
- "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.4"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.3"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -231,9 +230,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
 
 [[package]]
 name = "approx"
@@ -246,18 +245,19 @@ dependencies = [
 
 [[package]]
 name = "arboard"
-version = "3.4.0"
+version = "3.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89"
+checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58"
 dependencies = [
  "clipboard-win",
- "core-graphics 0.23.2",
- "image 0.25.1",
+ "core-graphics 0.23.1",
+ "image",
  "log",
- "objc2 0.5.2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc",
+ "objc-foundation",
+ "objc_id",
  "parking_lot",
+ "thiserror",
  "windows-sys 0.48.0",
  "x11rb",
 ]
@@ -306,26 +306,28 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "2.3.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3"
 dependencies = [
  "concurrent-queue",
- "event-listener-strategy",
+ "event-listener 5.2.0",
+ "event-listener-strategy 0.5.0",
  "futures-core",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "async-executor"
-version = "1.12.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0"
+checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c"
 dependencies = [
+ "async-lock 3.3.0",
  "async-task",
  "concurrent-queue",
- "fastrand 2.1.0",
- "futures-lite 2.3.0",
+ "fastrand 2.0.1",
+ "futures-lite 2.2.0",
  "slab",
 ]
 
@@ -335,7 +337,7 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
 dependencies = [
- "async-lock",
+ "async-lock 2.8.0",
  "autocfg",
  "blocking",
  "futures-lite 1.13.0",
@@ -350,11 +352,22 @@ dependencies = [
  "event-listener 2.5.3",
 ]
 
+[[package]]
+name = "async-lock"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
+dependencies = [
+ "event-listener 4.0.3",
+ "event-listener-strategy 0.4.0",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "async-task"
-version = "4.7.1"
+version = "4.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
 
 [[package]]
 name = "atk-sys"
@@ -385,15 +398,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
  "addr2line",
  "cc",
@@ -416,12 +429,6 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
 [[package]]
 name = "bevy"
 version = "0.12.1"
@@ -486,7 +493,7 @@ checksum = "935984568f75867dd7357133b06f4b1502cd2be55e4642d483ce597e46e63bff"
 dependencies = [
  "async-broadcast",
  "async-fs",
- "async-lock",
+ "async-lock 2.8.0",
  "bevy_app",
  "bevy_asset_macros",
  "bevy_ecs",
@@ -519,7 +526,7 @@ dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -572,7 +579,7 @@ dependencies = [
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "radsort",
  "serde",
 ]
@@ -585,7 +592,7 @@ checksum = "f484318350462c58ba3942a45a656c1fd6b6e484a6b6b7abc3a787ad1a51e500"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -633,7 +640,7 @@ dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -736,7 +743,7 @@ dependencies = [
  "bevy_transform",
  "gltf",
  "gltf-json",
- "image 0.24.9",
+ "image",
  "serde",
  "serde_json",
  "thiserror",
@@ -843,7 +850,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc-hash",
- "syn 2.0.67",
+ "syn 2.0.52",
  "toml_edit 0.20.7",
 ]
 
@@ -873,7 +880,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35d72134cd809630e78bc953318156f37ff2839a50bebb148bc5c3a669e133e0"
 dependencies = [
  "bevy",
- "bitfield 0.14.0",
+ "bitfield",
  "interpolation",
  "thiserror",
  "wgpu-types",
@@ -935,7 +942,7 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "bytemuck",
  "fixedbitset",
  "naga_oil",
@@ -951,7 +958,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc6824e97e332fafcbfe31d169b2b9073b9ba568b2a9f59cfd3ac4697982b4bf"
 dependencies = [
  "bevy",
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "naga",
 ]
 
@@ -989,7 +996,7 @@ dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
  "uuid",
 ]
 
@@ -1017,14 +1024,14 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "bytemuck",
  "codespan-reporting",
  "downcast-rs",
  "encase",
  "futures-lite 1.13.0",
  "hexasphere",
- "image 0.24.9",
+ "image",
  "js-sys",
  "ktx2",
  "naga",
@@ -1048,7 +1055,7 @@ dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1089,7 +1096,7 @@ dependencies = [
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "bytemuck",
  "fixedbitset",
  "guillotiere",
@@ -1106,7 +1113,7 @@ checksum = "b503a4a2a4e15456ae19e7f467b7f3447ccdcf9bbb10de9f4f3c1b2e88e12cdd"
 dependencies = [
  "anyhow",
  "bevy",
- "futures-lite 2.3.0",
+ "futures-lite 2.2.0",
  "stl_io",
  "thiserror",
 ]
@@ -1214,7 +1221,7 @@ dependencies = [
  "ahash",
  "bevy_utils_proc_macros",
  "getrandom",
- "hashbrown 0.14.5",
+ "hashbrown 0.14.3",
  "instant",
  "nonmax",
  "petgraph",
@@ -1231,7 +1238,7 @@ checksum = "7aafecc952b6b8eb1a93c12590bd867d25df2f4ae1033a01dfdfc3c35ebccfff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1281,7 +1288,7 @@ version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "cexpr",
  "clang-sys",
  "itertools 0.12.1",
@@ -1292,7 +1299,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1322,12 +1329,6 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"
 
-[[package]]
-name = "bitfield"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c821a6e124197eb56d907ccc2188eab1038fb919c914f47976e64dd8dbc855d1"
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -1336,18 +1337,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "blake3"
-version = "1.5.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -1377,7 +1378,7 @@ version = "0.1.0-beta.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
 dependencies = [
- "objc-sys 0.2.0-beta.2",
+ "objc-sys",
 ]
 
 [[package]]
@@ -1387,29 +1388,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
 dependencies = [
  "block-sys",
- "objc2-encode 2.0.0-pre.2",
-]
-
-[[package]]
-name = "block2"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
-dependencies = [
- "objc2 0.5.2",
+ "objc2-encode",
 ]
 
 [[package]]
 name = "blocking"
-version = "1.6.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
 dependencies = [
- "async-channel 2.3.1",
+ "async-channel 2.2.0",
+ "async-lock 3.3.0",
  "async-task",
+ "fastrand 2.0.1",
  "futures-io",
- "futures-lite 2.3.0",
+ "futures-lite 2.2.0",
  "piper",
+ "tracing",
 ]
 
 [[package]]
@@ -1424,28 +1419,28 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b"
 
 [[package]]
 name = "bytemuck"
-version = "1.16.1"
+version = "1.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
+checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.7.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b"
+checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1456,9 +1451,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cairo-sys-rs"
@@ -1472,13 +1467,12 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.99"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+checksum = "a0ba8f7aaa012f30d5b2861462f6708eccd49c3c39863fe083a308035f63d723"
 dependencies = [
  "jobserver",
  "libc",
- "once_cell",
 ]
 
 [[package]]
@@ -1498,9 +1492,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.8"
+version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -1518,29 +1512,23 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
-[[package]]
-name = "cfg_aliases"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "num-traits",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
 name = "chrono-tz"
-version = "0.9.0"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb"
+checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e"
 dependencies = [
  "chrono",
  "chrono-tz-build",
@@ -1549,9 +1537,9 @@ dependencies = [
 
 [[package]]
 name = "chrono-tz-build"
-version = "0.3.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1"
+checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f"
 dependencies = [
  "parse-zoneinfo",
  "phf",
@@ -1560,9 +1548,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.8.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
 dependencies = [
  "glob",
  "libc",
@@ -1571,9 +1559,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.7"
+version = "4.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1581,9 +1569,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.7"
+version = "4.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1593,27 +1581,27 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.5"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
 dependencies = [
- "heck 0.5.0",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "clipboard-win"
-version = "5.3.1"
+version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad"
+checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297"
 dependencies = [
  "error-code",
 ]
@@ -1636,9 +1624,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "com-rs"
@@ -1648,9 +1636,9 @@ checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
 
 [[package]]
 name = "combine"
-version = "4.6.7"
+version = "4.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
 dependencies = [
  "bytes",
  "memchr",
@@ -1658,9 +1646,9 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "2.5.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1695,9 +1683,9 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
 [[package]]
 name = "constgebra"
-version = "0.1.4"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1aaf9b65849a68662ac6c0810c8893a765c960b907dd7cfab9c4a50bf764fbc"
+checksum = "edd23e864550e6dafc1e41ac78ce4f1ccddc8672b40c403524a04ff3f0518420"
 dependencies = [
  "const_soft_float",
 ]
@@ -1742,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "core-graphics"
-version = "0.23.2"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
+checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
@@ -1818,9 +1806,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
 dependencies = [
  "cfg-if",
 ]
@@ -1833,9 +1821,9 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.13"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1861,9 +1849,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "crunchy"
@@ -1887,7 +1875,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "libloading 0.8.3",
  "winapi",
 ]
@@ -1900,15 +1888,15 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
 
 [[package]]
 name = "data-encoding"
-version = "2.6.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
 [[package]]
 name = "deunicode"
-version = "1.6.0"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00"
+checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94"
 
 [[package]]
 name = "digest"
@@ -1958,9 +1946,9 @@ dependencies = [
 
 [[package]]
 name = "downcast-rs"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "earcutr"
@@ -1998,7 +1986,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e598cc2bfc28612f26426259ed99a978270e9433d63ae6d2843e30fb0974cd02"
 dependencies = [
- "async-channel 2.3.1",
+ "async-channel 2.2.0",
  "document-features",
  "js-sys",
  "ureq",
@@ -2009,9 +1997,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.12.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 
 [[package]]
 name = "emath"
@@ -2051,7 +2039,7 @@ checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -2086,9 +2074,9 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2102,9 +2090,9 @@ checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
 
 [[package]]
 name = "euclid"
-version = "0.22.10"
+version = "0.22.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20"
+checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787"
 dependencies = [
  "num-traits",
 ]
@@ -2117,9 +2105,20 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "event-listener"
-version = "5.3.1"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -2128,11 +2127,21 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.5.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
 dependencies = [
- "event-listener 5.3.1",
+ "event-listener 4.0.3",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291"
+dependencies = [
+ "event-listener 5.2.0",
  "pin-project-lite",
 ]
 
@@ -2163,9 +2172,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "fdeflate"
@@ -2184,9 +2193,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -2255,7 +2264,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -2308,11 +2317,11 @@ dependencies = [
 
 [[package]]
 name = "futures-lite"
-version = "2.3.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba"
 dependencies = [
- "fastrand 2.1.0",
+ "fastrand 2.0.1",
  "futures-core",
  "futures-io",
  "parking",
@@ -2409,9 +2418,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2432,9 +2441,9 @@ dependencies = [
 
 [[package]]
 name = "gilrs"
-version = "0.10.7"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b54e5e39844ab5cddaf3bbbdfdc2923a6cb34e36818b95618da4e3f26302c24c"
+checksum = "d8b2e57a9cb946b5d04ae8638c5f554abb5a9f82c4c950fd5b1fee6d119592fb"
 dependencies = [
  "fnv",
  "gilrs-core",
@@ -2445,9 +2454,9 @@ dependencies = [
 
 [[package]]
 name = "gilrs-core"
-version = "0.5.12"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b922f294d9f062af517ea0bd0a036ddcf11c2842211c2f9c71a3ceee859e10b6"
+checksum = "0af1827b7dd2f36d740ae804c1b3ea0d64c12533fb61ff91883005143a0e8c5a"
 dependencies = [
  "core-foundation",
  "inotify",
@@ -2461,14 +2470,14 @@ dependencies = [
  "vec_map",
  "wasm-bindgen",
  "web-sys",
- "windows 0.57.0",
+ "windows 0.52.0",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "gio-sys"
@@ -2518,17 +2527,17 @@ dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.6",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
 name = "globwalk"
-version = "0.9.1"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757"
+checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 1.3.2",
  "ignore",
  "walkdir",
 ]
@@ -2547,9 +2556,9 @@ dependencies = [
 
 [[package]]
 name = "gltf"
-version = "1.4.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ce1918195723ce6ac74e80542c5a96a40c2b26162c1957a5cd70799b8cacf7"
+checksum = "3b78f069cf941075835822953c345b9e1edd67ae347b81ace3aea9de38c2ef33"
 dependencies = [
  "byteorder",
  "gltf-json",
@@ -2559,21 +2568,21 @@ dependencies = [
 
 [[package]]
 name = "gltf-derive"
-version = "1.4.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14070e711538afba5d6c807edb74bcb84e5dbb9211a3bf5dea0dfab5b24f4c51"
+checksum = "438ffe1a5540d75403feaf23636b164e816e93f6f03131674722b3886ce32a57"
 dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "gltf-json"
-version = "1.4.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6176f9d60a7eab0a877e8e96548605dedbde9190a7ae1e80bbcc1c9af03ab14"
+checksum = "655951ba557f2bc69ea4b0799446bae281fa78efae6319968bdd2c3e9a06d8e1"
 dependencies = [
  "gltf-derive",
  "serde",
@@ -2609,7 +2618,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "gpu-alloc-types",
 ]
 
@@ -2619,7 +2628,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
 ]
 
 [[package]]
@@ -2641,9 +2650,9 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "gpu-descriptor-types",
- "hashbrown 0.14.5",
+ "hashbrown 0.14.3",
 ]
 
 [[package]]
@@ -2652,7 +2661,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
 ]
 
 [[package]]
@@ -2697,8 +2706,8 @@ dependencies = [
  "crossbeam-channel",
  "dirs",
  "ehttp",
- "futures-lite 2.3.0",
- "itertools 0.13.0",
+ "futures-lite 1.13.0",
+ "itertools 0.11.0",
  "serde",
  "serde_json",
 ]
@@ -2730,9 +2739,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -2778,9 +2787,9 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.5.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hexasphere"
@@ -2859,7 +2868,7 @@ dependencies = [
  "globset",
  "log",
  "memchr",
- "regex-automata 0.4.7",
+ "regex-automata 0.4.6",
  "same-file",
  "walkdir",
  "winapi-util",
@@ -2883,19 +2892,6 @@ dependencies = [
  "tiff",
 ]
 
-[[package]]
-name = "image"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
-dependencies = [
- "bytemuck",
- "byteorder",
- "num-traits",
- "png",
- "tiff",
-]
-
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -2908,12 +2904,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.14.3",
 ]
 
 [[package]]
@@ -2944,9 +2940,9 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.13"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2962,20 +2958,14 @@ checksum = "d3b7357d2bbc5ee92f8e899ab645233e43d21407573cceb37fed8bc3dede2c02"
 
 [[package]]
 name = "io-kit-sys"
-version = "0.4.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b"
+checksum = "4769cb30e5dcf1710fc6730d3e94f78c47723a014a567de385e113c737394640"
 dependencies = [
  "core-foundation-sys",
  "mach2",
 ]
 
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
-
 [[package]]
 name = "itertools"
 version = "0.11.0"
@@ -2994,20 +2984,11 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "jni"
@@ -3033,9 +3014,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.31"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
 dependencies = [
  "libc",
 ]
@@ -3080,9 +3061,9 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.5.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lazycell"
@@ -3109,9 +3090,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libloading"
@@ -3130,7 +3111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -3141,23 +3122,24 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libredox"
-version = "0.0.2"
+version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "libc",
  "redox_syscall 0.4.1",
 ]
 
 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "libc",
+ "redox_syscall 0.4.1",
 ]
 
 [[package]]
@@ -3178,9 +3160,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "litrs"
@@ -3190,9 +3172,9 @@ checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -3243,9 +3225,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "metal"
@@ -3253,7 +3235,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "block",
  "core-graphics-types",
  "foreign-types 0.5.0",
@@ -3270,9 +3252,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
  "simd-adler32",
@@ -3297,7 +3279,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e"
 dependencies = [
  "bit-set",
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "codespan-reporting",
  "hexf-parse",
  "indexmap 1.9.3",
@@ -3333,9 +3315,9 @@ dependencies = [
 
 [[package]]
 name = "nalgebra"
-version = "0.32.6"
+version = "0.32.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5c17de023a86f59ed79891b2e5d5a94c705dbe904a5b5c9c952ea6221b03e4"
+checksum = "3ea4908d4f23254adda3daa60ffef0f1ac7b8c3e9a864cf3cc154b251908a2ef"
 dependencies = [
  "approx",
  "matrixmultiply",
@@ -3378,7 +3360,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "jni-sys",
  "log",
  "ndk-sys 0.5.0+25.2.9519653",
@@ -3412,13 +3394,12 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.29.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "cfg-if",
- "cfg_aliases 0.2.1",
  "libc",
 ]
 
@@ -3465,9 +3446,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
 dependencies = [
  "num-traits",
 ]
@@ -3491,7 +3472,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -3505,19 +3486,20 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.4.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
 dependencies = [
+ "autocfg",
  "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.19"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
 dependencies = [
  "autocfg",
  "libm",
@@ -3571,7 +3553,7 @@ dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -3583,7 +3565,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -3613,71 +3595,15 @@ version = "0.2.0-beta.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
 
-[[package]]
-name = "objc-sys"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
-
 [[package]]
 name = "objc2"
 version = "0.3.0-beta.3.patch-leaks.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
 dependencies = [
- "block2 0.2.0-alpha.6",
- "objc-sys 0.2.0-beta.2",
- "objc2-encode 2.0.0-pre.2",
-]
-
-[[package]]
-name = "objc2"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
-dependencies = [
- "objc-sys 0.3.5",
- "objc2-encode 4.0.3",
-]
-
-[[package]]
-name = "objc2-app-kit"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
-dependencies = [
- "bitflags 2.5.0",
- "block2 0.5.1",
- "libc",
- "objc2 0.5.2",
- "objc2-core-data",
- "objc2-core-image",
- "objc2-foundation",
- "objc2-quartz-core",
-]
-
-[[package]]
-name = "objc2-core-data"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
-dependencies = [
- "bitflags 2.5.0",
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-core-image"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
-dependencies = [
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-foundation",
- "objc2-metal",
+ "block2",
+ "objc-sys",
+ "objc2-encode",
 ]
 
 [[package]]
@@ -3686,50 +3612,7 @@ version = "2.0.0-pre.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
 dependencies = [
- "objc-sys 0.2.0-beta.2",
-]
-
-[[package]]
-name = "objc2-encode"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
-
-[[package]]
-name = "objc2-foundation"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
-dependencies = [
- "bitflags 2.5.0",
- "block2 0.5.1",
- "libc",
- "objc2 0.5.2",
-]
-
-[[package]]
-name = "objc2-metal"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
-dependencies = [
- "bitflags 2.5.0",
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-quartz-core"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
-dependencies = [
- "bitflags 2.5.0",
- "block2 0.5.1",
- "objc2 0.5.2",
- "objc2-foundation",
- "objc2-metal",
+ "objc-sys",
 ]
 
 [[package]]
@@ -3752,9 +3635,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.0"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
@@ -3840,9 +3723,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.21.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5"
+checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7"
 dependencies = [
  "ttf-parser",
 ]
@@ -3867,9 +3750,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -3877,31 +3760,31 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.2",
+ "redox_syscall 0.4.1",
  "smallvec",
- "windows-targets 0.52.5",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "parse-zoneinfo"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24"
+checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41"
 dependencies = [
  "regex",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.15"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
 [[package]]
 name = "pathdiff"
@@ -3917,9 +3800,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.10"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
+checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8"
 dependencies = [
  "memchr",
  "thiserror",
@@ -3928,9 +3811,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.10"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459"
+checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026"
 dependencies = [
  "pest",
  "pest_generator",
@@ -3938,22 +3821,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.10"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687"
+checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.10"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd"
+checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293"
 dependencies = [
  "once_cell",
  "pest",
@@ -3962,12 +3845,12 @@ dependencies = [
 
 [[package]]
 name = "petgraph"
-version = "0.6.5"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.2.6",
+ "indexmap 2.2.5",
 ]
 
 [[package]]
@@ -4010,18 +3893,18 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
 
 [[package]]
 name = "piper"
-version = "0.2.3"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
+checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
 dependencies = [
  "atomic-waker",
- "fastrand 2.1.0",
+ "fastrand 2.0.1",
  "futures-io",
 ]
 
@@ -4080,9 +3963,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
@@ -4104,9 +3987,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -4209,36 +4092,27 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
-dependencies = [
- "bitflags 2.5.0",
-]
-
 [[package]]
 name = "redox_users"
-version = "0.4.5"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
 dependencies = [
  "getrandom",
- "libredox 0.1.3",
+ "libredox 0.0.1",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.5"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.6",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -4252,13 +4126,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -4275,9 +4149,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "renderdoc-sys"
@@ -4336,7 +4210,7 @@ dependencies = [
  "bevy_obj",
  "bevy_polyline",
  "bevy_stl",
- "bitfield 0.15.0",
+ "bitfield",
  "clap",
  "console_error_panic_hook",
  "crossbeam-channel",
@@ -4345,7 +4219,8 @@ dependencies = [
  "futures-lite 1.13.0",
  "geo",
  "gz-fuel",
- "itertools 0.13.0",
+ "itertools 0.12.1",
+ "nalgebra",
  "pathdiff",
  "rfd",
  "rmf_site_format",
@@ -4408,7 +4283,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
  "base64 0.21.7",
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "serde",
  "serde_derive",
 ]
@@ -4426,9 +4301,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.24"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustc-hash"
@@ -4447,11 +4322,11 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -4460,9 +4335,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.22.4"
+version = "0.22.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41"
 dependencies = [
  "log",
  "ring",
@@ -4474,15 +4349,15 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.7.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.4"
+version = "0.102.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
+checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -4502,15 +4377,15 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
 [[package]]
 name = "safe_arch"
-version = "0.7.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a"
+checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
 dependencies = [
  "bytemuck",
 ]
@@ -4544,35 +4419,35 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 
 [[package]]
 name = "serde"
-version = "1.0.203"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.203"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
  "itoa",
  "ryu",
@@ -4581,9 +4456,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.6"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
 dependencies = [
  "serde",
 ]
@@ -4681,29 +4556,29 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "smol_str"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
+checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "spade"
-version = "2.9.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f4ec45f91925e2c9ab3b6a857ee9ed36916990df76a1c475d783a328e247cc8"
+checksum = "61addf9117b11d1f5b4bf6fe94242ba25f59d2d4b2080544b771bd647024fd00"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown 0.14.3",
  "num-traits",
  "robust",
  "smallvec",
@@ -4752,21 +4627,21 @@ dependencies = [
 
 [[package]]
 name = "strsim"
-version = "0.11.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
 
 [[package]]
 name = "subtle"
-version = "2.6.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d0208408ba0c3df17ed26eb06992cb1a1268d41b2c0e12e65203fbe3972cee5"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "svg_fmt"
-version = "0.4.3"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca"
+checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
 
 [[package]]
 name = "syn"
@@ -4781,9 +4656,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.67"
+version = "2.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90"
+checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4806,12 +4681,12 @@ dependencies = [
 
 [[package]]
 name = "system-deps"
-version = "6.2.2"
+version = "6.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
+checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331"
 dependencies = [
  "cfg-expr",
- "heck 0.5.0",
+ "heck 0.4.1",
  "pkg-config",
  "toml",
  "version-compare",
@@ -4819,9 +4694,9 @@ dependencies = [
 
 [[package]]
 name = "taffy"
-version = "0.3.19"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1315457ccd9c3def787a18fae91914e623e4dcff019b64ce39f5268ded53d3d"
+checksum = "3c2287b6d7f721ada4cddf61ade5e760b2c6207df041cac9bfaa192897362fd3"
 dependencies = [
  "arrayvec",
  "grid",
@@ -4837,9 +4712,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
 
 [[package]]
 name = "tera"
-version = "1.20.0"
+version = "1.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab9d851b45e865f178319da0abdbfe6acbc4328759ff18dafc3a41c16b4cd2ee"
+checksum = "970dff17c11e884a4a09bc76e3a17ef71e01bb13447a11e85226e254fe6d10b8"
 dependencies = [
  "chrono",
  "chrono-tz",
@@ -4868,9 +4743,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.61"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
 dependencies = [
  "thiserror-impl",
 ]
@@ -4892,18 +4767,18 @@ checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -4944,9 +4819,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tobj"
-version = "4.0.2"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3bd4ba05f29e4c65b6c0c11a58b6465ffa820bac890d76ad407b4e81d8372e8"
+checksum = "5f7ca3ec0405b0f2f95e0dbcced28882190dc79b0dac63ff82533d256d770223"
 dependencies = [
  "ahash",
  "log",
@@ -4954,21 +4829,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.14"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.14",
+ "toml_edit 0.22.6",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.6"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 dependencies = [
  "serde",
 ]
@@ -4979,7 +4854,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.2.5",
  "toml_datetime",
  "winnow 0.5.40",
 ]
@@ -4990,7 +4865,7 @@ version = "0.20.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.2.5",
  "toml_datetime",
  "winnow 0.5.40",
 ]
@@ -5001,22 +4876,22 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.2.5",
  "toml_datetime",
  "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.14"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.2.5",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.13",
+ "winnow 0.6.5",
 ]
 
 [[package]]
@@ -5038,7 +4913,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -5104,9 +4979,9 @@ dependencies = [
 
 [[package]]
 name = "ttf-parser"
-version = "0.21.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
+checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
 
 [[package]]
 name = "twox-hash"
@@ -5209,9 +5084,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.13"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "unicode-xid"
@@ -5240,11 +5115,11 @@ dependencies = [
 
 [[package]]
 name = "ureq"
-version = "2.9.7"
+version = "2.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd"
+checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35"
 dependencies = [
- "base64 0.22.1",
+ "base64 0.21.7",
  "flate2",
  "log",
  "once_cell",
@@ -5257,9 +5132,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -5268,9 +5143,9 @@ dependencies = [
 
 [[package]]
 name = "utf8parse"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "utm"
@@ -5280,9 +5155,9 @@ checksum = "95b09e3b3a0abd1ccb77673a6b7b8875d9d1c80626154add451cf18392dc4c3c"
 
 [[package]]
 name = "uuid"
-version = "1.8.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
 dependencies = [
  "getrandom",
  "serde",
@@ -5302,9 +5177,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "version-compare"
-version = "0.2.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
+checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
 
 [[package]]
 name = "version_check"
@@ -5314,9 +5189,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "waker-fn"
-version = "1.2.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
+checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
 
 [[package]]
 name = "walkdir"
@@ -5355,7 +5230,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
  "wasm-bindgen-shared",
 ]
 
@@ -5389,7 +5264,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -5423,9 +5298,9 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "0.8.15"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b"
+checksum = "d1b04c569c83a9bb971dd47ec6fd48753315f4bf989b9b04a2e7ca4d7f0dc950"
 dependencies = [
  "core-foundation",
  "home",
@@ -5440,9 +5315,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.3"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
+checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -5485,7 +5360,7 @@ checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7"
 dependencies = [
  "arrayvec",
  "bit-vec",
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "codespan-reporting",
  "log",
  "naga",
@@ -5510,7 +5385,7 @@ dependencies = [
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "block",
  "core-graphics-types",
  "d3d12",
@@ -5547,16 +5422,16 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "js-sys",
  "web-sys",
 ]
 
 [[package]]
 name = "wide"
-version = "0.7.24"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a040b111774ab63a19ef46bbc149398ab372b4ccdcfd719e9814dbd7dfd76c8"
+checksum = "89beec544f246e679fc25490e3f8e08003bc4bf612068f325120dad4cea02c1c"
 dependencies = [
  "bytemuck",
  "safe_arch",
@@ -5564,9 +5439,9 @@ dependencies = [
 
 [[package]]
 name = "widestring"
-version = "1.1.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
+checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
 
 [[package]]
 name = "winapi"
@@ -5586,11 +5461,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.8"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
- "windows-sys 0.52.0",
+ "winapi",
 ]
 
 [[package]]
@@ -5614,29 +5489,29 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
 dependencies = [
- "windows-implement 0.48.0",
- "windows-interface 0.48.0",
+ "windows-implement",
+ "windows-interface",
  "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "windows"
-version = "0.54.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
- "windows-core 0.54.0",
- "windows-targets 0.52.5",
+ "windows-core 0.52.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
 name = "windows"
-version = "0.57.0"
+version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
 dependencies = [
- "windows-core 0.57.0",
- "windows-targets 0.52.5",
+ "windows-core 0.54.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -5645,7 +5520,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -5655,19 +5530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
 dependencies = [
  "windows-result",
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
-dependencies = [
- "windows-implement 0.57.0",
- "windows-interface 0.57.0",
- "windows-result",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -5681,17 +5544,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "windows-implement"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.67",
-]
-
 [[package]]
 name = "windows-interface"
 version = "0.48.0"
@@ -5703,24 +5555,13 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "windows-interface"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.67",
-]
-
 [[package]]
 name = "windows-result"
-version = "0.1.2"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -5747,7 +5588,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -5782,18 +5623,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
- "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_aarch64_gnullvm 0.52.4",
+ "windows_aarch64_msvc 0.52.4",
+ "windows_i686_gnu 0.52.4",
+ "windows_i686_msvc 0.52.4",
+ "windows_x86_64_gnu 0.52.4",
+ "windows_x86_64_gnullvm 0.52.4",
+ "windows_x86_64_msvc 0.52.4",
 ]
 
 [[package]]
@@ -5810,9 +5650,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -5828,9 +5668,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -5846,15 +5686,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -5870,9 +5704,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -5888,9 +5722,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -5906,9 +5740,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -5924,9 +5758,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
 
 [[package]]
 name = "winit"
@@ -5936,7 +5770,7 @@ checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
 dependencies = [
  "android-activity",
  "bitflags 1.3.2",
- "cfg_aliases 0.1.1",
+ "cfg_aliases",
  "core-foundation",
  "core-graphics 0.22.3",
  "dispatch",
@@ -5945,7 +5779,7 @@ dependencies = [
  "log",
  "mio",
  "ndk 0.7.0",
- "objc2 0.3.0-beta.3.patch-leaks.3",
+ "objc2",
  "once_cell",
  "orbclient",
  "percent-encoding",
@@ -5969,9 +5803,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.13"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
 dependencies = [
  "memchr",
 ]
@@ -5989,9 +5823,9 @@ dependencies = [
 
 [[package]]
 name = "x11rb"
-version = "0.13.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
+checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a"
 dependencies = [
  "gethostname",
  "rustix",
@@ -6000,9 +5834,9 @@ dependencies = [
 
 [[package]]
 name = "x11rb-protocol"
-version = "0.13.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
+checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
 
 [[package]]
 name = "xi-unicode"
@@ -6012,9 +5846,9 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.20"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
+checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
 
 [[package]]
 name = "xmltree"
@@ -6060,29 +5894,29 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.34"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.34"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
 
 [[package]]
 name = "zune-inflate"
diff --git a/rmf_site_editor/Cargo.toml b/rmf_site_editor/Cargo.toml
index 8230df9d..371dd17a 100644
--- a/rmf_site_editor/Cargo.toml
+++ b/rmf_site_editor/Cargo.toml
@@ -51,6 +51,7 @@ gz-fuel = { git = "https://github.com/open-rmf/gz-fuel-rs", branch = "main" }
 pathdiff = "*"
 tera = "1.19.1"
 ehttp = { version = "0.4", features = ["native-async"] }
+nalgebra = "0.32.5"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 clap = { version = "4.0.10", features = ["color", "derive", "help", "usage", "suggestions"] }
diff --git a/rmf_site_editor/src/interaction/assets.rs b/rmf_site_editor/src/interaction/assets.rs
index 432599d2..32250766 100644
--- a/rmf_site_editor/src/interaction/assets.rs
+++ b/rmf_site_editor/src/interaction/assets.rs
@@ -21,6 +21,7 @@ use bevy_polyline::{
     material::PolylineMaterial,
     polyline::{Polyline, PolylineBundle},
 };
+use shape::UVSphere;
 
 #[derive(Clone, Debug, Resource)]
 pub struct InteractionAssets {
@@ -28,6 +29,9 @@ pub struct InteractionAssets {
     pub dagger_material: Handle<StandardMaterial>,
     pub halo_mesh: Handle<Mesh>,
     pub halo_material: Handle<StandardMaterial>,
+    pub camera_control_mesh: Handle<Mesh>,
+    pub camera_control_orbit_material: Handle<StandardMaterial>,
+    pub camera_control_pan_material: Handle<StandardMaterial>,
     pub arrow_mesh: Handle<Mesh>,
     pub point_light_socket_mesh: Handle<Mesh>,
     pub point_light_shine_mesh: Handle<Mesh>,
@@ -224,6 +228,10 @@ impl FromWorld for InteractionAssets {
         let mut meshes = world.get_resource_mut::<Assets<Mesh>>().unwrap();
         let dagger_mesh = meshes.add(make_dagger_mesh());
         let halo_mesh = meshes.add(make_halo_mesh());
+        let camera_control_mesh = meshes.add(Mesh::from(UVSphere {
+            radius: 0.02,
+            ..Default::default()
+        }));
         let arrow_mesh = meshes.add(make_cylinder_arrow_mesh());
         let point_light_socket_mesh = meshes.add(
             make_cylinder(0.06, 0.02)
@@ -298,10 +306,24 @@ impl FromWorld for InteractionAssets {
         });
         let dagger_material = materials.add(StandardMaterial {
             base_color: Color::WHITE,
+            emissive: Color::WHITE,
             perceptual_roughness: 0.089,
             metallic: 0.01,
             ..default()
         });
+        let camera_control_orbit_material = materials.add(StandardMaterial {
+            base_color: Color::GREEN,
+            emissive: Color::GREEN,
+            depth_bias: f32::MAX,
+            unlit: true,
+            ..default()
+        });
+        let camera_control_pan_material = materials.add(StandardMaterial {
+            base_color: Color::WHITE,
+            emissive: Color::WHITE,
+            unlit: true,
+            ..default()
+        });
         let light_cover_color = Color::rgb(0.6, 0.7, 0.8);
         let physical_light_cover_material = materials.add(StandardMaterial {
             base_color: light_cover_color,
@@ -401,6 +423,9 @@ impl FromWorld for InteractionAssets {
             dagger_material,
             halo_mesh,
             halo_material,
+            camera_control_mesh,
+            camera_control_orbit_material,
+            camera_control_pan_material,
             arrow_mesh,
             point_light_socket_mesh,
             point_light_shine_mesh,
diff --git a/rmf_site_editor/src/interaction/camera_controls/cursor.rs b/rmf_site_editor/src/interaction/camera_controls/cursor.rs
new file mode 100644
index 00000000..792da545
--- /dev/null
+++ b/rmf_site_editor/src/interaction/camera_controls/cursor.rs
@@ -0,0 +1,426 @@
+/*
+ * Copyright (C) 2024 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
+
+use super::{
+    get_groundplane_else_default_selection, orbit_camera_around_point, zoom_distance_factor,
+    CameraCommandType, CameraControls, ProjectionMode, MAX_FOV, MAX_SCALE, MIN_FOV, MIN_SCALE,
+};
+use crate::interaction::SiteRaycastSet;
+use bevy::input::mouse::MouseWheel;
+use bevy::prelude::*;
+use bevy::window::PrimaryWindow;
+use bevy_mod_raycast::deferred::RaycastSource;
+use nalgebra::{Matrix3, Matrix3x1};
+
+pub const SCALE_ZOOM_SENSITIVITY: f32 = 0.1;
+pub const TRANSLATION_ZOOM_SENSITIVITY: f32 = 0.2;
+pub const FOV_ZOOM_SENSITIVITY: f32 = 0.1;
+
+#[derive(Resource)]
+pub struct CursorCommand {
+    pub translation_delta: Vec3,
+    pub rotation_delta: Quat,
+    pub scale_delta: f32,
+    pub fov_delta: f32,
+    pub cursor_selection: Option<Vec3>,
+    pub cursor_direction_camera_frame: Option<Vec3>,
+    pub command_type: CameraCommandType,
+}
+
+impl Default for CursorCommand {
+    fn default() -> Self {
+        Self {
+            translation_delta: Vec3::ZERO,
+            rotation_delta: Quat::IDENTITY,
+            scale_delta: 0.0,
+            fov_delta: 0.0,
+            cursor_selection: None,
+            cursor_direction_camera_frame: None,
+            command_type: CameraCommandType::Inactive,
+        }
+    }
+}
+
+impl CursorCommand {
+    pub fn take_translation_delta(&mut self) -> Vec3 {
+        std::mem::replace(&mut self.translation_delta, Vec3::ZERO)
+    }
+
+    pub fn take_rotation_delta(&mut self) -> Quat {
+        std::mem::replace(&mut self.rotation_delta, Quat::IDENTITY)
+    }
+
+    pub fn take_scale_delta(&mut self) -> f32 {
+        std::mem::replace(&mut self.scale_delta, 0.0)
+    }
+
+    pub fn take_fov_delta(&mut self) -> f32 {
+        std::mem::replace(&mut self.fov_delta, 0.0)
+    }
+}
+
+pub fn update_cursor_command(
+    mut camera_controls: ResMut<CameraControls>,
+    mut cursor_command: ResMut<CursorCommand>,
+    mut mouse_wheel: EventReader<MouseWheel>,
+    mouse_input: Res<Input<MouseButton>>,
+    keyboard_input: Res<Input<KeyCode>>,
+    raycast_sources: Query<&RaycastSource<SiteRaycastSet>>,
+    cameras: Query<(&Projection, &Transform, &GlobalTransform)>,
+    primary_windows: Query<&Window, With<PrimaryWindow>>,
+) {
+    if let Ok(window) = primary_windows.get_single() {
+        // Return if cursor not within window
+        if window.cursor_position().is_none() {
+            return;
+        }
+
+        // Scroll input
+        let mut scroll_motion = 0.0;
+        for ev in mouse_wheel.read() {
+            #[cfg(not(target_arch = "wasm32"))]
+            {
+                scroll_motion += ev.y;
+            }
+            #[cfg(target_arch = "wasm32")]
+            {
+                // scrolling in wasm is a different beast
+                scroll_motion += 0.4 * ev.y / ev.y.abs();
+            }
+        }
+
+        // Command type, return if inactive
+        let command_type_prev = cursor_command.command_type;
+        let command_type = get_command_type(
+            &keyboard_input,
+            &mouse_input,
+            &scroll_motion,
+            camera_controls.mode(),
+        );
+        if command_type == CameraCommandType::Inactive {
+            *cursor_command = CursorCommand::default();
+            return;
+        }
+
+        // Camera projection and transform
+        let active_camera_entity = match camera_controls.mode() {
+            ProjectionMode::Orthographic => camera_controls.orthographic_camera_entities[0],
+            ProjectionMode::Perspective => camera_controls.perspective_camera_entities[0],
+        };
+        let (camera_proj, camera_transform, _) = cameras.get(active_camera_entity).unwrap();
+
+        // Get selection under cursor, cursor direction
+        let Ok(cursor_raycast_source) = raycast_sources.get_single() else {
+            return;
+        };
+        let cursor_ray = match cursor_raycast_source.get_ray() {
+            Some(ray) => ray,
+            None => return,
+        };
+        let cursor_selection_new =
+            get_cursor_selected_point(&camera_transform, &cursor_raycast_source);
+        let cursor_selection = match cursor_command.cursor_selection {
+            Some(selection) => selection,
+            None => cursor_selection_new,
+        };
+        let cursor_direction = cursor_ray.direction().normalize();
+        let cursor_direction_camera_frame = camera_transform.rotation.inverse() * cursor_direction;
+        let cursor_direction_camera_frame_prev = cursor_command
+            .cursor_direction_camera_frame
+            .unwrap_or(cursor_direction_camera_frame);
+
+        // Update orbit center
+        if command_type != CameraCommandType::Orbit {
+            camera_controls.orbit_center = None;
+        } else if (command_type == CameraCommandType::Orbit && command_type != command_type_prev)
+            || camera_controls.orbit_center.is_none()
+        {
+            camera_controls.orbit_center = Some(cursor_selection);
+        }
+        let orbit_center = camera_controls.orbit_center.unwrap_or(cursor_selection);
+
+        match camera_controls.mode() {
+            ProjectionMode::Orthographic => {
+                if let Projection::Orthographic(camera_proj) = camera_proj {
+                    *cursor_command = get_orthographic_cursor_command(
+                        &camera_transform,
+                        &camera_proj,
+                        command_type,
+                        cursor_selection,
+                        cursor_selection_new,
+                        scroll_motion,
+                    );
+                }
+            }
+            ProjectionMode::Perspective => {
+                if let Projection::Perspective(camera_proj) = camera_proj {
+                    *cursor_command = get_perspective_cursor_command(
+                        &camera_transform,
+                        &camera_proj,
+                        command_type,
+                        cursor_direction,
+                        cursor_direction_camera_frame,
+                        cursor_direction_camera_frame_prev,
+                        cursor_selection,
+                        scroll_motion,
+                        orbit_center,
+                    );
+                }
+            }
+        }
+    } else {
+        *cursor_command = CursorCommand::default();
+    }
+}
+
+fn get_orthographic_cursor_command(
+    camera_transform: &Transform,
+    camera_proj: &OrthographicProjection,
+    command_type: CameraCommandType,
+    cursor_selection: Vec3,
+    cursor_selection_new: Vec3,
+    scroll_motion: f32,
+) -> CursorCommand {
+    let mut cursor_command = CursorCommand::default();
+    let mut is_cursor_selecting = false;
+
+    // Zoom
+    let target_scale = (camera_proj.scale
+        - scroll_motion * camera_proj.scale * SCALE_ZOOM_SENSITIVITY)
+        .clamp(MIN_SCALE, MAX_SCALE);
+    cursor_command.scale_delta = target_scale - camera_proj.scale;
+
+    //TODO(@reuben-thomas) Find out why cursor ray cannot be used for direction
+    let cursor_direction = (cursor_selection_new - camera_transform.translation).normalize();
+
+    match command_type {
+        CameraCommandType::Pan => {
+            let camera_transform_next = pan_camera_with_cursor(
+                camera_transform,
+                cursor_selection,
+                cursor_direction,
+                scroll_motion,
+            );
+            cursor_command.translation_delta =
+                camera_transform_next.translation - camera_transform.translation;
+            is_cursor_selecting = true;
+        }
+        CameraCommandType::Orbit => {
+            let cursor_direction_prev =
+                (cursor_selection - camera_transform.translation).normalize();
+
+            let heading_0 =
+                (cursor_direction_prev - cursor_direction_prev.project_onto(Vec3::Z)).normalize();
+            let heading_1 = (cursor_direction - cursor_direction.project_onto(Vec3::Z)).normalize();
+            let is_clockwise = heading_0.cross(heading_1).dot(Vec3::Z) > 0.0;
+            let yaw = heading_0.angle_between(heading_1) * if is_clockwise { -1.0 } else { 1.0 };
+            let yaw = Quat::from_rotation_z(yaw);
+
+            cursor_command.rotation_delta = yaw;
+            is_cursor_selecting = true;
+        }
+        _ => (),
+    }
+
+    cursor_command.command_type = command_type;
+    cursor_command.cursor_selection = if is_cursor_selecting {
+        Some(cursor_selection)
+    } else {
+        None
+    };
+
+    return cursor_command;
+}
+
+fn get_perspective_cursor_command(
+    camera_transform: &Transform,
+    camera_proj: &PerspectiveProjection,
+    command_type: CameraCommandType,
+    cursor_direction: Vec3,
+    cursor_direction_camera_frame: Vec3,
+    cursor_direction_camera_frame_prev: Vec3,
+    cursor_selection: Vec3,
+    scroll_motion: f32,
+    orbit_center: Vec3,
+) -> CursorCommand {
+    let mut cursor_command = CursorCommand::default();
+    let mut is_cursor_selecting = false;
+
+    match command_type {
+        CameraCommandType::FovZoom => {
+            let target_fov = (camera_proj.fov - scroll_motion * FOV_ZOOM_SENSITIVITY)
+                .clamp(MIN_FOV.to_radians(), MAX_FOV.to_radians());
+            cursor_command.fov_delta = target_fov - camera_proj.fov;
+        }
+        CameraCommandType::TranslationZoom => {
+            cursor_command.translation_delta = cursor_direction
+                * zoom_distance_factor(camera_transform.translation, cursor_selection)
+                * TRANSLATION_ZOOM_SENSITIVITY
+                * scroll_motion
+        }
+        CameraCommandType::Pan => {
+            let camera_transform_next = pan_camera_with_cursor(
+                camera_transform,
+                cursor_selection,
+                cursor_direction,
+                scroll_motion,
+            );
+            cursor_command.translation_delta =
+                camera_transform_next.translation - camera_transform.translation;
+            is_cursor_selecting = true;
+        }
+        CameraCommandType::Orbit => {
+            // Pitch and yaw inputs from cursor direction vector as spherical coordinates
+            let pitch = cursor_direction_camera_frame_prev.y.acos()
+                - cursor_direction_camera_frame.y.acos();
+            let yaw = (cursor_direction_camera_frame_prev
+                .z
+                .atan2(cursor_direction_camera_frame_prev.x))
+                - (cursor_direction_camera_frame
+                    .z
+                    .atan2(cursor_direction_camera_frame.x));
+
+            // Scale inputs to viewport range
+            let pitch_viewport_range = camera_proj.fov;
+            let pitch = -pitch / pitch_viewport_range * std::f32::consts::PI;
+            let yaw_viewport_range = camera_proj.fov * camera_proj.aspect_ratio;
+            let yaw = yaw / yaw_viewport_range * 2.0 * std::f32::consts::PI;
+            let zoom = TRANSLATION_ZOOM_SENSITIVITY * scroll_motion;
+
+            let camera_transform_next =
+                orbit_camera_around_point(camera_transform, orbit_center, pitch, yaw, zoom);
+
+            cursor_command.translation_delta =
+                camera_transform_next.translation - camera_transform.translation;
+            cursor_command.rotation_delta =
+                camera_transform.rotation.inverse() * camera_transform_next.rotation;
+        }
+        _ => (),
+    }
+
+    cursor_command.command_type = command_type;
+    cursor_command.cursor_direction_camera_frame = Some(cursor_direction_camera_frame);
+    cursor_command.cursor_selection = if is_cursor_selecting {
+        Some(cursor_selection)
+    } else {
+        None
+    };
+
+    return cursor_command;
+}
+
+/// Pans camera such that selection remains under cursor
+fn pan_camera_with_cursor(
+    camera_transform: &Transform,
+    cursor_selection: Vec3,
+    cursor_direction: Vec3,
+    scroll_motion: f32,
+) -> Transform {
+    let mut camera_transform_next = camera_transform.clone();
+    // To keep the same point below the cursor, we solve
+    // selection_to_camera + translation_delta = selection_to_camera_next
+    // selection_to_camera_next = x3 * -cursor_direction
+    // translation_delta = x1 * right_ transltion + x2 * up_translation
+    let selection_to_camera = cursor_selection - camera_transform.translation;
+    let right_translation = camera_transform.rotation * Vec3::X;
+    let up_translation = camera_transform.rotation * Vec3::Y;
+
+    let a = Matrix3::new(
+        right_translation.x,
+        up_translation.x,
+        -cursor_direction.x,
+        right_translation.y,
+        up_translation.y,
+        -cursor_direction.y,
+        right_translation.z,
+        up_translation.z,
+        -cursor_direction.z,
+    );
+    let b = Matrix3x1::new(
+        selection_to_camera.x,
+        selection_to_camera.y,
+        selection_to_camera.z,
+    );
+    let x = a.lu().solve(&b).unwrap();
+    camera_transform_next.translation += x[0] * right_translation + x[1] * up_translation;
+
+    let zoom_translation = cursor_direction
+        * zoom_distance_factor(
+            camera_transform.translation,
+            camera_transform_next.translation,
+        )
+        * TRANSLATION_ZOOM_SENSITIVITY
+        * scroll_motion;
+    camera_transform_next.translation += zoom_translation;
+
+    return camera_transform_next;
+}
+
+/// Returns the object selected by the cursor, if none, defaults to ground plane or arbitrary point in front
+fn get_cursor_selected_point(
+    camera_transform: &Transform,
+    cursor_raycast_source: &RaycastSource<SiteRaycastSet>,
+) -> Vec3 {
+    let cursor_ray = cursor_raycast_source.get_ray().unwrap();
+
+    match cursor_raycast_source.get_nearest_intersection() {
+        Some((_, intersection)) => intersection.position(),
+        None => get_groundplane_else_default_selection(
+            cursor_ray.origin(),
+            cursor_ray.direction(),
+            camera_transform.forward(),
+        ),
+    }
+}
+
+fn get_command_type(
+    keyboard_input: &Res<Input<KeyCode>>,
+    mouse_input: &Res<Input<MouseButton>>,
+    scroll_motion: &f32,
+    projection_mode: ProjectionMode,
+) -> CameraCommandType {
+    // Inputs
+    let is_scrolling = *scroll_motion != 0.;
+    let is_shifting =
+        keyboard_input.pressed(KeyCode::ShiftLeft) || keyboard_input.pressed(KeyCode::ShiftRight);
+
+    // Panning
+    if !is_shifting && mouse_input.pressed(MouseButton::Right) {
+        return CameraCommandType::Pan;
+    }
+
+    // Orbitting
+    if mouse_input.pressed(MouseButton::Middle)
+        || (is_shifting && mouse_input.pressed(MouseButton::Right))
+    {
+        return CameraCommandType::Orbit;
+    }
+
+    // Zoom
+    if projection_mode.is_orthographic() && is_scrolling {
+        return CameraCommandType::ScaleZoom;
+    }
+    if projection_mode.is_perspective() && is_scrolling {
+        if is_shifting {
+            return CameraCommandType::FovZoom;
+        } else {
+            return CameraCommandType::TranslationZoom;
+        }
+    }
+
+    return CameraCommandType::Inactive;
+}
diff --git a/rmf_site_editor/src/interaction/camera_controls/keyboard.rs b/rmf_site_editor/src/interaction/camera_controls/keyboard.rs
new file mode 100644
index 00000000..85c7bffe
--- /dev/null
+++ b/rmf_site_editor/src/interaction/camera_controls/keyboard.rs
@@ -0,0 +1,330 @@
+/*
+ * Copyright (C) 2024 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
+
+use super::{
+    utils::*, CameraCommandType, CameraControls, ProjectionMode, MAX_FOV, MAX_SCALE, MIN_FOV,
+    MIN_SCALE,
+};
+use crate::widgets::UserCameraDisplay;
+use bevy::{prelude::*, window::PrimaryWindow};
+use bevy_mod_raycast::immediate::Raycast;
+
+// Keyboard control limits
+pub const MIN_RESPONSE_TIME: f32 = 0.25; // [s] time taken to reach minimum input, or to reset
+pub const MAX_RESPONSE_TIME: f32 = 1.5; // [s] time taken to reach maximum input
+pub const MAX_FOV_DELTA: f32 = 0.5; // [rad/s]
+pub const MAX_ANGULAR_VEL: f32 = 3.5; // [rad/s]
+pub const MAX_TRANSLATION_VEL: f32 = 8.0; // [m/s]
+pub const SCALE_ZOOM_SENSITIVITY: f32 = 0.035;
+pub const ORTHOGRAPHIC_PAN_SENSITIVITY: f32 = 0.015;
+
+#[derive(Resource)]
+pub struct KeyboardCommand {
+    pub translation_delta: Vec3,
+    pub rotation_delta: Quat,
+    pub scale_delta: f32,
+    pub fov_delta: f32,
+    pub keyboard_motion: Vec2,
+    pub zoom_motion: f32,
+    pub camera_selection: Option<Vec3>,
+    pub command_type: CameraCommandType,
+}
+
+impl Default for KeyboardCommand {
+    fn default() -> Self {
+        Self {
+            translation_delta: Vec3::ZERO,
+            rotation_delta: Quat::IDENTITY,
+            scale_delta: 0.0,
+            fov_delta: 0.0,
+            keyboard_motion: Vec2::ZERO,
+            zoom_motion: 0.0,
+            camera_selection: None,
+            command_type: CameraCommandType::Inactive,
+        }
+    }
+}
+
+impl KeyboardCommand {
+    pub fn take_translation_delta(&mut self) -> Vec3 {
+        std::mem::replace(&mut self.translation_delta, Vec3::ZERO)
+    }
+
+    pub fn take_rotation_delta(&mut self) -> Quat {
+        std::mem::replace(&mut self.rotation_delta, Quat::IDENTITY)
+    }
+
+    pub fn take_scale_delta(&mut self) -> f32 {
+        std::mem::replace(&mut self.scale_delta, 0.0)
+    }
+
+    pub fn take_fov_delta(&mut self) -> f32 {
+        std::mem::replace(&mut self.fov_delta, 0.0)
+    }
+}
+
+pub fn update_keyboard_command(
+    mut camera_controls: ResMut<CameraControls>,
+    mut keyboard_command: ResMut<KeyboardCommand>,
+    keyboard_input: Res<Input<KeyCode>>,
+    cameras: Query<(&Camera, &Projection, &Transform, &GlobalTransform)>,
+    immediate_raycast: Raycast,
+    time: Res<Time>,
+    primary_windows: Query<&Window, With<PrimaryWindow>>,
+    uncovered_window_area: Res<UserCameraDisplay>,
+) {
+    if let Ok(_) = primary_windows.get_single() {
+        // User inputs
+        let is_shifting = keyboard_input.pressed(KeyCode::ShiftLeft)
+            || keyboard_input.pressed(KeyCode::ShiftRight);
+        let mut target_keyboard_motion = Vec2::ZERO;
+        if keyboard_input.pressed(KeyCode::Up) {
+            target_keyboard_motion.y += 1.0;
+        }
+        if keyboard_input.pressed(KeyCode::Left) {
+            target_keyboard_motion.x += -1.0;
+        }
+        if keyboard_input.pressed(KeyCode::Down) {
+            target_keyboard_motion.y += -1.0;
+        }
+        if keyboard_input.pressed(KeyCode::Right) {
+            target_keyboard_motion.x += 1.0;
+        }
+        if target_keyboard_motion.length() > 0.0 {
+            target_keyboard_motion = target_keyboard_motion.normalize();
+        }
+
+        let mut target_zoom_motion = 0.0;
+        if keyboard_input.pressed(KeyCode::PageDown) {
+            target_zoom_motion += -1.0;
+        }
+        if keyboard_input.pressed(KeyCode::PageUp) {
+            target_zoom_motion += 1.0;
+        }
+
+        // Smooth and normalize keyboard
+        let delta_seconds = time.delta_seconds();
+        let prev_keyboard_motion = keyboard_command.keyboard_motion;
+        let keyboard_motion_delta =
+            (target_keyboard_motion - prev_keyboard_motion).normalize_or_zero();
+        let keyboard_response_factor = if keyboard_motion_delta.dot(prev_keyboard_motion) > 0.0 {
+            delta_seconds / MAX_RESPONSE_TIME
+        } else {
+            delta_seconds / MIN_RESPONSE_TIME
+        };
+        let mut keyboard_motion =
+            prev_keyboard_motion + keyboard_motion_delta * keyboard_response_factor;
+        if keyboard_motion.length() > 1.0 {
+            keyboard_motion = keyboard_motion.normalize();
+        } else if keyboard_motion.length() < keyboard_response_factor {
+            keyboard_motion = Vec2::ZERO;
+        }
+
+        // Smooth and normalize zoom motion
+        let prev_zoom_motion = keyboard_command.zoom_motion;
+        let zoom_motion_delta = target_zoom_motion - prev_zoom_motion;
+        let zoom_response_factor = if prev_zoom_motion.signum() == zoom_motion_delta.signum() {
+            delta_seconds / MAX_RESPONSE_TIME
+        } else {
+            delta_seconds / MIN_RESPONSE_TIME
+        };
+        let mut zoom_motion = if zoom_motion_delta.abs() < zoom_response_factor {
+            prev_zoom_motion
+        } else {
+            prev_zoom_motion + zoom_motion_delta.signum() * zoom_response_factor
+        };
+        zoom_motion = zoom_motion.clamp(-1.0, 1.0);
+        if zoom_motion.abs() < zoom_response_factor {
+            zoom_motion = 0.0;
+        }
+
+        // Get command type
+        let is_keyboard_motion_active = keyboard_motion
+            .length()
+            .max(target_keyboard_motion.length())
+            > 0.0;
+        let command_type = if is_shifting && is_keyboard_motion_active {
+            CameraCommandType::Orbit
+        } else if is_keyboard_motion_active {
+            CameraCommandType::Pan
+        } else if is_shifting && zoom_motion != 0.0 {
+            CameraCommandType::FovZoom
+        } else if zoom_motion != 0.0 {
+            CameraCommandType::TranslationZoom
+        } else {
+            CameraCommandType::Inactive
+        };
+
+        // Ignore previous motion if new command
+        if command_type != keyboard_command.command_type
+            && command_type != CameraCommandType::Inactive
+        {
+            zoom_motion = delta_seconds / MAX_RESPONSE_TIME * target_zoom_motion;
+            keyboard_motion = delta_seconds / MAX_RESPONSE_TIME * target_keyboard_motion;
+        }
+
+        // Camera projection and transform
+        let active_camera_entity = match camera_controls.mode() {
+            ProjectionMode::Orthographic => camera_controls.orthographic_camera_entities[0],
+            ProjectionMode::Perspective => camera_controls.perspective_camera_entities[0],
+        };
+        let (camera, camera_proj, camera_transform, camera_global_transform) =
+            cameras.get(active_camera_entity).unwrap();
+
+        // Set camera selection as orbit center, discard once orbit operation complete
+        let camera_selection = match keyboard_command.camera_selection {
+            Some(camera_selection) => camera_selection,
+            None => get_camera_selected_point(
+                &camera,
+                &camera_global_transform,
+                uncovered_window_area,
+                immediate_raycast,
+            ),
+        };
+        if command_type == CameraCommandType::Orbit {
+            camera_controls.orbit_center = Some(camera_selection);
+        }
+        if keyboard_command.command_type == CameraCommandType::Orbit
+            && keyboard_command.command_type != command_type
+        {
+            camera_controls.orbit_center = None;
+        }
+
+        match camera_controls.mode() {
+            ProjectionMode::Orthographic => {
+                if let Projection::Orthographic(camera_proj) = camera_proj {
+                    *keyboard_command = get_orthographic_command(
+                        command_type,
+                        camera_proj,
+                        camera_transform,
+                        keyboard_motion,
+                        zoom_motion,
+                        delta_seconds,
+                    )
+                }
+            }
+            ProjectionMode::Perspective => {
+                if let Projection::Perspective(camera_proj) = camera_proj {
+                    *keyboard_command = get_perspective_command(
+                        command_type,
+                        camera_proj,
+                        camera_transform,
+                        camera_selection,
+                        keyboard_motion,
+                        zoom_motion,
+                        delta_seconds,
+                    )
+                }
+            }
+        }
+    }
+}
+
+fn get_orthographic_command(
+    command_type: CameraCommandType,
+    camera_proj: &OrthographicProjection,
+    camera_transform: &Transform,
+    keyboard_motion: Vec2,
+    zoom_motion: f32,
+    delta_seconds: f32,
+) -> KeyboardCommand {
+    let mut keyboard_command = KeyboardCommand::default();
+
+    // Zoom by scaling
+    let target_scale = (camera_proj.scale
+        - zoom_motion * camera_proj.scale * SCALE_ZOOM_SENSITIVITY)
+        .clamp(MIN_SCALE, MAX_SCALE);
+    keyboard_command.scale_delta = target_scale - camera_proj.scale;
+
+    match command_type {
+        CameraCommandType::Orbit => {
+            let yaw = -keyboard_motion.x * MAX_ANGULAR_VEL * delta_seconds;
+            let yaw = Quat::from_rotation_z(yaw);
+            keyboard_command.rotation_delta = yaw;
+        }
+        CameraCommandType::Pan => {
+            let right_translation = camera_transform.rotation * Vec3::X;
+            let up_translation = camera_transform.rotation * Vec3::Y;
+            keyboard_command.translation_delta =
+                up_translation * keyboard_motion.y + right_translation * keyboard_motion.x;
+            keyboard_command.translation_delta *= ORTHOGRAPHIC_PAN_SENSITIVITY * camera_proj.scale;
+        }
+        _ => (),
+    }
+
+    keyboard_command.command_type = command_type;
+    keyboard_command.keyboard_motion = keyboard_motion;
+    keyboard_command.zoom_motion = zoom_motion;
+
+    return keyboard_command;
+}
+
+fn get_perspective_command(
+    command_type: CameraCommandType,
+    camera_proj: &PerspectiveProjection,
+    camera_transform: &Transform,
+    camera_selection: Vec3,
+    keyboard_motion: Vec2,
+    zoom_motion: f32,
+    delta_seconds: f32,
+) -> KeyboardCommand {
+    let mut keyboard_command = KeyboardCommand::default();
+
+    let zoom_translation = (camera_selection - camera_transform.translation).normalize()
+        * zoom_motion
+        * zoom_distance_factor(camera_transform.translation, camera_selection)
+        * MAX_TRANSLATION_VEL
+        * delta_seconds;
+
+    match command_type {
+        CameraCommandType::FovZoom => {
+            let target_fov = (camera_proj.fov - zoom_motion * MAX_FOV_DELTA * delta_seconds)
+                .clamp(MIN_FOV.to_radians(), MAX_FOV.to_radians());
+            keyboard_command.fov_delta = target_fov - camera_proj.fov;
+        }
+        CameraCommandType::TranslationZoom => keyboard_command.translation_delta = zoom_translation,
+        CameraCommandType::Pan => {
+            let right_translation = camera_transform.rotation * Vec3::X;
+            let up_translation = -camera_transform.rotation * Vec3::Y;
+            let pan_translation = (right_translation * keyboard_motion.x
+                + up_translation * keyboard_motion.y)
+                * MAX_TRANSLATION_VEL
+                * delta_seconds;
+            keyboard_command.translation_delta = pan_translation + zoom_translation;
+        }
+        CameraCommandType::Orbit => {
+            let orbit_center = camera_selection;
+            let pitch = keyboard_motion.y * MAX_ANGULAR_VEL * delta_seconds;
+            let yaw = keyboard_motion.x * MAX_ANGULAR_VEL * delta_seconds;
+            let zoom = zoom_motion * MAX_TRANSLATION_VEL * delta_seconds;
+
+            let camera_transform_next =
+                orbit_camera_around_point(camera_transform, camera_selection, pitch, yaw, zoom);
+            keyboard_command.translation_delta =
+                camera_transform_next.translation - camera_transform.translation;
+            keyboard_command.rotation_delta =
+                camera_transform.rotation.inverse() * camera_transform_next.rotation;
+            keyboard_command.camera_selection = Some(orbit_center);
+        }
+        _ => (),
+    }
+
+    keyboard_command.command_type = command_type;
+    keyboard_command.keyboard_motion = keyboard_motion;
+    keyboard_command.zoom_motion = zoom_motion;
+    return keyboard_command;
+}
diff --git a/rmf_site_editor/src/interaction/camera_controls.rs b/rmf_site_editor/src/interaction/camera_controls/mod.rs
similarity index 67%
rename from rmf_site_editor/src/interaction/camera_controls.rs
rename to rmf_site_editor/src/interaction/camera_controls/mod.rs
index 7562a50c..708f5648 100644
--- a/rmf_site_editor/src/interaction/camera_controls.rs
+++ b/rmf_site_editor/src/interaction/camera_controls/mod.rs
@@ -14,21 +14,27 @@
  * limitations under the License.
  *
 */
-
-use crate::interaction::PickingBlockers;
+use crate::interaction::{InteractionAssets, PickingBlockers};
 use bevy::{
-    core_pipeline::clear_color::ClearColorConfig,
-    core_pipeline::core_3d::Camera3dBundle,
-    core_pipeline::tonemapping::Tonemapping,
-    input::mouse::{MouseButton, MouseWheel},
+    core_pipeline::{
+        clear_color::ClearColorConfig, core_3d::Camera3dBundle, tonemapping::Tonemapping,
+    },
     prelude::*,
     render::{
         camera::{Camera, Projection, ScalingMode},
         view::RenderLayers,
     },
-    window::PrimaryWindow,
 };
 
+mod utils;
+use utils::*;
+
+mod cursor;
+use cursor::{update_cursor_command, CursorCommand};
+
+mod keyboard;
+use keyboard::{update_keyboard_command, KeyboardCommand};
+
 /// RenderLayers are used to inform cameras which entities they should render.
 /// The General render layer is for things that should be visible to all
 /// cameras.
@@ -55,18 +61,28 @@ pub const XRAY_RENDER_LAYER: u8 = 5;
 /// models in the engine without having them being visible to general cameras
 pub const MODEL_PREVIEW_LAYER: u8 = 6;
 
-#[derive(Resource)]
-struct MouseLocation {
-    previous: Vec2,
+/// Camera limits
+pub const MIN_FOV: f32 = 5.0;
+pub const MAX_FOV: f32 = 120.0;
+pub const MIN_SCALE: f32 = 0.5;
+pub const MAX_SCALE: f32 = 500.0;
+pub const MAX_PITCH: f32 = 85.0;
+pub const MIN_SELECTION_DIST: f32 = 10.0;
+pub const MAX_SELECTION_DIST: f32 = 30.0;
+
+#[derive(PartialEq, Debug, Copy, Clone)]
+pub enum CameraCommandType {
+    Inactive,
+    Pan,
+    Orbit,
+    TranslationZoom,
+    ScaleZoom,
+    FovZoom,
 }
 
-impl Default for MouseLocation {
-    fn default() -> Self {
-        MouseLocation {
-            previous: Vec2::ZERO,
-        }
-    }
-}
+#[derive(Default, Reflect)]
+struct OrbitCenterGizmo {}
+
 #[derive(PartialEq, Debug, Copy, Clone, Reflect, Resource)]
 pub enum ProjectionMode {
     Perspective,
@@ -103,10 +119,8 @@ pub struct CameraControls {
     pub perspective_headlight: Entity,
     pub orthographic_camera_entities: [Entity; 4],
     pub orthographic_headlight: Entity,
-    pub orbit_center: Vec3,
-    pub orbit_radius: f32,
-    pub orbit_upside_down: bool,
-    pub was_oribiting: bool,
+    pub selection_marker: Entity,
+    pub orbit_center: Option<Vec3>,
 }
 
 /// True/false for whether the headlight should be on or off
@@ -227,6 +241,18 @@ impl CameraControls {
 
 impl FromWorld for CameraControls {
     fn from_world(world: &mut World) -> Self {
+        let interaction_assets = world.get_resource::<InteractionAssets>().expect(
+            "make sure that the InteractionAssets resource is initialized before the camera plugin",
+        );
+        let selection_mesh = interaction_assets.camera_control_mesh.clone();
+        let selection_marker = world
+            .spawn(PbrBundle {
+                mesh: selection_mesh,
+                visibility: Visibility::Visible,
+                ..default()
+            })
+            .id();
+
         let perspective_headlight = world
             .spawn(DirectionalLightBundle {
                 directional_light: DirectionalLight {
@@ -372,21 +398,15 @@ impl FromWorld for CameraControls {
                 orthographic_child_cameras[2],
             ],
             orthographic_headlight,
-            orbit_center: Vec3::ZERO,
-            orbit_radius: (3.0 * 10.0 * 10.0 as f32).sqrt(),
-            orbit_upside_down: false,
-            was_oribiting: false,
+            selection_marker,
+            orbit_center: None,
         }
     }
 }
 
 fn camera_controls(
-    primary_windows: Query<&Window, With<PrimaryWindow>>,
-    mut ev_cursor_moved: EventReader<CursorMoved>,
-    mut ev_scroll: EventReader<MouseWheel>,
-    input_mouse: Res<Input<MouseButton>>,
-    input_keyboard: Res<Input<KeyCode>>,
-    mut previous_mouse_location: ResMut<MouseLocation>,
+    mut cursor_command: ResMut<CursorCommand>,
+    mut keyboard_command: ResMut<KeyboardCommand>,
     mut controls: ResMut<CameraControls>,
     mut cameras: Query<(&mut Projection, &mut Transform)>,
     mut bevy_cameras: Query<&mut Camera>,
@@ -413,41 +433,45 @@ fn camera_controls(
         return;
     }
 
-    let is_shifting =
-        input_keyboard.pressed(KeyCode::ShiftLeft) || input_keyboard.pressed(KeyCode::ShiftRight);
-    let is_panning = input_mouse.pressed(MouseButton::Right) && !is_shifting;
-
-    let is_orbiting = input_mouse.pressed(MouseButton::Middle)
-        || (input_mouse.pressed(MouseButton::Right) && is_shifting);
-    let started_orbiting = !controls.was_oribiting && is_orbiting;
-    let released_orbiting = controls.was_oribiting && !is_orbiting;
-    controls.was_oribiting = is_orbiting;
-
-    // spin through all mouse cursor-moved events to find the last one
-    let mut last_pos = previous_mouse_location.previous;
-    if let Some(ev) = ev_cursor_moved.read().last() {
-        last_pos.x = ev.position.x;
-        last_pos.y = ev.position.y;
-    }
-
-    let mut cursor_motion = Vec2::ZERO;
-    if is_panning || is_orbiting {
-        cursor_motion.x = last_pos.x - previous_mouse_location.previous.x;
-        cursor_motion.y = last_pos.y - previous_mouse_location.previous.y;
+    let translation_delta: Vec3;
+    let rotation_delta: Quat;
+    let fov_delta: f32;
+    let scale_delta: f32;
+    if cursor_command.command_type != CameraCommandType::Inactive {
+        translation_delta = cursor_command.take_translation_delta();
+        rotation_delta = cursor_command.take_rotation_delta();
+        fov_delta = cursor_command.take_fov_delta();
+        scale_delta = cursor_command.take_scale_delta();
+    } else {
+        translation_delta = keyboard_command.take_translation_delta();
+        rotation_delta = keyboard_command.take_rotation_delta();
+        fov_delta = keyboard_command.take_fov_delta();
+        scale_delta = keyboard_command.take_scale_delta();
     }
 
-    previous_mouse_location.previous = last_pos;
-
-    let mut scroll = 0.0;
-    for ev in ev_scroll.read() {
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            scroll += ev.y;
+    if controls.mode() == ProjectionMode::Perspective {
+        let (mut persp_proj, mut persp_transform) = cameras
+            .get_mut(controls.perspective_camera_entities[0])
+            .unwrap();
+        if let Projection::Perspective(persp_proj) = persp_proj.as_mut() {
+            persp_transform.translation += translation_delta;
+            persp_transform.rotation *= rotation_delta;
+            persp_proj.fov += fov_delta;
+            persp_proj.fov = persp_proj
+                .fov
+                .clamp(MIN_FOV.to_radians(), MAX_FOV.to_radians());
+
+            // Ensure upright
+            let forward = persp_transform.forward();
+            persp_transform.look_to(forward, Vec3::Z);
         }
-        #[cfg(target_arch = "wasm32")]
-        {
-            // scrolling in wasm is a different beast
-            scroll += 0.4 * ev.y / ev.y.abs();
+
+        let proj = persp_proj.clone();
+        let children = cameras
+            .get_many_mut(controls.perspective_camera_entities)
+            .unwrap();
+        for (mut child_proj, _) in children {
+            *child_proj = proj.clone();
         }
     }
 
@@ -456,22 +480,9 @@ fn camera_controls(
             .get_mut(controls.orthographic_camera_entities[0])
             .unwrap();
         if let Projection::Orthographic(ortho_proj) = ortho_proj.as_mut() {
-            if let Ok(window) = primary_windows.get_single() {
-                let window_size = Vec2::new(window.width() as f32, window.height() as f32);
-                let aspect_ratio = window_size[0] / window_size[1];
-
-                if cursor_motion.length_squared() > 0.0 {
-                    cursor_motion *= 2. / window_size
-                        * Vec2::new(ortho_proj.scale * aspect_ratio, ortho_proj.scale);
-                    let right = -cursor_motion.x * Vec3::X;
-                    let up = cursor_motion.y * Vec3::Y;
-                    ortho_transform.translation += right + up;
-                }
-                if scroll.abs() > 0.0 {
-                    ortho_proj.scale -= scroll * ortho_proj.scale * 0.1;
-                    ortho_proj.scale = f32::max(ortho_proj.scale, 0.02);
-                }
-            }
+            ortho_transform.translation += translation_delta;
+            ortho_transform.rotation *= rotation_delta;
+            ortho_proj.scale += scale_delta;
         }
 
         let proj = ortho_proj.clone();
@@ -481,73 +492,48 @@ fn camera_controls(
         for (mut child_proj, _) in children {
             *child_proj = proj.clone();
         }
-    } else {
-        // perspective mode
-        let (mut persp_proj, mut persp_transform) = cameras
-            .get_mut(controls.perspective_camera_entities[0])
-            .unwrap();
-        if let Projection::Perspective(persp_proj) = persp_proj.as_mut() {
-            let mut changed = false;
-
-            if started_orbiting || released_orbiting {
-                // only check for upside down when orbiting started or ended this frame
-                // if the camera is "upside" down, panning horizontally would be inverted, so invert the input to make it correct
-                let up = persp_transform.rotation * Vec3::Z;
-                controls.orbit_upside_down = up.z <= 0.0;
-            }
-
-            if is_orbiting && cursor_motion.length_squared() > 0. {
-                changed = true;
-                if let Ok(window) = primary_windows.get_single() {
-                    let window_size = Vec2::new(window.width() as f32, window.height() as f32);
-                    let delta_x = {
-                        let delta = cursor_motion.x / window_size.x * std::f32::consts::PI * 2.0;
-                        if controls.orbit_upside_down {
-                            -delta
-                        } else {
-                            delta
-                        }
-                    };
-                    let delta_y = cursor_motion.y / window_size.y * std::f32::consts::PI;
-                    let yaw = Quat::from_rotation_z(-delta_x);
-                    let pitch = Quat::from_rotation_x(-delta_y);
-                    persp_transform.rotation = yaw * persp_transform.rotation; // global y
-                    persp_transform.rotation = persp_transform.rotation * pitch;
-                    // local x
-                }
-            } else if is_panning && cursor_motion.length_squared() > 0. {
-                changed = true;
-                // make panning distance independent of resolution and FOV,
-                if let Ok(window) = primary_windows.get_single() {
-                    let window_size = Vec2::new(window.width() as f32, window.height() as f32);
-
-                    cursor_motion *=
-                        Vec2::new(persp_proj.fov * persp_proj.aspect_ratio, persp_proj.fov)
-                            / window_size;
-                    // translate by local axes
-                    let right = persp_transform.rotation * Vec3::X * -cursor_motion.x;
-                    let up = persp_transform.rotation * Vec3::Y * cursor_motion.y;
-                    // make panning proportional to distance away from center point
-                    let translation = (right + up) * controls.orbit_radius;
-                    controls.orbit_center += translation;
-                }
-            }
+    }
+}
 
-            if scroll.abs() > 0.0 {
-                changed = true;
-                controls.orbit_radius -= scroll * controls.orbit_radius * 0.2;
-                // dont allow zoom to reach zero or you get stuck
-                controls.orbit_radius = f32::max(controls.orbit_radius, 0.05);
+fn update_orbit_center_marker(
+    controls: Res<CameraControls>,
+    keyboard_command: Res<KeyboardCommand>,
+    cursor_command: Res<CursorCommand>,
+    interaction_assets: Res<InteractionAssets>,
+    mut gizmo: Gizmos,
+    mut marker_query: Query<
+        (
+            &mut Transform,
+            &mut Visibility,
+            &mut Handle<StandardMaterial>,
+        ),
+        Without<Projection>,
+    >,
+) {
+    if let Ok((mut marker_transform, mut marker_visibility, mut marker_material)) =
+        marker_query.get_mut(controls.selection_marker)
+    {
+        // Orbitting
+        if (cursor_command.command_type == CameraCommandType::Orbit
+            || keyboard_command.command_type == CameraCommandType::Orbit)
+            && controls.mode() == ProjectionMode::Perspective
+        {
+            if let Some(orbit_center) = controls.orbit_center {
+                *marker_visibility = Visibility::Visible;
+                *marker_material = interaction_assets.camera_control_orbit_material.clone();
+                marker_transform.translation = orbit_center;
+                gizmo.sphere(orbit_center, Quat::IDENTITY, 0.1, Color::GREEN);
             }
-
-            if changed {
-                // emulating parent/child to make the yaw/y-axis rotation behave like a turntable
-                // parent = x and y rotation
-                // child = z-offset
-                let rot_matrix = Mat3::from_quat(persp_transform.rotation);
-                persp_transform.translation = controls.orbit_center
-                    + rot_matrix.mul_vec3(Vec3::new(0.0, 0.0, controls.orbit_radius));
+        // Panning
+        } else if cursor_command.command_type == CameraCommandType::Pan {
+            if let Some(cursor_selection) = cursor_command.cursor_selection {
+                *marker_visibility = Visibility::Visible;
+                *marker_material = interaction_assets.camera_control_pan_material.clone();
+                marker_transform.translation = cursor_selection;
+                gizmo.sphere(cursor_selection, Quat::IDENTITY, 0.1, Color::WHITE);
             }
+        } else {
+            *marker_visibility = Visibility::Hidden;
         }
     }
 }
@@ -556,10 +542,20 @@ pub struct CameraControlsPlugin;
 
 impl Plugin for CameraControlsPlugin {
     fn build(&self, app: &mut App) {
-        app.insert_resource(MouseLocation::default())
-            .init_resource::<CameraControls>()
+        app.init_resource::<CameraControls>()
+            .init_resource::<CursorCommand>()
+            .init_resource::<KeyboardCommand>()
             .init_resource::<HeadlightToggle>()
             .add_event::<ChangeProjectionMode>()
-            .add_systems(Update, camera_controls);
+            .add_systems(
+                Update,
+                (
+                    update_cursor_command,
+                    update_keyboard_command,
+                    camera_controls,
+                )
+                    .chain(),
+            )
+            .add_systems(Update, update_orbit_center_marker);
     }
 }
diff --git a/rmf_site_editor/src/interaction/camera_controls/utils.rs b/rmf_site_editor/src/interaction/camera_controls/utils.rs
new file mode 100644
index 00000000..2d1db1ec
--- /dev/null
+++ b/rmf_site_editor/src/interaction/camera_controls/utils.rs
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2024 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
+
+use bevy::prelude::*;
+use bevy_mod_raycast::{
+    immediate::{Raycast, RaycastSettings, RaycastVisibility},
+    primitives::Ray3d,
+};
+
+use super::{MAX_PITCH, MAX_SELECTION_DIST, MIN_SELECTION_DIST};
+use crate::UserCameraDisplay;
+
+/// Orbit the camera around the point while upright, maintaining the orbit center
+/// in the same position in the camera viewport
+pub fn orbit_camera_around_point(
+    camera_transform: &Transform,
+    orbit_center: Vec3,
+    pitch: f32,
+    yaw: f32,
+    zoom: f32,
+) -> Transform {
+    let mut camera_transform_next = camera_transform.clone();
+
+    // Rotation
+    // Exclude pitch if exceeds maximum angle in orthographic mode
+    let yaw = Quat::from_rotation_z(yaw);
+    let pitch = Quat::from_rotation_x(-pitch);
+    camera_transform_next.rotation = (yaw * camera_transform.rotation) * pitch;
+    if camera_transform_next.up().z.acos().to_degrees() > MAX_PITCH {
+        camera_transform_next.rotation = yaw * camera_transform.rotation;
+    };
+
+    // Translation
+    let camera_to_orbit_center = orbit_center - camera_transform.translation;
+    let camera_to_orbit_center_camera_frame =
+        camera_transform.rotation.inverse() * camera_to_orbit_center;
+    let camera_to_orbit_center_next = camera_transform_next.local_x()
+        * camera_to_orbit_center_camera_frame.x
+        + camera_transform_next.local_y() * camera_to_orbit_center_camera_frame.y
+        + camera_transform_next.local_z() * camera_to_orbit_center_camera_frame.z;
+    camera_transform_next.translation = orbit_center - camera_to_orbit_center_next;
+
+    // Zoom
+    let zoom_translation = camera_to_orbit_center_next.normalize()
+        * zoom_distance_factor(camera_transform.translation, orbit_center)
+        * zoom;
+    camera_transform_next.translation += zoom_translation;
+
+    return camera_transform_next;
+}
+
+/// Multiplied over the zoom translation to make zoom proportionally faster when further away
+pub fn zoom_distance_factor(camera_translation: Vec3, target_translation: Vec3) -> f32 {
+    return (0.2 * (camera_translation - target_translation).length()).max(1.0);
+}
+
+/// Get the nearest intersection from the center of the visible viewport.
+pub fn get_camera_selected_point(
+    camera: &Camera,
+    camera_global_transform: &GlobalTransform,
+    user_camera_display: Res<UserCameraDisplay>,
+    mut immediate_raycast: Raycast,
+) -> Vec3 {
+    // Assume that the camera spans the full window, covered by egui panels
+    let available_viewport_center = user_camera_display.region.center();
+    let camera_ray = camera
+        .viewport_to_world(camera_global_transform, available_viewport_center)
+        .expect("Active camera does not have a valid ray from center of its viewport");
+    let camera_ray = Ray3d::new(camera_ray.origin, camera_ray.direction);
+    let raycast_setting = RaycastSettings::default()
+        .always_early_exit()
+        .with_visibility(RaycastVisibility::MustBeVisible);
+
+    //TODO(@reuben-thomas) Filter for selectable entities
+    let intersections = immediate_raycast.cast_ray(camera_ray, &raycast_setting);
+    if intersections.len() > 0 {
+        let (_, intersection_data) = &intersections[0];
+        return intersection_data.position();
+    } else {
+        return get_groundplane_else_default_selection(
+            camera_ray.origin(),
+            camera_ray.direction(),
+            camera_ray.direction(),
+        );
+    }
+}
+
+/// Get the intersection point of a ray with the ground. If none, return an intersection with
+/// a plane in front of the camera.
+pub fn get_groundplane_else_default_selection(
+    selector_origin: Vec3,
+    selector_direction: Vec3,
+    camera_direction: Vec3,
+) -> Vec3 {
+    // If valid intersection with groundplane
+    let denom = Vec3::Z.dot(selector_direction);
+    if denom.abs() > f32::EPSILON {
+        let dist = (-1.0 * selector_origin).dot(Vec3::Z) / denom;
+        if dist > f32::EPSILON && dist < MAX_SELECTION_DIST {
+            return selector_origin + selector_direction * dist;
+        }
+    }
+
+    // No groundplane intersection,
+    // Pick a point on arbitrary plane in front
+    let height = selector_origin.z.abs();
+    let plane_dist = height.max(MIN_SELECTION_DIST);
+    return selector_origin
+        + selector_direction * (plane_dist / selector_direction.dot(camera_direction));
+}
diff --git a/rmf_site_editor/src/site/site.rs b/rmf_site_editor/src/site/site.rs
index cc559edd..b3cd666a 100644
--- a/rmf_site_editor/src/site/site.rs
+++ b/rmf_site_editor/src/site/site.rs
@@ -166,7 +166,7 @@ pub fn set_camera_transform_for_changed_site(
             translation.x = translation.x + 10.0;
             translation.y = translation.y + 10.0;
             translation.z = 0.0;
-            camera_controls.orbit_center = translation;
+            camera_controls.orbit_center = Some(translation);
         }
     }
 }
diff --git a/rmf_site_editor/src/widgets/mod.rs b/rmf_site_editor/src/widgets/mod.rs
index f331e210..76f7a4ed 100644
--- a/rmf_site_editor/src/widgets/mod.rs
+++ b/rmf_site_editor/src/widgets/mod.rs
@@ -101,6 +101,9 @@ pub use sdf_export_menu::*;
 pub mod selector_widget;
 pub use selector_widget::*;
 
+pub mod user_camera_display;
+pub use user_camera_display::*;
+
 pub mod view_groups;
 use view_groups::*;
 
@@ -151,11 +154,14 @@ impl Plugin for StandardUiPlugin {
             FuelAssetBrowserPlugin::default(),
             DiagnosticsPlugin::default(),
             ConsoleWidgetPlugin::default(),
+            UserCameraDisplayPlugin::default(),
         ))
         .add_systems(Startup, init_ui_style)
         .add_systems(
             Update,
-            site_ui_layout.run_if(AppState::in_displaying_mode()),
+            site_ui_layout
+                .in_set(RenderUiSet)
+                .run_if(AppState::in_displaying_mode()),
         )
         .add_systems(
             PostUpdate,
@@ -386,6 +392,12 @@ impl ShowSharedWidget for World {
     }
 }
 
+/// This set is for systems that impact rendering the UI using egui. The
+/// [`UserCameraDisplay`] resource waits until after this set is finished before
+/// computing the user camera area.
+#[derive(SystemSet, Hash, PartialEq, Eq, Debug, Clone)]
+pub struct RenderUiSet;
+
 /// This system renders all UI panels in the application and makes sure that the
 /// UI rendering works correctly with the picking system, and any other systems
 /// as needed.
diff --git a/rmf_site_editor/src/widgets/user_camera_display.rs b/rmf_site_editor/src/widgets/user_camera_display.rs
new file mode 100644
index 00000000..1918d335
--- /dev/null
+++ b/rmf_site_editor/src/widgets/user_camera_display.rs
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2024 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
+
+use crate::{widgets::RenderUiSet, AppState};
+use bevy::prelude::*;
+use bevy_egui::EguiContexts;
+
+/// This resource keeps track of the region that the user camera display is
+/// occupying in the window.
+#[derive(Resource, Clone, Default)]
+pub struct UserCameraDisplay {
+    pub region: Rect,
+}
+
+/// Add the [`UserCameraDisplay`] resource to the application, along with the
+/// system that updates it.
+#[derive(Default)]
+pub struct UserCameraDisplayPlugin {}
+
+impl Plugin for UserCameraDisplayPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<UserCameraDisplay>().add_systems(
+            Update,
+            update_user_camera_display
+                .in_set(UserCameraDisplaySet)
+                .after(RenderUiSet)
+                .run_if(AppState::in_site_mode()),
+        );
+    }
+}
+
+/// This set is for systems that update fields of the [`UserCameraDisplay`]
+/// resource.
+#[derive(SystemSet, Hash, PartialEq, Eq, Debug, Clone)]
+pub struct UserCameraDisplaySet;
+
+fn update_user_camera_display(
+    mut user_camera_display: ResMut<UserCameraDisplay>,
+    mut egui_contexts: EguiContexts,
+) {
+    let available_rect = egui_contexts.ctx_mut().available_rect();
+    user_camera_display.region = Rect::new(
+        available_rect.min.x,
+        available_rect.min.y,
+        available_rect.max.x,
+        available_rect.max.y,
+    );
+}