Merge pull request #56 from GrandChaman/fix-window-as-anchor

Prevent windows hits from being used as anchors

Author: aevyrie

Cargo.toml

@@ -15,27 +15,27 @@ extension_anchor_indicator = ["bevy_gizmos"]
 extension_independent_skybox = ["bevy_asset", "bevy_core_pipeline"]
 
 [dependencies]
-bevy_app = "0.17.1"
-bevy_color = "0.17.1"
-bevy_derive = "0.17.1"
-bevy_ecs = "0.17.1"
-bevy_image = "0.17.1"
-bevy_input = "0.17.1"
-bevy_log = "0.17.1"
-bevy_math = "0.17.1"
-bevy_picking = "0.17.1"
-bevy_reflect = "0.17.1"
-bevy_camera = "0.17.1"
-bevy_render = "0.17.1"
-bevy_time = "0.17.1"
-bevy_transform = "0.17.1"
-bevy_utils = "0.17.1"
-bevy_window = "0.17.1"
-bevy_platform = "0.17.1"
+bevy_app = "0.17.3"
+bevy_color = "0.17.3"
+bevy_derive = "0.17.3"
+bevy_ecs = "0.17.3"
+bevy_image = "0.17.3"
+bevy_input = "0.17.3"
+bevy_log = "0.17.3"
+bevy_math = "0.17.3"
+bevy_picking = "0.17.3"
+bevy_reflect = "0.17.3"
+bevy_camera = "0.17.3"
+bevy_render = "0.17.3"
+bevy_time = "0.17.3"
+bevy_transform = "0.17.3"
+bevy_utils = "0.17.3"
+bevy_window = "0.17.3"
+bevy_platform = "0.17.3"
 # Optional
-bevy_asset = { version = "0.17.1", optional = true }
-bevy_core_pipeline = { version = "0.17.1", optional = true }
-bevy_gizmos = { version = "0.17.1", optional = true }
+bevy_asset = { version = "0.17.3", optional = true }
+bevy_core_pipeline = { version = "0.17.3", optional = true }
+bevy_gizmos = { version = "0.17.3", optional = true }
 
 [dev-dependencies]
 bevy_framepace = "0.20"
@@ -44,7 +44,7 @@ indoc = "2.0.5"
 rand = "0.9"
 
 [dev-dependencies.bevy]
-version = "0.17.0"
+version = "0.17.3"
 features = [
     "bevy_gizmos",
     "bevy_gltf",

src/input.rs

@@ -12,7 +12,7 @@ use bevy_math::{prelude::*, DVec2, DVec3};
 use bevy_platform::collections::HashMap;
 use bevy_reflect::prelude::*;
 use bevy_transform::prelude::*;
-use bevy_window::PrimaryWindow;
+use bevy_window::{PrimaryWindow, Window};
 
 use bevy_picking::pointer::{
     PointerAction, PointerId, PointerInput, PointerInteraction, PointerLocation, PointerMap,
@@ -183,6 +183,7 @@ impl EditorCamInputMessage {
     }
 
     /// Receive [`EditorCamInputMessage`]s, and use these to start and end moves on the [`EditorCam`].
+    #[allow(clippy::too_many_arguments)]
     pub fn receive_messages(
         mut events: MessageReader<Self>,
         mut controllers: Query<(&mut EditorCam, &GlobalTransform)>,
@@ -191,6 +192,7 @@ impl EditorCamInputMessage {
         pointer_interactions: Query<&PointerInteraction>,
         pointer_locations: Query<&PointerLocation>,
         cameras: Query<(&Camera, &Projection)>,
+        windows: Query<&Window>,
     ) {
         for event in events.read() {
             let Ok((mut controller, cam_transform)) = controllers.get_mut(event.camera()) else {
@@ -206,6 +208,11 @@ impl EditorCamInputMessage {
                         .get_entity(*pointer)
                         .and_then(|entity| pointer_interactions.get(entity).ok())
                         .and_then(|interaction| interaction.get_nearest_hit())
+                        // Since `bevy` 0.17.3:
+                        //
+                        // If the current hit is on a window, we cannot use the `hit.position` as an anchor
+                        // as the `hit.position` is in viewport coordinates.
+                        .filter(|(entity, _hit)| !windows.contains(*entity))
                         .and_then(|(_, hit)| hit.position)
                         .map(|world_space_hit| {
                             // Convert the world space hit to view (camera) space