Minor cleanup, fix wasm

Signed-off-by: Luca Della Vedova <[email protected]>
open-rmf · Feb 16, 2024 · b7d6fc2 · b7d6fc2
1 parent d5d3295
commit b7d6fc2
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 63 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ Make sure you install rust from the main rust website. Cargo should take care of
 These are only needed if you're going to build a WebAssembly binary:
 ```bash
 $ sudo apt install binaryen
-$ cargo install wasm-bindgen-cli@0.2.84 basic-http-server
+$ cargo install wasm-bindgen-cli basic-http-server
 $ rustup target add wasm32-unknown-unknown
 ```
 

diff --git a/rmf_site_editor/src/lib.rs b/rmf_site_editor/src/lib.rs
@@ -1,4 +1,3 @@
-#![allow(warnings)]
 use bevy::{
     log::LogPlugin, pbr::DirectionalLightShadowMap, prelude::*, render::renderer::RenderAdapterInfo,
 };
@@ -137,67 +136,43 @@ pub struct SiteEditor;
 
 impl Plugin for SiteEditor {
     fn build(&self, app: &mut App) {
-        #[cfg(target_arch = "wasm32")]
-        {
-            app.add_plugins(
-                DefaultPlugins
-                    .build()
-                    .disable::<LogPlugin>()
-                    .set(WindowPlugin {
-                        primary_window: Some(Window {
-                            title: "RMF Site Editor".to_owned(),
-                            canvas: Some(String::from("#rmf_site_editor_canvas")),
-                            fit_canvas_to_parent: true,
-                            ..default()
-                        }),
-                        ..default()
-                    })
-                    .set(ImagePlugin {
-                        default_sampler: SamplerDescriptor {
-                            address_mode_u: AddressMode::Repeat,
-                            address_mode_v: AddressMode::Repeat,
-                            address_mode_w: AddressMode::Repeat,
-                            ..Default::default()
-                        },
-                    })
-                    .add_after::<bevy::asset::AssetPlugin, _>(SiteAssetIoPlugin),
-            );
-        }
-
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            app.add_plugins((
-                SiteAssetIoPlugin,
-                DefaultPlugins
-                    .build()
-                    .disable::<LogPlugin>()
-                    .set(WindowPlugin {
-                        primary_window: Some(Window {
-                            title: "RMF Site Editor".to_owned(),
-                            resolution: (1600., 900.).into(),
-                            ..default()
-                        }),
-                        ..default()
-                    })
-                    .set(ImagePlugin {
-                        default_sampler: SamplerDescriptor {
-                            address_mode_u: AddressMode::Repeat,
-                            address_mode_v: AddressMode::Repeat,
-                            address_mode_w: AddressMode::Repeat,
-                            ..Default::default()
-                        }
-                        .into(),
-                    })
-                    .set(RenderPlugin {
-                        render_creation: WgpuSettings {
-                            features: WgpuFeatures::POLYGON_MODE_LINE,
-                            ..default()
-                        }
-                        .into(),
+        app.add_plugins((
+            SiteAssetIoPlugin,
+            DefaultPlugins
+                .build()
+                .disable::<LogPlugin>()
+                .set(WindowPlugin {
+                    primary_window: Some(Window {
+                        title: "RMF Site Editor".to_owned(),
+                        #[cfg(not(target_arch = "wasm32"))]
+                        resolution: (1600., 900.).into(),
+                        #[cfg(target_arch = "wasm32")]
+                        canvas: Some(String::from("#rmf_site_editor_canvas")),
+                        #[cfg(target_arch = "wasm32")]
+                        fit_canvas_to_parent: true,
                         ..default()
                     }),
-            ));
-        }
+                    ..default()
+                })
+                .set(ImagePlugin {
+                    default_sampler: SamplerDescriptor {
+                        address_mode_u: AddressMode::Repeat,
+                        address_mode_v: AddressMode::Repeat,
+                        address_mode_w: AddressMode::Repeat,
+                        ..Default::default()
+                    }
+                    .into(),
+                })
+                .set(RenderPlugin {
+                    render_creation: WgpuSettings {
+                        #[cfg(not(target_arch = "wasm32"))]
+                        features: WgpuFeatures::POLYGON_MODE_LINE,
+                        ..default()
+                    }
+                    .into(),
+                    ..default()
+                }),
+        ));
         app.insert_resource(DirectionalLightShadowMap { size: 2048 })
             .add_state::<AppState>()
             .add_plugins((

diff --git a/rmf_site_editor/src/log.rs b/rmf_site_editor/src/log.rs
@@ -129,7 +129,7 @@ impl Default for LogHistory {
         let rx_2 = rx.clone();
 
         let level_name = Level::INFO;
-        let filter_name = "bevy_asset=error,wgpu=error".to_string();
+        let filter_name = "bevy_asset=off,wgpu=error".to_string();
         let default_filter = { format!("{},{}", level_name, filter_name) };
         let filter_layer = EnvFilter::try_from_default_env()
             .or_else(|_| EnvFilter::try_new(&default_filter))

diff --git a/rmf_site_editor/src/osm_slippy_map.rs b/rmf_site_editor/src/osm_slippy_map.rs
@@ -18,7 +18,7 @@
 use std::{f32::consts::PI, io::Write, path::Path, path::PathBuf};
 
 use bevy::{
-    asset::io::{file::FileAssetReader, AssetReaderError, Reader, VecReader},
+    asset::io::{AssetReaderError, Reader, VecReader},
     prelude::{Mesh, Vec2},
     render::{mesh::Indices, render_resource::PrimitiveTopology},
 };