This commit is contained in:
rewin
2024-04-02 20:23:58 +03:00
parent 75fdb39dc2
commit 8fd780288d
3 changed files with 14 additions and 9 deletions
+5 -5
View File
@@ -1,7 +1,8 @@
use std::f32::consts;
use bevy::{
prelude::*, window::{CursorGrabMode, PrimaryWindow}
prelude::*,
window::{CursorGrabMode, PrimaryWindow},
};
use crate::{
@@ -26,10 +27,9 @@ impl Plugin for CameraControllerPlugin {
camera_control_kinematic,
(process_physical_inputs, process_focus_inputs).before(InterpolationSystem),
(camera_control_physical, interp_camera_focus).after(InterpolationSystem),
)
.in_set(CameraMotionSystem),
);
);
#[cfg(not(feature = "wasm"))]
app.add_systems(PreUpdate, sync_camera_viewport);
@@ -39,8 +39,8 @@ impl Plugin for CameraControllerPlugin {
#[cfg(not(feature = "wasm"))]
fn sync_camera_viewport(
mut camera: Query<&mut Camera, With<MainCamera>>,
mut window: Query<&mut Window, With<PrimaryWindow>>,)
{
mut window: Query<&mut Window, With<PrimaryWindow>>,
) {
let Ok(mut camera) = camera.get_single_mut() else {
return;
};
+8 -3
View File
@@ -3,14 +3,20 @@ use std::fmt;
use bevy::{prelude::*, window::PrimaryWindow};
use bevy_inspector_egui::DefaultInspectorConfigPlugin;
use bevy_mod_picking::debug::DebugPickingMode;
use space_editor::prelude::space_undo::AppAutoUndo;
use space_editor::{
prelude::*,
space_editor_ui::{tools::gizmo::GizmoToolPlugin, EditorPluginGroup},
};
use space_editor::prelude::space_undo::AppAutoUndo;
use crate::{
anim::SkeletalJoint, camera_controller::{CameraController, CameraMotionSystem}, input::{Action, InputAction, Lifecycle}, interaction::Selectable, is_editor, scene::SceneElement, MainCamera
anim::SkeletalJoint,
camera_controller::{CameraController, CameraMotionSystem},
input::{Action, InputAction, Lifecycle},
interaction::Selectable,
is_editor,
scene::SceneElement,
MainCamera,
};
#[derive(Resource, Deref, DerefMut)]
@@ -76,7 +82,6 @@ impl Plugin for DebugPlugin {
app.auto_undo::<Handle<Mesh>>();
app.auto_undo::<SceneElement>();
app.auto_undo::<Selectable>();
app.add_systems(Update, sync_editor_camera);
app.add_systems(
+1 -1
View File
@@ -147,7 +147,7 @@ pub fn start(init: InitParams, mode: StudioMode, window_config: Option<Window>)
let mut app = App::new();
app.insert_resource(mode);
app.insert_resource(mode);
app.insert_resource(bevy::winit::WinitSettings {
focused_mode: bevy::winit::UpdateMode::Continuous,
unfocused_mode: bevy::winit::UpdateMode::Continuous,