godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89112 from AThousandShips/wayland_tilt 

[Wayland] Fix tilt handling
This commit is contained in:
Rémi Verschelde 2024-03-04 13:34:31 +01:00
parent faafccbd34 9273106bb3
commit 790d051ff1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/linuxbsd/wayland/wayland_thread.cpp
View File

@ -2424,8 +2424,7 @@ void WaylandThread::_wp_tablet_tool_on_frame(void *data, struct zwp_tablet_tool_
// According to the tablet proto spec, tilt is expressed in degrees relative
// to the Z axis of the tablet, so it shouldn't go over 90 degrees either way,
// I think. We'll clamp it just in case.
td.tilt.x = CLAMP(td.tilt.x, -90, 90);
td.tilt.y = CLAMP(td.tilt.x, -90, 90);
td.tilt = td.tilt.clamp(Vector2(-90, -90), Vector2(90, 90));
mm->set_tilt(td.tilt / 90);

2
platform/linuxbsd/wayland/wayland_thread.h
View File

@ -308,7 +308,7 @@ public:
struct TabletToolData {
Point2i position;
Vector2i tilt;
Vector2 tilt;
uint32_t pressure = 0;
BitField<MouseButtonMask> pressed_button_mask;