Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-20 00:13:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some mouse bugs in WebAssembly/asm.js

Browse source 
- Emit mouse wheel release events
 - Set button masks, fixes #5092
This commit is contained in:
eska 2016-11-23 23:53:38 +01:00
parent a6ae3204fb
commit 30e9ea5a82
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
platform/javascript/javascript_main.cpp
View file

@ -66,11 +66,12 @@ static void _glut_mouse_button(int button, int state, int x, int y) {
if (ev.mouse_button.button_index<4) {
if (ev.mouse_button.pressed) {
_mouse_button_mask|=1<<ev.mouse_button.button_index;
_mouse_button_mask |= 1 << (ev.mouse_button.button_index-1);
} else {
_mouse_button_mask&=~(1<<ev.mouse_button.button_index);
_mouse_button_mask &= ~(1 << (ev.mouse_button.button_index-1));
}
}
ev.mouse_button.button_mask=_mouse_button_mask;
uint32_t m = glutGetModifiers();
ev.mouse_button.mod.alt=(m&GLUT_ACTIVE_ALT)!=0;
@ -79,6 +80,11 @@ static void _glut_mouse_button(int button, int state, int x, int y) {
os->push_input(ev);
if (ev.mouse_button.button_index==BUTTON_WHEEL_UP || ev.mouse_button.button_index==BUTTON_WHEEL_DOWN) {
// GLUT doesn't send release events for mouse wheel, so send manually
ev.mouse_button.pressed=false;
os->push_input(ev);
}
}
@ -162,7 +168,6 @@ int main(int argc, char *argv[]) {
glutMouseFunc(_glut_mouse_button);
glutMotionFunc(_glut_mouse_motion);
glutMotionFunc(_glut_mouse_motion);
glutPassiveMotionFunc(_glut_mouse_motion);