Refactor place of default editor control settings

Former-commit-id: 145b77d
janhohenheim · Feb 20, 2023 · df8c5bd · df8c5bd
1 parent 0958af2
commit df8c5bd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/dev.rs b/src/dev.rs
@@ -14,7 +14,8 @@ pub struct DevPlugin;
 impl Plugin for DevPlugin {
     fn build(&self, app: &mut App) {
         {
-            app.add_plugin(EditorPlugin)
+            app.insert_resource(default_editor_controls())
+                .add_plugin(EditorPlugin)
                 .add_plugin(FrameTimeDiagnosticsPlugin::default())
                 .add_plugin(DebugLinesPlugin::default())
                 .add_plugin(SceneEditorPlugin)
@@ -26,3 +27,17 @@ impl Plugin for DevPlugin {
         }
     }
 }
+
+fn default_editor_controls() -> bevy_editor_pls::controls::EditorControls {
+    use bevy_editor_pls::controls::*;
+    let mut editor_controls = EditorControls::default_bindings();
+    editor_controls.unbind(Action::PlayPauseEditor);
+    editor_controls.insert(
+        Action::PlayPauseEditor,
+        Binding {
+            input: UserInput::Single(Button::Keyboard(KeyCode::Q)),
+            conditions: vec![BindingCondition::ListeningForText(false)],
+        },
+    );
+    editor_controls
+}
diff --git a/src/dev/scene_editor.rs b/src/dev/scene_editor.rs
@@ -135,7 +135,6 @@ impl Plugin for SceneEditorPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<SceneEditorState>()
             .add_editor_window::<FoxtrotDevWindow>()
-            .insert_resource(default_editor_controls())
             .add_system_set(
                 SystemSet::on_update(GameState::Playing)
                     .with_system(handle_debug_render)
@@ -206,17 +205,3 @@ fn handle_navmesh_render(
         }
     }
 }
-
-fn default_editor_controls() -> bevy_editor_pls::controls::EditorControls {
-    use bevy_editor_pls::controls::*;
-    let mut editor_controls = EditorControls::default_bindings();
-    editor_controls.unbind(Action::PlayPauseEditor);
-    editor_controls.insert(
-        Action::PlayPauseEditor,
-        Binding {
-            input: UserInput::Single(Button::Keyboard(KeyCode::Q)),
-            conditions: vec![BindingCondition::ListeningForText(false)],
-        },
-    );
-    editor_controls
-}