diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-12-02 08:56:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-02 08:56:53 +0100 |
| commit | fb932d0f504c1c0c74202424030904ba20a99854 (patch) | |
| tree | aaa009ec3e0d36c4858194956a297450f43fa057 /platform/javascript/javascript_main.cpp | |
| parent | d311a39c19839da57b3e079735308b337291244a (diff) | |
| parent | 3e1b437315778a99db669c28277352d7a4e86f36 (diff) | |
| download | redot-engine-fb932d0f504c1c0c74202424030904ba20a99854.tar.gz | |
Merge pull request #7217 from eska014/js-os
Work on asm.js and WebAssembly platforms
Diffstat (limited to 'platform/javascript/javascript_main.cpp')
| -rw-r--r-- | platform/javascript/javascript_main.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp index d9342cfe10..586ccc9b4e 100644 --- a/platform/javascript/javascript_main.cpp +++ b/platform/javascript/javascript_main.cpp @@ -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); + } } @@ -148,7 +154,7 @@ int main(int argc, char *argv[]) { /* Initialize the window */ printf("let it go!\n"); glutInit(&argc, argv); - os = new OS_JavaScript(_gfx_init,NULL,NULL,NULL,NULL); + os = new OS_JavaScript(_gfx_init,NULL,NULL); #if 0 char *args[]={"-test","gui","-v",NULL}; Error err = Main::setup("apk",3,args); @@ -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); |