Skip to content

Commit

Permalink
chore(update): remove let _ = and just ignore event sends
Browse files Browse the repository at this point in the history 
Authored-by: RobWalt <[email protected]>
  • Loading branch information
@RobWalt
RobWalt committed Feb 21, 2024
1 parent a9abb54 commit 0b6ec5c
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion backends/bevy_picking_egui/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ pub fn egui_picking(
if ctx.get_mut().wants_pointer_input() {
let entry = (entity, HitData::new(entity, 0.0, None, None));
let order = 1_000_000f32; // Assume egui should be on top of everything else.
let _ = output.send(PointerHits::new(*pointer, Vec::from([entry]), order));
output.send(PointerHits::new(*pointer, Vec::from([entry]), order));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion backends/bevy_picking_sprite/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,6 @@ pub fn sprite_picking(
.collect();

let order = camera.order as f32;
let _ = output.send(PointerHits::new(*pointer, picks, order));
output.send(PointerHits::new(*pointer, picks, order));
}
}
2 changes: 1 addition & 1 deletion backends/bevy_picking_ui/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,6 @@ pub fn ui_picking(
depth += 0.00001; // keep depth near 0 for precision
}
let order = camera.order as f32 + 0.5; // bevy ui can run on any camera, it's a special case
let _ = output.send(PointerHits::new(*pointer, picks, order));
output.send(PointerHits::new(*pointer, picks, order));
}
}
20 changes: 10 additions & 10 deletions crates/bevy_picking_core/src/events.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ pub fn pointer_events(
.iter()
.flat_map(|h| h.iter().map(|(entity, data)| (*entity, data.to_owned())))
{
let _ = pointer_move.send(Pointer::new(
pointer_move.send(Pointer::new(
pointer_id,
location.clone(),
hovered_entity,
Expand All @@ -255,7 +255,7 @@ pub fn pointer_events(
);
continue;
};
let _ = pointer_up.send(Pointer::new(
pointer_up.send(Pointer::new(
press_event.pointer_id,
location,
hovered_entity,
Expand All @@ -276,7 +276,7 @@ pub fn pointer_events(
);
continue;
};
let _ = pointer_down.send(Pointer::new(
pointer_down.send(Pointer::new(
press_event.pointer_id,
location,
hovered_entity,
Expand All @@ -301,7 +301,7 @@ pub fn pointer_events(
error!("Unable to get location for pointer {:?}", pointer_id);
continue;
};
let _ = pointer_over.send(Pointer::new(
pointer_over.send(Pointer::new(
pointer_id,
location,
hovered_entity,
Expand All @@ -325,7 +325,7 @@ pub fn pointer_events(
error!("Unable to get location for pointer {:?}", pointer_id);
continue;
};
let _ = pointer_out.send(Pointer::new(
pointer_out.send(Pointer::new(
pointer_id,
location,
hovered_entity,
Expand Down Expand Up @@ -397,7 +397,7 @@ pub fn send_click_and_drag_events(
latest_pos: down.pointer_location.position,
},
);
let _ = pointer_drag_start.send(Pointer::new(
pointer_drag_start.send(Pointer::new(
pointer_id,
down.pointer_location.clone(),
down.target,
Expand All @@ -415,7 +415,7 @@ pub fn send_click_and_drag_events(
delta: location.position - drag.latest_pos,
};
drag.latest_pos = location.position;
let _ = pointer_drag.send(Pointer::new(
pointer_drag.send(Pointer::new(
pointer_id,
location.clone(),
*dragged_entity,
Expand Down Expand Up @@ -526,7 +526,7 @@ pub fn send_drag_over_events(
dragged: *drag_target,
hit: hit.clone(),
};
let _ = pointer_drag_enter.send(Pointer::new(
pointer_drag_enter.send(Pointer::new(
pointer_id,
pointer_location.clone(),
target,
Expand All @@ -553,7 +553,7 @@ pub fn send_drag_over_events(
|&&drag_target| target != drag_target, /* can't drag over itself */
)
{
let _ = pointer_drag_over.send(Pointer::new(
pointer_drag_over.send(Pointer::new(
pointer_id,
pointer_location.clone(),
target,
Expand Down Expand Up @@ -624,7 +624,7 @@ pub fn send_drag_over_events(
continue;
};
for drag_target in drag_list.keys() {
let _ = pointer_drag_leave.send(Pointer::new(
pointer_drag_leave.send(Pointer::new(
pointer_id,
pointer_location.clone(),
target,
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_picking_input/src/mouse.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ pub fn mouse_pick_events(

match input.state {
ButtonState::Pressed => {
let _ = pointer_presses.send(InputPress::new_down(PointerId::Mouse, button));
pointer_presses.send(InputPress::new_down(PointerId::Mouse, button));
}
ButtonState::Released => {
let _ = pointer_presses.send(InputPress::new_up(PointerId::Mouse, button));
pointer_presses.send(InputPress::new_up(PointerId::Mouse, button));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_picking_input/src/touch.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ pub fn touch_pick_events(
TouchPhase::Ended | TouchPhase::Canceled => {
input_presses.send(InputPress::new_up(pointer, PointerButton::Primary));
location_cache.remove(&touch.id);
let _ = cancel_events.send(PointerCancel {
cancel_events.send(PointerCancel {
pointer_id: pointer,
});
}
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_picking_selection/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ pub fn send_selection_events(
for (entity, selection) in selectables.iter() {
let not_click_target = *target != entity;
if selection.is_selected && not_click_target {
let _ = deselections.send(Pointer::new(
deselections.send(Pointer::new(
*pointer_id,
pointer_location.to_owned(),
entity,
Expand Down Expand Up @@ -189,7 +189,7 @@ pub fn send_selection_events(
if !pointer_down_list.contains(&id) && !multiselect {
for (entity, selection) in selectables.iter() {
if selection.is_selected {
let _ = deselections.send(Pointer::new(id, location.clone(), entity, Deselect));
deselections.send(Pointer::new(id, location.clone(), entity, Deselect));
}
}
}
Expand All @@ -213,15 +213,15 @@ pub fn send_selection_events(
if multiselect {
match selection.is_selected {
true => {
let _ = deselections.send(Pointer::new(
deselections.send(Pointer::new(
*pointer_id,
pointer_location.to_owned(),
entity,
Deselect,
));
},
false => {
let _ = selections.send(Pointer::new(
selections.send(Pointer::new(
*pointer_id,
pointer_location.to_owned(),
entity,
Expand All @@ -230,7 +230,7 @@ pub fn send_selection_events(
},
};
} else if !selection.is_selected {
let _ = selections.send(Pointer::new(
selections.send(Pointer::new(
*pointer_id,
pointer_location.to_owned(),
entity,
Expand Down

0 comments on commit 0b6ec5c

Please sign in to comment.