derive Copy for HitData and adjust consumers

crates/bevy_picking_core/src/backend.rs

@@ -89,7 +89,7 @@ impl PointerHits {
 }
 
 /// Holds data from a successful pointer hit test. See [`HitData::depth`] for important details.
-#[derive(Clone, Debug, PartialEq, Reflect)]
+#[derive(Clone, Copy, Debug, PartialEq, Reflect)]
 pub struct HitData {
     /// The camera entity used to detect this hit. Useful when you need to find the ray that was
     /// casted for this hit when using a raycasting backend.

crates/bevy_picking_core/src/events.rs

@@ -63,29 +63,29 @@ impl<E: Debug + Clone + Reflect> Pointer<E> {
 }
 
 /// Fires when a pointer is no longer available.
-#[derive(Event, Clone, PartialEq, Debug, Reflect)]
+#[derive(Event, Clone, Copy, PartialEq, Debug, Reflect)]
 pub struct PointerCancel {
     /// ID of the pointer that was cancelled.
     #[reflect(ignore)]
     pub pointer_id: PointerId,
 }
 
 /// Fires when a the pointer crosses into the bounds of the `target` entity.
-#[derive(Clone, PartialEq, Debug, Reflect)]
+#[derive(Clone, Copy, PartialEq, Debug, Reflect)]
 pub struct Over {
     /// Information about the picking intersection.
     pub hit: HitData,
 }
 
 /// Fires when a the pointer crosses out of the bounds of the `target` entity.
-#[derive(Clone, PartialEq, Debug, Reflect)]
+#[derive(Clone, Copy, PartialEq, Debug, Reflect)]
 pub struct Out {
     /// Information about the latest prior picking intersection.
     pub hit: HitData,
 }
 
 /// Fires when a pointer button is pressed over the `target` entity.
-#[derive(Clone, PartialEq, Debug, Reflect)]
+#[derive(Clone, Copy, PartialEq, Debug, Reflect)]
 pub struct Down {
     /// Pointer button pressed to trigger this event.
     pub button: PointerButton,
@@ -94,7 +94,7 @@ pub struct Down {
 }
 
 /// Fires when a pointer button is released over the `target` entity.
-#[derive(Clone, PartialEq, Debug, Reflect)]
+#[derive(Clone, Copy, PartialEq, Debug, Reflect)]
 pub struct Up {
     /// Pointer button lifted to trigger this event.
     pub button: PointerButton,
@@ -104,7 +104,7 @@ pub struct Up {
 
 /// Fires when a pointer sends a pointer down event followed by a pointer up event, with the same
 /// `target` entity for both events.
-#[derive(Clone, PartialEq, Debug, Reflect)]
+#[derive(Clone, Copy, PartialEq, Debug, Reflect)]
 pub struct Click {
     /// Pointer button pressed and lifted to trigger this event.
     pub button: PointerButton,
@@ -113,7 +113,7 @@ pub struct Click {
 }
 
 /// Fires while a pointer is moving over the `target` entity.
-#[derive(Clone, PartialEq, Debug, Reflect)]
+#[derive(Clone, Copy, PartialEq, Debug, Reflect)]
 pub struct Move {
     /// Information about the picking intersection.
     pub hit: HitData,
@@ -122,7 +122,7 @@ pub struct Move {
 }
 
 /// Fires when the `target` entity receives a pointer down event followed by a pointer move event.
-#[derive(Clone, PartialEq, Debug, Reflect)]
+#[derive(Clone, Copy, PartialEq, Debug, Reflect)]
 pub struct DragStart {
     /// Pointer button pressed and moved to trigger this event.
     pub button: PointerButton,
@@ -131,7 +131,7 @@ pub struct DragStart {
 }
 
 /// Fires while the `target` entity is being dragged.
-#[derive(Clone, PartialEq, Debug, Reflect)]
+#[derive(Clone, Copy, PartialEq, Debug, Reflect)]
 pub struct Drag {
     /// Pointer button pressed and moved to trigger this event.
     pub button: PointerButton,
@@ -142,7 +142,7 @@ pub struct Drag {
 }
 
 /// Fires when a pointer is dragging the `target` entity and a pointer up event is received.
-#[derive(Clone, PartialEq, Debug, Reflect)]
+#[derive(Clone, Copy, PartialEq, Debug, Reflect)]
 pub struct DragEnd {
     /// Pointer button pressed, moved, and lifted to trigger this event.
     pub button: PointerButton,
@@ -151,7 +151,7 @@ pub struct DragEnd {
 }
 
 /// Fires when a pointer dragging the `dragged` entity enters the `target` entity.
-#[derive(Clone, PartialEq, Debug, Reflect)]
+#[derive(Clone, Copy, PartialEq, Debug, Reflect)]
 pub struct DragEnter {
     /// Pointer button pressed to enter drag.
     pub button: PointerButton,
@@ -162,7 +162,7 @@ pub struct DragEnter {
 }
 
 /// Fires while the `dragged` entity is being dragged over the `target` entity.
-#[derive(Clone, PartialEq, Debug, Reflect)]
+#[derive(Clone, Copy, PartialEq, Debug, Reflect)]
 pub struct DragOver {
     /// Pointer button pressed while dragging over.
     pub button: PointerButton,
@@ -173,7 +173,7 @@ pub struct DragOver {
 }
 
 /// Fires when a pointer dragging the `dragged` entity leaves the `target` entity.
-#[derive(Clone, PartialEq, Debug, Reflect)]
+#[derive(Clone, Copy, PartialEq, Debug, Reflect)]
 pub struct DragLeave {
     /// Pointer button pressed while leaving drag.
     pub button: PointerButton,
@@ -184,7 +184,7 @@ pub struct DragLeave {
 }
 
 /// Fires when a pointer drops the `dropped` entity onto the `target` entity.
-#[derive(Clone, PartialEq, Debug, Reflect)]
+#[derive(Clone, Copy, PartialEq, Debug, Reflect)]
 pub struct Drop {
     /// Pointer button lifted to drop.
     pub button: PointerButton,
@@ -226,7 +226,7 @@ pub fn pointer_events(
         for (hovered_entity, hit) in hover_map
             .get(&pointer_id)
             .iter()
-            .flat_map(|h| h.iter().map(|(entity, data)| (*entity, data.to_owned())))
+            .flat_map(|h| h.iter().map(|(entity, data)| (*entity, *data)))
         {
             pointer_move.send(Pointer::new(
                 pointer_id,
@@ -245,7 +245,7 @@ pub fn pointer_events(
         for (hovered_entity, hit) in previous_hover_map
             .get(&press_event.pointer_id)
             .iter()
-            .flat_map(|h| h.iter().map(|(entity, data)| (*entity, data.clone())))
+            .flat_map(|h| h.iter().map(|(entity, data)| (*entity, *data)))
         {
             if let PressDirection::Up = press_event.direction {
                 let Some(location) = pointer_location(press_event.pointer_id) else {
@@ -266,7 +266,7 @@ pub fn pointer_events(
         for (hovered_entity, hit) in hover_map
             .get(&press_event.pointer_id)
             .iter()
-            .flat_map(|h| h.iter().map(|(entity, data)| (*entity, data.clone())))
+            .flat_map(|h| h.iter().map(|(entity, data)| (*entity, *data)))
         {
             if let PressDirection::Down = press_event.direction {
                 let Some(location) = pointer_location(press_event.pointer_id) else {
@@ -289,7 +289,7 @@ pub fn pointer_events(
     // If the entity is hovered...
     for (pointer_id, hovered_entity, hit) in hover_map
         .iter()
-        .flat_map(|(id, hashmap)| hashmap.iter().map(|data| (*id, *data.0, data.1.clone())))
+        .flat_map(|(id, hashmap)| hashmap.iter().map(|data| (*id, *data.0, *data.1)))
     {
         // ...but was not hovered last frame...
         if !previous_hover_map
@@ -313,7 +313,7 @@ pub fn pointer_events(
     // If the entity was hovered by a specific pointer last frame...
     for (pointer_id, hovered_entity, hit) in previous_hover_map
         .iter()
-        .flat_map(|(id, hashmap)| hashmap.iter().map(|data| (*id, *data.0, data.1.clone())))
+        .flat_map(|(id, hashmap)| hashmap.iter().map(|data| (*id, *data.0, *data.1)))
     {
         // ...but is now not being hovered by that same pointer...
         if !hover_map
@@ -403,7 +403,7 @@ pub fn send_click_and_drag_events(
                     down.target,
                     DragStart {
                         button,
-                        hit: down.hit.clone(),
+                        hit: down.hit,
                     },
                 ));
             }
@@ -520,11 +520,11 @@ pub fn send_drag_over_events(
                 )
             {
                 let drag_entry = drag_over_map.entry((pointer_id, button)).or_default();
-                drag_entry.insert(target, hit.clone());
+                drag_entry.insert(target, hit);
                 let event = DragEnter {
                     button,
                     dragged: *drag_target,
-                    hit: hit.clone(),
+                    hit,
                 };
                 pointer_drag_enter.send(Pointer::new(
                     pointer_id,
@@ -560,7 +560,7 @@ pub fn send_drag_over_events(
                     DragOver {
                         button,
                         dragged: *drag_target,
-                        hit: hit.clone(),
+                        hit,
                     },
                 ));
             }
@@ -589,7 +589,7 @@ pub fn send_drag_over_events(
                 DragLeave {
                     button,
                     dragged: target,
-                    hit: hit.clone(),
+                    hit,
                 },
             ));
             pointer_drop.send(Pointer::new(
@@ -599,7 +599,7 @@ pub fn send_drag_over_events(
                 Drop {
                     button,
                     dropped: target,
-                    hit: hit.clone(),
+                    hit,
                 },
             ));
         }
@@ -631,7 +631,7 @@ pub fn send_drag_over_events(
                     DragLeave {
                         button,
                         dragged: *drag_target,
-                        hit: hit.clone(),
+                        hit,
                     },
                 ));
             }

crates/bevy_picking_core/src/focus.rs

@@ -123,7 +123,7 @@ fn build_over_map(
         for (entity, pick_data) in entities_under_pointer.picks.iter() {
             let layer = entities_under_pointer.order;
             let hits = layer_map.entry(FloatOrd(layer)).or_insert_with(Vec::new);
-            hits.push((*entity, pick_data.clone()));
+            hits.push((*entity, *pick_data));
         }
     }
 
@@ -151,13 +151,13 @@ fn build_hover_map(
             for (entity, pick_data) in layer_map.values().rev().flatten() {
                 if let Ok(pickable) = pickable.get(*entity) {
                     if pickable.is_hoverable {
-                        pointer_entity_set.insert(*entity, pick_data.clone());
+                        pointer_entity_set.insert(*entity, *pick_data);
                     }
                     if pickable.should_block_lower {
                         break;
                     }
                 } else {
-                    pointer_entity_set.insert(*entity, pick_data.clone()); // Emit events by default
+                    pointer_entity_set.insert(*entity, *pick_data); // Emit events by default
                     break; // Entities block by default so we break out of the loop
                 }
             }
@@ -216,7 +216,10 @@ pub fn update_interactions(
     for (pointer, pointer_press, mut pointer_interaction) in &mut pointers {
         if let Some(pointers_hovered_entities) = hover_map.get(pointer) {
             // Insert a sorted list of hit entities into the pointer's interaction component.
-            let mut sorted_entities: Vec<_> = pointers_hovered_entities.clone().drain().collect();
+            let mut sorted_entities: Vec<_> = pointers_hovered_entities
+                .into_iter()
+                .map(|(entity, hitdata)| (*entity, *hitdata))
+                .collect();
             sorted_entities.sort_by_key(|(_entity, hit)| FloatOrd(hit.depth));
             pointer_interaction.sorted_entities = sorted_entities;