Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose center position in MultiTouchInfo #5247

Merged
merged 2 commits into from
Oct 23, 2024
Merged

Expose center position in MultiTouchInfo #5247

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41abce8
Expose center position in MultiTouchInfo
lucasmerlin Jul 21, 2023
08187a1
Move below start_pos
lucasmerlin Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions crates/egui/src/input_state/touch_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ pub struct MultiTouchInfo {
/// Position of the pointer at the time the gesture started.
pub start_pos: Pos2,

/// Center position of the current gesture (average of all touch points).
pub center_pos: Pos2,

/// Number of touches (fingers) on the surface. Value is ≥ 2 since for a single touch no
/// [`MultiTouchInfo`] is created.
pub num_touches: usize,
Expand Down Expand Up @@ -203,6 +206,8 @@ impl TouchState {
PinchType::Proportional => Vec2::splat(zoom_delta),
};

let center_pos = state.current.avg_pos;

MultiTouchInfo {
start_time: state.start_time,
start_pos: state.start_pointer_pos,
Expand All @@ -212,6 +217,7 @@ impl TouchState {
rotation_delta: normalized_angle(state.current.heading - state_previous.heading),
translation_delta: state.current.avg_pos - state_previous.avg_pos,
force: state.current.avg_force,
center_pos,
}
})
}
Expand Down
Loading