From cb72687173d31869ff45ddc8a861473d43ff118c Mon Sep 17 00:00:00 2001 From: rewin Date: Mon, 19 Feb 2024 21:23:38 +0300 Subject: [PATCH] Fix native build --- studio/src/lib.rs | 18 ++++++++++++++---- studio/src/ui/mod.rs | 4 ++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/studio/src/lib.rs b/studio/src/lib.rs index bb82466..85b8154 100644 --- a/studio/src/lib.rs +++ b/studio/src/lib.rs @@ -15,7 +15,9 @@ mod debug; mod design_system; mod hierarchy; mod input; +#[cfg(feature = "wasm")] mod inspector; + mod interaction; pub mod math; mod mixamo; @@ -33,7 +35,6 @@ pub use crate::{ camera_controller::CameraControllerPlugin, debug::DebugPlugin, input::StudioInputPlugin, - inspector::InspectorPlugin, interaction::InteractionPlugin, math::InterpolationPlugin, mixamo::{MixamoImportEvent, MixamoPlugin}, @@ -67,10 +68,11 @@ pub(crate) fn is_editor(r_studio_mode: Res) -> bool { struct CommonPlugins; impl PluginGroup for CommonPlugins { fn build(self) -> PluginGroupBuilder { - PluginGroupBuilder::start::() + let group = PluginGroupBuilder::start::() .add(CameraControllerPlugin) .add(DebugPlugin) - .add(InspectorPlugin) + + .add(InterpolationPlugin) .add(ScenePlugin) .add(SkyboxPlugin) @@ -78,7 +80,15 @@ impl PluginGroup for CommonPlugins { .add(UiLayerPlugin) .add(WorldGridPlugin) .add(PersistancePlugin) - .add(AnimPlugin) + .add(AnimPlugin); + + #[cfg(feature = "wasm")] + let group = { + group + .add(inspector::InspectorPlugin) + }; + + group } } diff --git a/studio/src/ui/mod.rs b/studio/src/ui/mod.rs index 1e853c3..2fa6a47 100644 --- a/studio/src/ui/mod.rs +++ b/studio/src/ui/mod.rs @@ -3,7 +3,9 @@ use bevy::prelude::*; use self::fps::FpsCounterPlugin; mod fps; +#[cfg(feature = "wasm")] mod inspector; +#[cfg(feature = "wasm")] mod utils; pub struct UiLayerPlugin; @@ -11,6 +13,8 @@ pub struct UiLayerPlugin; impl Plugin for UiLayerPlugin { fn build(&self, app: &mut App) { app.add_plugins(FpsCounterPlugin); + + #[cfg(feature = "wasm")] app.add_plugins(inspector::InspectorPlugin); } }