Merge pull request #346 from behdad/outgoing

Misc fixes

2 files changed, 53 insertions, 19 deletions

diff --git a/src/library_gl.js b/src/library_gl.js
index 414520e0..d99d59ec 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -223,7 +223,7 @@ var LibraryGL = {
         case 0x8033 /* GL_UNSIGNED_SHORT_4_4_4_4 */:
         case 0x8034 /* GL_UNSIGNED_SHORT_5_5_5_1 */:
           sizePerPixel = 2;
-          pixels = new Uint16Array(new ArrayBuffer(Array_copy(pixels, width*height*sizePerPixel*2)));
+          pixels = new Uint16Array(new ArrayBuffer(Array_copy(pixels, width*height*sizePerPixel)));
           break;
         default:
           throw 'Invalid type (' + type + ') passed to glTexImage2D';
@@ -256,13 +256,13 @@ var LibraryGL = {
             default:
               throw 'Invalid format (' + format + ') passed to glTexSubImage2D';
           }
-          pixels = new Uint8Array(Array_copy(pixels, (width-xoffset+1)*(height-yoffset+1)*sizePerPixel));
+          pixels = new Uint8Array(Array_copy(pixels, width*height*sizePerPixel));
           break;
         case 0x8363 /* GL_UNSIGNED_SHORT_5_6_5 */:
         case 0x8033 /* GL_UNSIGNED_SHORT_4_4_4_4 */:
         case 0x8034 /* GL_UNSIGNED_SHORT_5_5_5_1 */:
           sizePerPixel = 2;
-          pixels = new Uint16Array(new ArrayBuffer(Array_copy(pixels, (width-xoffset+1)*(height-yoffset+1)*sizePerPixel*2)));
+          pixels = new Uint16Array(new ArrayBuffer(Array_copy(pixels, width*height*sizePerPixel)));
           break;
         default:
           throw 'Invalid type (' + type + ') passed to glTexSubImage2D';
@@ -682,10 +682,10 @@ var LibraryGL = {
 
 // Simple pass-through functions
 [[0, 'shadeModel fogi fogfv getError finish flush'],
- [1, 'clearDepth depthFunc enable disable frontFace cullFace clear enableVertexAttribArray disableVertexAttribArray lineWidth clearStencil depthMask stencilMask stencilMaskSeparate checkFramebufferStatus generateMipmap activeTexture'],
- [2, 'pixelStorei'],
+ [1, 'clearDepth depthFunc enable disable frontFace cullFace clear enableVertexAttribArray disableVertexAttribArray lineWidth clearStencil depthMask stencilMask stencilMaskSeparate checkFramebufferStatus generateMipmap activeTexture blendEquation'],
+ [2, 'pixelStorei blendFunc blendEquationSeparate'],
  [3, 'texParameteri texParameterf drawArrays vertexAttrib2f'],
- [4, 'viewport clearColor scissor vertexAttrib3f colorMask drawElements renderbufferStorage'],
+ [4, 'viewport clearColor scissor vertexAttrib3f colorMask drawElements renderbufferStorage blendFuncSeparate'],
  [5, 'vertexAttrib4f'],
  [6, 'vertexAttribPointer'],
  [8, 'copyTexImage2D copyTexSubImage2D']].forEach(function(data) {
diff --git a/src/library_glut.js b/src/library_glut.js
index 0736d5ae..84d800a9 100644
--- a/src/library_glut.js
+++ b/src/library_glut.js
@@ -16,6 +16,12 @@ var LibraryGLUT = {
     buttons: 0,
     modifiers: 0,
 
+    savePosition: function(event) {
+      /* TODO maybe loop here ala http://www.quirksmode.org/js/findpos.html */
+      GLUT.lastX = event['clientX'] - Module['canvas'].offsetLeft;
+      GLUT.lastY = event['clientY'] - Module['canvas'].offsetTop;
+    },
+
     saveModifiers: function(event) {
       GLUT.modifiers = 0;
       if (event['shiftKey'])
@@ -27,8 +33,7 @@ var LibraryGLUT = {
     },
 
     onMousemove: function(event) {
-      GLUT.lastX = event['clientX'];
-      GLUT.lastY = event['clientY'];
+      GLUT.savePosition(event);
       if (GLUT.buttons == 0 && GLUT.passiveMotionFunc) {
         event.preventDefault();
         GLUT.saveModifiers(event);
@@ -68,9 +73,40 @@ var LibraryGLUT = {
         return key;
     },
 
-    getASCIIKey: function(keycode) {
-      // TODO apply modifiers, etc
-      return keycode;
+    getASCIIKey: function(event) {
+      var keycode = event['keyCode'];
+
+      /* The exact list is soooo hard to find in a canonical place! */
+
+      if (48 <= keycode && keycode <= 57)
+        return keycode; // numeric  TODO handle shift?
+      if (65 <= keycode && keycode <= 90)
+	return event['shiftKey'] ? keycode : keycode + 32;
+      if (106 <= keycode && keycode <= 111)
+	return keycode - 106 + 42; // *,+-./  TODO handle shift?
+
+      switch (keycode) {
+        case 27: // escape
+        case 32: // space
+        case 61: // equal
+          return keycode;
+      }
+
+      var s = event['shiftKey'];
+      switch (keycode) {
+        case 186: return s ? 58 : 59; // colon / semi-colon
+        case 187: return s ? 43 : 61; // add / equal (these two may be wrong)
+        case 188: return s ? 60 : 44; // less-than / comma
+        case 189: return s ? 95 : 45; // dash
+        case 190: return s ? 62 : 46; // greater-than / period
+        case 191: return s ? 63 : 47; // forward slash
+        case 219: return s ? 123 : 91; // open bracket
+        case 220: return s ? 124 : 47; // back slash
+        case 221: return s ? 125 : 93; // close braket
+        case 222: return s ? 34 : 39; // single quote
+      }
+
+      return null;
     },
 
     onKeydown: function(event) {
@@ -85,11 +121,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,19 +143,18 @@ 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);
           }
         }
       }
     },
 
     onMouseButtonDown: function(event){
-      GLUT.lastX = event['clientX'];
-      GLUT.lastY = event['clientY'];
+      GLUT.savePosition(event);
       GLUT.buttons |= (1 << event['button']);
 
       if(GLUT.mouseFunc){
@@ -130,8 +165,7 @@ var LibraryGLUT = {
     },
 
     onMouseButtonUp: function(event){
-      GLUT.lastX = event['clientX'];
-      GLUT.lastY = event['clientY'];
+      GLUT.savePosition(event);
       GLUT.buttons &= ~(1 << event['button']);
 
       if(GLUT.mouseFunc) {