From 2c4dfec839566ae898b042f1a2f9e44d79b6693c Mon Sep 17 00:00:00 2001 From: Danny McGee Date: Fri, 13 Oct 2023 17:54:57 -0400 Subject: [PATCH] Cleanup, conditional compilation flags --- studio/src/interaction/mod.rs | 3 ++- studio/src/lib.rs | 24 +++--------------------- studio/src/viewport.rs | 2 +- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/studio/src/interaction/mod.rs b/studio/src/interaction/mod.rs index 4d8a85c..44cabd6 100644 --- a/studio/src/interaction/mod.rs +++ b/studio/src/interaction/mod.rs @@ -14,6 +14,7 @@ impl Plugin for InteractionPlugin { .insert_resource(InteractionMode::default()) .add_plugins(StudioGizmosPlugin); + #[cfg(target_arch = "wasm32")] app.add_systems( PreUpdate, (wasm::update_selection_mode, wasm::update_interaction_mode), @@ -85,7 +86,7 @@ impl Default for TransformSpace { } } -// #[cfg(target_arch = "wasm32")] +#[cfg(target_arch = "wasm32")] pub mod wasm { use bevy::prelude::*; use wasm_bindgen::prelude::*; diff --git a/studio/src/lib.rs b/studio/src/lib.rs index 2de5bbd..2e3f777 100644 --- a/studio/src/lib.rs +++ b/studio/src/lib.rs @@ -3,12 +3,7 @@ use bevy::prelude::*; use input::StudioInputPlugin; use interaction::InteractionPlugin; -#[rustfmt::skip] -use orbit_cam::{ - // CameraMotionSystem, - // OrbitCam, - OrbitCamPlugin, -}; +use orbit_cam::OrbitCamPlugin; use skybox::SkyboxPlugin; use test_scene::TestScenePlugin; use ui::UiLayerPlugin; @@ -24,7 +19,8 @@ mod skybox; mod test_scene; mod ui; mod viewport; -// #[cfg(target_arch = "wasm32")] + +#[cfg(target_arch = "wasm32")] mod wasm; #[wasm_bindgen] @@ -53,19 +49,5 @@ pub fn init(viewport_size: ViewportSize) { SkyboxPlugin, UiLayerPlugin, )) - // .add_systems(Update, draw_world_axes.after(CameraMotionSystem)) .run(); } - -// fn draw_world_axes(mut gizmos: Gizmos, q: Query<&OrbitCam>) { -// let &OrbitCam { focus, radius, .. } = q.single(); - -// let mut draw_axis = |direction: Vec3, color: Color| { -// let end = focus + direction * radius / 15.; -// gizmos.line(focus, end, color); -// }; - -// draw_axis(Vec3::X, Color::RED); -// draw_axis(Vec3::Y, Color::GREEN); -// draw_axis(Vec3::Z, Color::BLUE); -// } diff --git a/studio/src/viewport.rs b/studio/src/viewport.rs index 1dfb01b..33865c5 100644 --- a/studio/src/viewport.rs +++ b/studio/src/viewport.rs @@ -45,7 +45,7 @@ impl fmt::Debug for ViewportSize { } } -// #[cfg(target_arch = "wasm32")] +#[cfg(target_arch = "wasm32")] pub mod wasm { use bevy::prelude::*; use wasm_bindgen::prelude::*;