handwriting: Add test for egui::Event handling
This commit is contained in:
@ -15,12 +15,13 @@ use disk_format::{DiskFormat, RawStroke, RawStrokeHeader, f16_le};
|
||||
use egui::{
|
||||
Color32, Event, Frame, Id, Mesh, PointerButton, Pos2, Rect, Sense, Shape, Stroke, Theme, Ui,
|
||||
Vec2,
|
||||
emath::{self, TSTransform},
|
||||
emath::{self, RectTransform, TSTransform},
|
||||
epaint::{TessellationOptions, Tessellator, Vertex},
|
||||
};
|
||||
use eyre::{Context, bail};
|
||||
use eyre::{OptionExt, eyre};
|
||||
use half::f16;
|
||||
use serde::Serialize;
|
||||
use zerocopy::{FromBytes, IntoBytes};
|
||||
|
||||
use crate::{custom_code_block::try_from_custom_code_block, rasterizer};
|
||||
@ -270,88 +271,12 @@ impl Handwriting {
|
||||
|
||||
// Process input events and turn them into strokes
|
||||
for event in events {
|
||||
let last_canvas_pos = self.e.current_stroke.last();
|
||||
|
||||
match event {
|
||||
Event::PointerMoved(new_position) => {
|
||||
let new_canvas_pos = from_screen * new_position;
|
||||
if let Some(&last_canvas_pos) = last_canvas_pos {
|
||||
if last_canvas_pos != new_canvas_pos {
|
||||
self.push_to_stroke(new_canvas_pos);
|
||||
response.mark_changed();
|
||||
}
|
||||
}
|
||||
let mut last_canvas_pos = self.e.current_stroke.last().copied();
|
||||
process_event(&mut last_canvas_pos, from_screen, &event, |tool_event| {
|
||||
if self.on_tool_event(tool_event) {
|
||||
hw_response.changed = true; // FIXME: ugly
|
||||
}
|
||||
|
||||
Event::MouseMoved(mut delta) => {
|
||||
if delta.length() == 0.0 {
|
||||
continue;
|
||||
}
|
||||
|
||||
// FIXME: pinenote: MouseMovement delta does *not* take into account screen
|
||||
// scaling and rotation, so unless you've scaling=1 and no rotation, the
|
||||
// MouseMoved values will be all wrong.
|
||||
if cfg!(feature = "pinenote") {
|
||||
delta /= 1.8;
|
||||
delta = -delta.rot90();
|
||||
}
|
||||
|
||||
if let Some(&last_canvas_pos) = last_canvas_pos {
|
||||
self.push_to_stroke(last_canvas_pos + delta);
|
||||
response.mark_changed();
|
||||
} else {
|
||||
println!("Got `MouseMoved`, but have no previous pos");
|
||||
}
|
||||
}
|
||||
|
||||
Event::PointerButton {
|
||||
pos,
|
||||
button,
|
||||
pressed,
|
||||
modifiers: _,
|
||||
} => match (button, pressed) {
|
||||
(PointerButton::Primary, true) => {
|
||||
if last_canvas_pos.is_none() {
|
||||
self.e.current_stroke.push(from_screen * pos);
|
||||
}
|
||||
}
|
||||
(PointerButton::Primary, false) => {
|
||||
if last_canvas_pos.is_some() {
|
||||
self.push_to_stroke(from_screen * pos);
|
||||
self.commit_current_line(hw_response);
|
||||
response.mark_changed();
|
||||
}
|
||||
|
||||
// Stop reading events.
|
||||
// TODO: In theory, we can get multiple press->draw->release series
|
||||
// in the same frame. Should handle this.
|
||||
break;
|
||||
}
|
||||
(_, _) => continue,
|
||||
},
|
||||
|
||||
// Stop drawing after pointer disappears or the window is unfocused
|
||||
// TODO: In theory, we can get multiple press->draw->release series
|
||||
// in the same frame. Should handle this.
|
||||
Event::PointerGone | Event::WindowFocused(false) => {
|
||||
if !self.e.current_stroke.is_empty() {
|
||||
self.commit_current_line(hw_response);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Event::WindowFocused(true)
|
||||
| Event::Copy
|
||||
| Event::Cut
|
||||
| Event::Paste(..)
|
||||
| Event::Text(..)
|
||||
| Event::Key { .. }
|
||||
| Event::Zoom(..)
|
||||
| Event::Ime(..)
|
||||
| Event::Touch { .. }
|
||||
| Event::MouseWheel { .. }
|
||||
| Event::Screenshot { .. } => continue,
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -587,6 +512,134 @@ impl Handwriting {
|
||||
|
||||
bytes.into_boxed_slice()
|
||||
}
|
||||
|
||||
/// Handle a [ToolEvent]. Returns true if a stroke was completed.
|
||||
fn on_tool_event(&mut self, tool_event: ToolEvent) -> bool {
|
||||
match tool_event {
|
||||
ToolEvent::Press { at } => {
|
||||
debug_assert!(self.e.current_stroke.is_empty());
|
||||
self.push_to_stroke(at);
|
||||
false
|
||||
}
|
||||
ToolEvent::Move { to } => {
|
||||
self.push_to_stroke(to);
|
||||
false
|
||||
}
|
||||
ToolEvent::Release => {
|
||||
debug_assert!(!self.e.current_stroke.is_empty());
|
||||
self.strokes.push(mem::take(&mut self.e.current_stroke));
|
||||
true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A simple event that can defines how a tool (e.g. the pen) is used on a [Handwriting].
|
||||
#[derive(Serialize)]
|
||||
enum ToolEvent {
|
||||
Press { at: Pos2 },
|
||||
Move { to: Pos2 },
|
||||
Release,
|
||||
}
|
||||
|
||||
/// Convert [egui::Event]s to [ToolEvent]s.
|
||||
fn process_event(
|
||||
last_canvas_pos: &mut Option<Pos2>,
|
||||
from_screen: RectTransform,
|
||||
event: &Event,
|
||||
mut on_tool_event: impl FnMut(ToolEvent),
|
||||
) {
|
||||
match event {
|
||||
&Event::PointerMoved(new_position) => {
|
||||
let new_canvas_pos = from_screen * new_position;
|
||||
if last_canvas_pos.is_some() && *last_canvas_pos != Some(new_canvas_pos) {
|
||||
//self.push_to_stroke(new_canvas_pos);
|
||||
//response.mark_changed();
|
||||
*last_canvas_pos = Some(new_canvas_pos);
|
||||
on_tool_event(ToolEvent::Move { to: new_canvas_pos });
|
||||
}
|
||||
}
|
||||
|
||||
&Event::MouseMoved(mut delta) => {
|
||||
if delta.length() == 0.0 {
|
||||
return;
|
||||
}
|
||||
|
||||
// FIXME: pinenote: MouseMovement delta does *not* take into account screen
|
||||
// scaling and rotation, so unless you've scaling=1 and no rotation, the
|
||||
// MouseMoved values will be all wrong.
|
||||
if cfg!(feature = "pinenote") {
|
||||
delta /= 1.8;
|
||||
delta = -delta.rot90();
|
||||
}
|
||||
|
||||
if let Some(pos) = last_canvas_pos {
|
||||
*pos += delta;
|
||||
on_tool_event(ToolEvent::Move { to: *pos });
|
||||
//self.push_to_stroke(last_canvas_pos + delta);
|
||||
//response.mark_changed();
|
||||
} else {
|
||||
println!("Got `MouseMoved`, but have no previous pos");
|
||||
}
|
||||
}
|
||||
|
||||
&Event::PointerButton {
|
||||
pos,
|
||||
button,
|
||||
pressed,
|
||||
modifiers: _,
|
||||
} => match (button, pressed) {
|
||||
(PointerButton::Primary, true) => {
|
||||
if last_canvas_pos.is_none() {
|
||||
let pos = from_screen * pos;
|
||||
*last_canvas_pos = Some(pos);
|
||||
//self.e.current_stroke.push(from_screen * pos);
|
||||
|
||||
on_tool_event(ToolEvent::Press { at: pos });
|
||||
}
|
||||
}
|
||||
(PointerButton::Primary, false) => {
|
||||
if last_canvas_pos.take().is_some() {
|
||||
let pos = from_screen * pos;
|
||||
on_tool_event(ToolEvent::Move { to: pos });
|
||||
on_tool_event(ToolEvent::Release {});
|
||||
//self.push_to_stroke(from_screen * pos);
|
||||
//self.commit_current_line(hw_response);
|
||||
//response.mark_changed();
|
||||
}
|
||||
|
||||
// Stop reading events.
|
||||
// TODO: In theory, we can get multiple press->draw->release series
|
||||
// in the same frame. Should handle this.
|
||||
//break;
|
||||
}
|
||||
(_, _) => {}
|
||||
},
|
||||
|
||||
// Stop drawing after pointer disappears or the window is unfocused
|
||||
// TODO: In theory, we can get multiple press->draw->release series
|
||||
// in the same frame. Should handle this.
|
||||
Event::PointerGone | Event::WindowFocused(false) => {
|
||||
//if !self.e.current_stroke.is_empty() {
|
||||
if last_canvas_pos.take().is_some() {
|
||||
on_tool_event(ToolEvent::Release {});
|
||||
//self.commit_current_line(hw_response);
|
||||
//break;
|
||||
}
|
||||
}
|
||||
|
||||
Event::WindowFocused(true)
|
||||
| Event::Copy
|
||||
| Event::Cut
|
||||
| Event::Paste(..)
|
||||
| Event::Text(..)
|
||||
| Event::Key { .. }
|
||||
| Event::Zoom(..)
|
||||
| Event::Ime(..)
|
||||
| Event::Touch { .. }
|
||||
| Event::MouseWheel { .. }
|
||||
| Event::Screenshot { .. } => {}
|
||||
}
|
||||
}
|
||||
|
||||
fn new_tessellator(pixels_per_point: f32) -> Tessellator {
|
||||
@ -732,7 +785,9 @@ fn mesh_triangles(mesh: &Mesh) -> impl Iterator<Item = [&Vertex; 3]> + Clone {
|
||||
mod test {
|
||||
use std::str::FromStr;
|
||||
|
||||
use super::Handwriting;
|
||||
use egui::{Event, Modifiers, PointerButton, Pos2, Rect, emath::RectTransform};
|
||||
|
||||
use super::{Handwriting, process_event};
|
||||
|
||||
#[test]
|
||||
fn serialize_handwriting() {
|
||||
@ -746,4 +801,194 @@ mod test {
|
||||
Handwriting::from_str(&serialized).expect("Handwriting must de/serialize correctly");
|
||||
insta::assert_debug_snapshot!("deserialized handwriting", deserialized.strokes);
|
||||
}
|
||||
|
||||
const TEST_EVENTS: &[Event] = &[
|
||||
Event::PointerMoved(Pos2::new(749.9, 225.6)),
|
||||
Event::PointerButton {
|
||||
pos: Pos2::new(749.9, 225.6),
|
||||
button: PointerButton::Primary,
|
||||
pressed: true,
|
||||
modifiers: Modifiers::NONE,
|
||||
},
|
||||
Event::PointerMoved(Pos2::new(749.9, 225.7)),
|
||||
Event::PointerMoved(Pos2::new(749.9, 226.4)),
|
||||
Event::PointerMoved(Pos2::new(750.2, 228.4)),
|
||||
Event::PointerMoved(Pos2::new(751.0, 231.3)),
|
||||
Event::PointerMoved(Pos2::new(752.6, 234.4)),
|
||||
Event::PointerMoved(Pos2::new(754.1, 237.7)),
|
||||
Event::PointerMoved(Pos2::new(755.8, 241.1)),
|
||||
Event::PointerMoved(Pos2::new(757.7, 244.4)),
|
||||
Event::PointerMoved(Pos2::new(759.3, 247.4)),
|
||||
Event::PointerMoved(Pos2::new(760.8, 250.2)),
|
||||
Event::PointerMoved(Pos2::new(762.8, 253.4)),
|
||||
Event::PointerMoved(Pos2::new(765.1, 256.8)),
|
||||
Event::PointerMoved(Pos2::new(767.7, 260.2)),
|
||||
Event::PointerMoved(Pos2::new(771.2, 264.3)),
|
||||
Event::PointerMoved(Pos2::new(774.6, 267.9)),
|
||||
Event::PointerMoved(Pos2::new(778.2, 271.2)),
|
||||
Event::PointerMoved(Pos2::new(782.7, 275.2)),
|
||||
Event::PointerMoved(Pos2::new(786.7, 278.5)),
|
||||
Event::PointerMoved(Pos2::new(790.4, 280.8)),
|
||||
Event::PointerMoved(Pos2::new(794.1, 282.6)),
|
||||
Event::PointerMoved(Pos2::new(797.9, 283.9)),
|
||||
Event::PointerMoved(Pos2::new(801.9, 284.8)),
|
||||
Event::PointerMoved(Pos2::new(805.9, 285.5)),
|
||||
Event::PointerMoved(Pos2::new(810.2, 285.8)),
|
||||
Event::PointerMoved(Pos2::new(814.5, 285.8)),
|
||||
Event::PointerMoved(Pos2::new(818.2, 285.6)),
|
||||
Event::PointerMoved(Pos2::new(821.6, 284.5)),
|
||||
Event::PointerMoved(Pos2::new(824.7, 283.0)),
|
||||
Event::PointerMoved(Pos2::new(827.5, 281.4)),
|
||||
Event::PointerMoved(Pos2::new(830.4, 279.6)),
|
||||
Event::PointerMoved(Pos2::new(833.4, 277.7)),
|
||||
Event::PointerMoved(Pos2::new(836.1, 275.7)),
|
||||
Event::PointerMoved(Pos2::new(838.6, 273.6)),
|
||||
Event::PointerMoved(Pos2::new(840.9, 271.7)),
|
||||
Event::PointerMoved(Pos2::new(843.0, 269.6)),
|
||||
Event::PointerMoved(Pos2::new(845.4, 267.2)),
|
||||
Event::PointerMoved(Pos2::new(847.7, 265.1)),
|
||||
Event::PointerMoved(Pos2::new(849.8, 262.7)),
|
||||
Event::PointerMoved(Pos2::new(852.0, 260.0)),
|
||||
Event::PointerMoved(Pos2::new(854.3, 256.8)),
|
||||
Event::PointerMoved(Pos2::new(856.3, 253.4)),
|
||||
Event::PointerMoved(Pos2::new(858.2, 250.1)),
|
||||
Event::PointerMoved(Pos2::new(860.0, 247.1)),
|
||||
Event::PointerMoved(Pos2::new(861.5, 244.3)),
|
||||
Event::PointerMoved(Pos2::new(862.8, 242.0)),
|
||||
Event::PointerMoved(Pos2::new(864.1, 240.1)),
|
||||
Event::PointerMoved(Pos2::new(865.0, 238.2)),
|
||||
Event::PointerMoved(Pos2::new(865.8, 236.6)),
|
||||
Event::PointerMoved(Pos2::new(866.5, 234.9)),
|
||||
Event::PointerMoved(Pos2::new(867.1, 233.1)),
|
||||
Event::PointerMoved(Pos2::new(867.8, 231.4)),
|
||||
Event::PointerMoved(Pos2::new(868.4, 229.8)),
|
||||
Event::PointerMoved(Pos2::new(868.7, 228.4)),
|
||||
Event::PointerMoved(Pos2::new(868.9, 227.2)),
|
||||
Event::PointerMoved(Pos2::new(869.1, 226.2)),
|
||||
Event::PointerMoved(Pos2::new(869.1, 225.1)),
|
||||
Event::PointerMoved(Pos2::new(869.1, 224.1)),
|
||||
Event::PointerMoved(Pos2::new(869.1, 223.4)),
|
||||
Event::PointerMoved(Pos2::new(869.1, 222.8)),
|
||||
Event::PointerMoved(Pos2::new(869.1, 222.4)),
|
||||
Event::PointerMoved(Pos2::new(869.1, 222.4)),
|
||||
// Event::PointerButton {
|
||||
// pos: Pos2::new(869.1, 222.4),
|
||||
// button: PointerButton::Primary,
|
||||
// pressed: false,
|
||||
// modifiers: Modifiers::NONE,
|
||||
// },
|
||||
Event::PointerGone,
|
||||
Event::PointerMoved(Pos2::new(779.3, 158.6)),
|
||||
// --
|
||||
// FIXME: This line looks weird. Probably because of a bug in the rasterizer when the X-coord is all the same.
|
||||
Event::PointerButton {
|
||||
pos: Pos2::new(779.3, 158.6),
|
||||
button: PointerButton::Primary,
|
||||
pressed: true,
|
||||
modifiers: Modifiers::NONE,
|
||||
},
|
||||
Event::PointerMoved(Pos2::new(779.3, 159.0)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 160.9)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 164.6)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 169.6)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 175.2)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 180.3)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 185.0)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 189.4)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 192.8)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 194.9)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 196.1)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 197.0)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 197.6)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 198.1)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 198.5)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 198.8)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 199.0)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 199.2)),
|
||||
Event::PointerMoved(Pos2::new(779.3, 199.2)),
|
||||
Event::PointerButton {
|
||||
pos: Pos2::new(779.3, 199.2),
|
||||
button: PointerButton::Primary,
|
||||
pressed: false,
|
||||
modifiers: Modifiers::NONE,
|
||||
},
|
||||
// --
|
||||
Event::PointerMoved(Pos2::new(841.5, 159.2)),
|
||||
Event::PointerButton {
|
||||
pos: Pos2::new(841.5, 159.2),
|
||||
button: PointerButton::Primary,
|
||||
pressed: true,
|
||||
modifiers: Modifiers::NONE,
|
||||
},
|
||||
Event::PointerMoved(Pos2::new(841.5, 159.3)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 159.7)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 160.5)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 162.4)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 165.1)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 168.4)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 171.6)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 174.4)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 177.1)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 179.3)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 180.9)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 182.4)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 183.5)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 184.5)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 185.6)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 187.0)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 188.6)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 190.3)),
|
||||
Event::PointerMoved(Pos2::new(841.5, 191.8)),
|
||||
Event::PointerMoved(Pos2::new(841.3, 192.7)),
|
||||
Event::PointerMoved(Pos2::new(841.0, 193.3)),
|
||||
Event::PointerMoved(Pos2::new(841.0, 193.7)),
|
||||
Event::PointerMoved(Pos2::new(841.1, 193.9)),
|
||||
Event::PointerMoved(Pos2::new(841.3, 193.9)),
|
||||
Event::PointerMoved(Pos2::new(841.4, 194.0)),
|
||||
Event::PointerMoved(Pos2::new(841.4, 194.2)),
|
||||
Event::PointerMoved(Pos2::new(841.4, 194.6)),
|
||||
Event::PointerMoved(Pos2::new(841.4, 194.9)),
|
||||
Event::PointerMoved(Pos2::new(841.4, 195.1)),
|
||||
Event::PointerMoved(Pos2::new(841.4, 195.1)),
|
||||
Event::PointerButton {
|
||||
pos: Pos2::new(841.4, 195.1),
|
||||
button: PointerButton::Primary,
|
||||
pressed: false,
|
||||
modifiers: Modifiers::NONE,
|
||||
},
|
||||
];
|
||||
|
||||
fn from_screen() -> RectTransform {
|
||||
RectTransform::from_to(
|
||||
Rect::from_two_pos(Pos2::new(570.0, 145.1), Pos2::new(1116.4, 245.1)),
|
||||
Rect::from_two_pos(Pos2::new(0.0, 0.0), Pos2::new(546.4, 100.0)),
|
||||
)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn handle_input() {
|
||||
let mut tool_events = vec![];
|
||||
let mut last_pos = None;
|
||||
let from_screen = from_screen();
|
||||
for event in TEST_EVENTS {
|
||||
process_event(&mut last_pos, from_screen, event, |tool_event| {
|
||||
tool_events.push(tool_event)
|
||||
});
|
||||
}
|
||||
insta::assert_yaml_snapshot!(tool_events);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn input_to_handwriting() {
|
||||
let mut handwriting = Handwriting::default();
|
||||
let mut last_pos = None;
|
||||
let from_screen = from_screen();
|
||||
for event in TEST_EVENTS {
|
||||
process_event(&mut last_pos, from_screen, event, |tool_event| {
|
||||
handwriting.on_tool_event(tool_event);
|
||||
});
|
||||
}
|
||||
let serialized = handwriting.to_string();
|
||||
insta::assert_snapshot!("input events to handwriting", serialized);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user