Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-22 17:33:33 +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

10
platform/javascript/os_javascript.cpp
View file

@ -299,13 +299,15 @@ bool OS_JavaScript::is_mouse_grab_enabled() const {
//*sigh* technology has evolved so much since i was a kid..
return false;
}
Point2 OS_JavaScript::get_mouse_pos() const {
return Point2();
return input->get_mouse_pos();
}
int OS_JavaScript::get_mouse_button_state() const {
return 0;
return last_button_mask;
}
void OS_JavaScript::set_window_title(const String& p_title) {
@ -427,6 +429,9 @@ void OS_JavaScript::push_input(const InputEvent& p_ev) {
if (ev.type==InputEvent::MOUSE_MOTION) {
input->set_mouse_pos(Point2(ev.mouse_motion.x, ev.mouse_motion.y));
}
else if (ev.type==InputEvent::MOUSE_BUTTON) {
last_button_mask = ev.mouse_button.button_mask;
}
input->parse_input_event(p_ev);
}
@ -765,6 +770,7 @@ OS_JavaScript::OS_JavaScript(GFXInitFunc p_gfx_init_func,void*p_gfx_init_ud, Get
gfx_init_func=p_gfx_init_func;
gfx_init_ud=p_gfx_init_ud;
last_button_mask=0;
main_loop=NULL;
last_id=1;
gl_extensions=NULL;