Merge pull request #2 from open-rmf/camera_controls

Fix merge conflicts with latest main of upstream

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>

rmf_site_editor/Cargo.toml

@@ -21,6 +21,7 @@ bevy_mod_raycast = "0.16"
 bevy_mod_outline = "0.6"
 # PR merged after 0.10 but not released yet, bump to 0.10.1 once merged
 bevy_infinite_grid = { git = "https://github.com/ForesightMiningSoftwareCorporation/bevy_infinite_grid", rev = "86018dd" }
+bevy_gltf_export = { git = "https://github.com/luca-della-vedova/bevy_gltf_export", branch = "luca/transform_api"}
 bevy_polyline = "0.8.1"
 bevy_stl = "0.12"
 bevy_obj = { version = "0.12.1", features = ["scene"] }
@@ -43,9 +44,10 @@ tracing = "0.1.37"
 tracing-subscriber = "0.3.1"
 rfd = "0.12"
 urdf-rs = "0.7"
+yaserde = "0.7"
 utm = "0.1.6"
-sdformat_rs = { git = "https://github.com/open-rmf/sdf_rust_experimental", rev = "a5daef0"}
-gz-fuel = { git = "https://github.com/open-rmf/gz-fuel-rs", branch = "luca/ehttp" }
+sdformat_rs = { git = "https://github.com/open-rmf/sdf_rust_experimental", rev = "9fc35f2"}
+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"] }

rmf_site_editor/examples/extending_menu.rs

@@ -84,5 +84,7 @@ impl Plugin for MyMenuPlugin {
 
 /// Lets embed site editor in our application with our own plugin
 fn main() {
-    App::new().add_plugins((SiteEditor, MyMenuPlugin)).run();
+    App::new()
+        .add_plugins((SiteEditor::default(), MyMenuPlugin))
+        .run();
 }

rmf_site_editor/src/aabb.rs

@@ -17,10 +17,12 @@ use bevy::{
 use smallvec::SmallVec;
 
 /// Tracks which [`Entities`](Entity) have which meshes for entities whose [`Aabb`]s are managed by
-/// the [`calculate_bounds`] and [`update_bounds`] systems. This is needed because `update_bounds`
+/// the [`calculate_bounds`][1] and [`update_bounds`] systems. This is needed because `update_bounds`
 /// recomputes `Aabb`s for entities whose mesh has been mutated. These mutations are visible via
 /// [`AssetEvent<Mesh>`](AssetEvent) which tells us which mesh was changed but not which entities
 /// have that mesh.
+///
+/// [1]: bevy::render::view::calculate_bounds
 #[derive(Debug, Default, Clone, Resource)]
 pub struct EntityMeshMap {
     entities_with_mesh: HashMap<AssetId<Mesh>, SmallVec<[Entity; 1]>>,
@@ -76,8 +78,6 @@ pub fn register_bounds(
 /// Updates [`Aabb`]s for [`Entities`](Entity) with [`Mesh`]es. This includes `Entities` that have
 /// been assigned new `Mesh`es as well as `Entities` whose `Mesh` has been directly mutated.
 ///
-/// To opt out of bound calculation for an `Entity`, give it the [`NoAabbUpdate`] component.
-///
 /// NOTE: This system needs to remove entities from their collection in
 /// [`EntityMeshMap`] whenever a mesh handle is reassigned or an entity's mesh handle is
 /// removed. This may impact performance if meshes with many entities are frequently