Retry spawning scenes if assets are not ready (#386)

* Created a timeout loop for spawning scenes

Signed-off-by: Xiyu Oh <xiyu@openrobotics.org>

* Skip serializing door properties if default

Signed-off-by: Xiyu Oh <xiyu@openrobotics.org>

* Use cycle for retry mechanism

Signed-off-by: Xiyu Oh <xiyu@openrobotics.org>

* Remove retry mechanism and use wait_for_asset_untyped

Signed-off-by: Xiyu Oh <xiyu@openrobotics.org>

---------

Signed-off-by: Xiyu Oh <xiyu@openrobotics.org>
Co-authored-by: Grey <mxgrey@intrinsic.ai>
Co-authored-by: Grey <greyxmike@gmail.com>

Author: xiyuoh

crates/rmf_site_editor/src/site/model.rs

@@ -173,7 +173,7 @@ fn load_asset_source(
                     return Err(ModelLoadingErrorKind::InvalidAssetSource(err.to_string()));
                 }
             };
-            asset_server
+            let handle = asset_server
                 .load_untyped_async(&asset_path)
                 .await
                 .map_err(|err| {
@@ -187,7 +187,15 @@ fn load_asset_source(
                         error!("Failed attempt to load asset with [{asset_path}]: {err}");
                     }
                     ModelLoadingErrorKind::AssetServerError(err.to_string())
+                })?;
+            asset_server
+                .wait_for_asset_untyped(&handle)
+                .await
+                .map_err(|err| {
+                    error!("Failed attempt to load asset with [{asset_path}]: {err}");
+                    ModelLoadingErrorKind::AssetServerError(err.to_string())
                 })
+                .map(|_| handle)
         }
     }
 }

crates/rmf_site_format/src/door.rs

@@ -109,6 +109,7 @@ impl Default for DoorType {
 pub struct SingleSlidingDoor {
     /// Which side the door slides towards
     pub towards: Side,
+    #[serde(default, skip_serializing_if = "is_default")]
     pub position: f32,
 }
 
@@ -132,7 +133,9 @@ impl From<SingleSlidingDoor> for DoorType {
 pub struct DoubleSlidingDoor {
     /// Length of the left door divided by the length of the right door
     pub left_right_ratio: f32,
+    #[serde(default, skip_serializing_if = "is_default")]
     pub left_position: f32,
+    #[serde(default, skip_serializing_if = "is_default")]
     pub right_position: f32,
 }
 
@@ -170,6 +173,7 @@ pub struct SingleSwingDoor {
     pub pivot_on: Side,
     /// How does the door swing
     pub swing: Swing,
+    #[serde(default, skip_serializing_if = "is_default")]
     pub position: f32,
 }
 
@@ -196,7 +200,9 @@ pub struct DoubleSwingDoor {
     pub swing: Swing,
     /// Length of the left door divided by the length of the right door
     pub left_right_ratio: f32,
+    #[serde(default, skip_serializing_if = "is_default")]
     pub left_position: f32,
+    #[serde(default, skip_serializing_if = "is_default")]
     pub right_position: f32,
 }