aboutsummaryrefslogtreecommitdiff
path: root/src/library_glut.js
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2012-04-04 00:56:53 -0400
committerBehdad Esfahbod <behdad@behdad.org>2012-04-04 01:11:06 -0400
commitc2611d1d61cf4da9da714b90ffe27c2ac7b4aa9a (patch)
treeafff7a75e0d767ed88eb443982c31229917fb119 /src/library_glut.js
parent03033b2fee5d0cc34fef6d4c1a542d0711ce95b9 (diff)
Minor refactoring keyboardFunc and keyboardUpFunc
Diffstat (limited to 'src/library_glut.js')
-rw-r--r--src/library_glut.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/library_glut.js b/src/library_glut.js
index 0736d5ae..d5608ee8 100644
--- a/src/library_glut.js
+++ b/src/library_glut.js
@@ -68,9 +68,9 @@ var LibraryGLUT = {
return key;
},
- getASCIIKey: function(keycode) {
+ getASCIIKey: function(event) {
// TODO apply modifiers, etc
- return keycode;
+ return event['keyCode'];
},
onKeydown: function(event) {
@@ -85,11 +85,11 @@ var LibraryGLUT = {
}
else
{
- key = GLUT.getASCIIKey(event['keyCode']);
+ key = GLUT.getASCIIKey(event);
if( key !== null && GLUT.keyboardFunc ) {
event.preventDefault();
GLUT.saveModifiers(event);
- FUNCTION_TABLE[GLUT.keyboardFunc](event['keyCode'], GLUT.lastX, GLUT.lastY);
+ FUNCTION_TABLE[GLUT.keyboardFunc](key, GLUT.lastX, GLUT.lastY);
}
}
}
@@ -107,11 +107,11 @@ var LibraryGLUT = {
}
else
{
- key = GLUT.getASCIIKey(event['keyCode']);
+ key = GLUT.getASCIIKey(event);
if( key !== null && GLUT.keyboardUpFunc ) {
event.preventDefault ();
GLUT.saveModifiers(event);
- FUNCTION_TABLE[GLUT.keyboardUpFunc](event['keyCode'], GLUT.lastX, GLUT.lastY);
+ FUNCTION_TABLE[GLUT.keyboardUpFunc](key, GLUT.lastX, GLUT.lastY);
}
}
}