aboutsummaryrefslogtreecommitdiff
path: root/src/library_glfw.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/library_glfw.js')
-rw-r--r--src/library_glfw.js10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/library_glfw.js b/src/library_glfw.js
index 17e8956a..e5782900 100644
--- a/src/library_glfw.js
+++ b/src/library_glfw.js
@@ -51,7 +51,7 @@ var LibraryGLFW = {
DOMToGLFWKeyCode: function(keycode) {
switch (keycode) {
case 0x09: return 295 ; //DOM_VK_TAB -> GLFW_KEY_TAB
- case 0x1B: return 255 ; //DOM_VK_ESCAPE -> GLFW_KEY_ESC
+ case 0x1B: return 257 ; //DOM_VK_ESCAPE -> GLFW_KEY_ESC
case 0x6A: return 313 ; //DOM_VK_MULTIPLY -> GLFW_KEY_KP_MULTIPLY
case 0x6B: return 315 ; //DOM_VK_ADD -> GLFW_KEY_KP_ADD
case 0x6D: return 314 ; //DOM_VK_SUBTRACT -> GLFW_KEY_KP_SUBTRACT
@@ -197,13 +197,7 @@ var LibraryGLFW = {
},
onMouseWheel: function(event) {
- if (event.detail > 0) {
- GLFW.wheelPos++;
- }
-
- if (event.detail < 0) {
- GLFW.wheelPos--;
- }
+ GLFW.wheelPos += Browser.getMouseWheelDelta(event);
if (GLFW.mouseWheelFunc && event.target == Module["canvas"]) {
Runtime.dynCall('vi', GLFW.mouseWheelFunc, [GLFW.wheelPos]);