diff options
| author | Éloi Rivard <azmeuk@gmail.com> | 2013-03-27 14:29:57 +0100 |
|---|---|---|
| committer | Éloi Rivard <azmeuk@gmail.com> | 2013-04-04 11:17:36 +0200 |
| commit | 26a2095480bfbf51275671695c0ac8c1c995cc7f (patch) | |
| tree | bfbba8138f7713de06098e8f596b5d5d9e4c2b7a /src/library_glfw.js | |
| parent | f65172d9f2fc779b9b0207d8769a10d530a7a5b7 (diff) | |
* Fixed mouse position.
Diffstat (limited to 'src/library_glfw.js')
| -rw-r--r-- | src/library_glfw.js | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/library_glfw.js b/src/library_glfw.js index f0e96a0a..41fef63f 100644 --- a/src/library_glfw.js +++ b/src/library_glfw.js @@ -175,16 +175,18 @@ var LibraryGLFW = { return; GLFW.savePosition(event); - if(event.target == Module["canvas"] || status == 0){//GLFW_RELEASE - if(status == 1){//GLFW_PRESS - try { - event.target.setCapture(); - } catch (e) {} - } - event.preventDefault(); - //DOM and glfw have the same button codes - Runtime.dynCall('vii', GLFW.mouseButtonFunc, [event['button'], status]); - } + if(event.target != Module["canvas"]) + return; + + if(status == 1){//GLFW_PRESS + try { + event.target.setCapture(); + } catch (e) {} + } + + event.preventDefault(); + //DOM and glfw have the same button codes + Runtime.dynCall('vii', GLFW.mouseButtonFunc, [event['button'], status]); }, onMouseButtonDown: function(event){ @@ -427,7 +429,7 @@ var LibraryGLFW = { }, glfwGetMouseButton : function( button ) { - return GLFW.buttons & button; + return (GLFW.buttons & (1 << button)) > 0; }, glfwGetMousePos : function( xpos, ypos ) { |