webruby 0.2.2 → 0.2.4

data/modules/emscripten/src/library_browser.js

@@ -4,12 +4,12 @@
 
 mergeInto(LibraryManager.library, {
   $Browser__deps: ['$PATH'],
-  $Browser__postset: 'Module["requestFullScreen"] = function(lockPointer, resizeCanvas) { Browser.requestFullScreen(lockPointer, resizeCanvas) };\n' + // exports
-                     'Module["requestAnimationFrame"] = function(func) { Browser.requestAnimationFrame(func) };\n' +
-                     'Module["setCanvasSize"] = function(width, height, noUpdates) { Browser.setCanvasSize(width, height, noUpdates) };\n' +
-                     'Module["pauseMainLoop"] = function() { Browser.mainLoop.pause() };\n' +
-                     'Module["resumeMainLoop"] = function() { Browser.mainLoop.resume() };\n' +
-                     'Module["getUserMedia"] = function() { Browser.getUserMedia() }',
+  $Browser__postset: 'Module["requestFullScreen"] = function Module_requestFullScreen(lockPointer, resizeCanvas) { Browser.requestFullScreen(lockPointer, resizeCanvas) };\n' + // exports
+                     'Module["requestAnimationFrame"] = function Module_requestAnimationFrame(func) { Browser.requestAnimationFrame(func) };\n' +
+                     'Module["setCanvasSize"] = function Module_setCanvasSize(width, height, noUpdates) { Browser.setCanvasSize(width, height, noUpdates) };\n' +
+                     'Module["pauseMainLoop"] = function Module_pauseMainLoop() { Browser.mainLoop.pause() };\n' +
+                     'Module["resumeMainLoop"] = function Module_resumeMainLoop() { Browser.mainLoop.resume() };\n' +
+                     'Module["getUserMedia"] = function Module_getUserMedia() { Browser.getUserMedia() }',
   $Browser: {
     mainLoop: {
       scheduler: null,
@@ -77,10 +77,10 @@ mergeInto(LibraryManager.library, {
       // might create some side data structure for use later (like an Image element, etc.).
 
       var imagePlugin = {};
-      imagePlugin['canHandle'] = function(name) {
+      imagePlugin['canHandle'] = function imagePlugin_canHandle(name) {
         return !Module.noImageDecoding && /\.(jpg|jpeg|png|bmp)$/i.test(name);
       };
-      imagePlugin['handle'] = function(byteArray, name, onload, onerror) {
+      imagePlugin['handle'] = function imagePlugin_handle(byteArray, name, onload, onerror) {
         var b = null;
         if (Browser.hasBlobConstructor) {
           try {
@@ -103,7 +103,7 @@ mergeInto(LibraryManager.library, {
         assert(typeof url == 'string', 'createObjectURL must return a url as a string');
 #endif
         var img = new Image();
-        img.onload = function() {
+        img.onload = function img_onload() {
           assert(img.complete, 'Image ' + name + ' could not be decoded');
           var canvas = document.createElement('canvas');
           canvas.width = img.width;
@@ -114,7 +114,7 @@ mergeInto(LibraryManager.library, {
           Browser.URLObject.revokeObjectURL(url);
           if (onload) onload(byteArray);
         };
-        img.onerror = function(event) {
+        img.onerror = function img_onerror(event) {
           console.log('Image ' + url + ' could not be decoded');
           if (onerror) onerror();
         };
@@ -123,10 +123,10 @@ mergeInto(LibraryManager.library, {
       Module['preloadPlugins'].push(imagePlugin);
 
       var audioPlugin = {};
-      audioPlugin['canHandle'] = function(name) {
+      audioPlugin['canHandle'] = function audioPlugin_canHandle(name) {
         return !Module.noAudioDecoding && name.substr(-4) in { '.ogg': 1, '.wav': 1, '.mp3': 1 };
       };
-      audioPlugin['handle'] = function(byteArray, name, onload, onerror) {
+      audioPlugin['handle'] = function audioPlugin_handle(byteArray, name, onload, onerror) {
         var done = false;
         function finish(audio) {
           if (done) return;
@@ -152,7 +152,7 @@ mergeInto(LibraryManager.library, {
 #endif
           var audio = new Audio();
           audio.addEventListener('canplaythrough', function() { finish(audio) }, false); // use addEventListener due to chromium bug 124926
-          audio.onerror = function(event) {
+          audio.onerror = function audio_onerror(event) {
             if (done) return;
             console.log('warning: browser could not fully decode audio ' + name + ', trying slower base64 approach');
             function encode64(data) {
@@ -250,13 +250,24 @@ mergeInto(LibraryManager.library, {
           contextAttributes.preserveDrawingBuffer = true;
 #endif
 
-          ctx = canvas.getContext('experimental-webgl', contextAttributes);
+          var errorInfo = '?';
+          function onContextCreationError(event) {
+            errorInfo = event.statusMessage || errorInfo;
+          }
+          canvas.addEventListener('webglcontextcreationerror', onContextCreationError, false);
+          try {
+            ['experimental-webgl', 'webgl'].some(function(webglId) {
+              return ctx = canvas.getContext(webglId, contextAttributes);
+            });
+          } finally {
+            canvas.removeEventListener('webglcontextcreationerror', onContextCreationError, false);
+          }
         } else {
           ctx = canvas.getContext('2d');
         }
         if (!ctx) throw ':(';
       } catch (e) {
-        Module.print('Could not create canvas - ' + e);
+        Module.print('Could not create canvas: ' + [errorInfo, e]);
         return null;
       }
       if (useWebGL) {
@@ -268,7 +279,7 @@ mergeInto(LibraryManager.library, {
           (function(prop) {
             switch (typeof tempCtx[prop]) {
               case 'function': {
-                wrapper[prop] = function() {
+                wrapper[prop] = function gl_wrapper() {
                   if (GL.debug) {
                     var printArgs = Array.prototype.slice.call(arguments).map(Runtime.prettyPrint);
                     Module.printErr('[gl_f:' + prop + ':' + printArgs + ']');
@@ -359,16 +370,20 @@ mergeInto(LibraryManager.library, {
       canvas.requestFullScreen();
     },
 
-    requestAnimationFrame: function(func) {
-      if (!window.requestAnimationFrame) {
-        window.requestAnimationFrame = window['requestAnimationFrame'] ||
-                                       window['mozRequestAnimationFrame'] ||
-                                       window['webkitRequestAnimationFrame'] ||
-                                       window['msRequestAnimationFrame'] ||
-                                       window['oRequestAnimationFrame'] ||
-                                       window['setTimeout'];
+    requestAnimationFrame: function requestAnimationFrame(func) {
+      if (typeof window === 'undefined') { // Provide fallback to setTimeout if window is undefined (e.g. in Node.js)
+        setTimeout(func, 1000/60);
+      } else {
+        if (!window.requestAnimationFrame) {
+          window.requestAnimationFrame = window['requestAnimationFrame'] ||
+                                         window['mozRequestAnimationFrame'] ||
+                                         window['webkitRequestAnimationFrame'] ||
+                                         window['msRequestAnimationFrame'] ||
+                                         window['oRequestAnimationFrame'] ||
+                                         window['setTimeout'];
+        }
+        window.requestAnimationFrame(func);
       }
-      window.requestAnimationFrame(func);
     },
 
     // generic abort-aware wrapper for an async callback
@@ -497,7 +512,7 @@ mergeInto(LibraryManager.library, {
       var xhr = new XMLHttpRequest();
       xhr.open('GET', url, true);
       xhr.responseType = 'arraybuffer';
-      xhr.onload = function() {
+      xhr.onload = function xhr_onload() {
         if (xhr.status == 200 || (xhr.status == 0 && xhr.response)) { // file URLs can return 0
           onload(xhr.response);
         } else {
@@ -610,7 +625,7 @@ mergeInto(LibraryManager.library, {
     http.responseType = 'arraybuffer';
 
     // LOAD
-    http.onload = function(e) {
+    http.onload = function http_onload(e) {
       if (http.status == 200) {
         FS.createDataFile( _file.substr(0, index), _file.substr(index + 1), new Uint8Array(http.response), true, true);
         if (onload) Runtime.dynCall('vii', onload, [arg, file]);
@@ -620,12 +635,12 @@ mergeInto(LibraryManager.library, {
     };
 
     // ERROR
-    http.onerror = function(e) {
+    http.onerror = function http_onerror(e) {
       if (onerror) Runtime.dynCall('vii', onerror, [arg, http.status]);
     };
 
     // PROGRESS
-    http.onprogress = function(e) {
+    http.onprogress = function http_onprogress(e) {
       var percentComplete = (e.position / e.totalSize)*100;
       if (onprogress) Runtime.dynCall('vii', onprogress, [arg, percentComplete]);
     };
@@ -705,7 +720,7 @@ mergeInto(LibraryManager.library, {
 
     assert(runDependencies === 0, 'async_load_script must be run when no other dependencies are active');
     var script = document.createElement('script');
-    script.onload = function() {
+    script.onload = function script_onload() {
       if (runDependencies > 0) {
         dependenciesFulfilled = onload;
       } else {
@@ -720,7 +735,7 @@ mergeInto(LibraryManager.library, {
   emscripten_set_main_loop: function(func, fps, simulateInfiniteLoop) {
     Module['noExitRuntime'] = true;
 
-    Browser.mainLoop.runner = function() {
+    Browser.mainLoop.runner = function Browser_mainLoop_runner() {
       if (ABORT) return;
       if (Browser.mainLoop.queue.length > 0) {
         var start = Date.now();
@@ -777,11 +792,11 @@ mergeInto(LibraryManager.library, {
       Browser.mainLoop.scheduler();
     }
     if (fps && fps > 0) {
-      Browser.mainLoop.scheduler = function() {
+      Browser.mainLoop.scheduler = function Browser_mainLoop_scheduler() {
         setTimeout(Browser.mainLoop.runner, 1000/fps); // doing this each time means that on exception, we stop
       }
     } else {
-      Browser.mainLoop.scheduler = function() {
+      Browser.mainLoop.scheduler = function Browser_mainLoop_scheduler() {
         Browser.requestAnimationFrame(Browser.mainLoop.runner);
       }
     }
@@ -848,7 +863,7 @@ mergeInto(LibraryManager.library, {
     var styleSheet = document.styleSheets[0];
     var rules = styleSheet.cssRules;
     for (var i = 0; i < rules.length; i++) {
-      if (rules[i].cssText.substr(0, 5) == 'canvas') {
+      if (rules[i].cssText.substr(0, 6) == 'canvas') {
         styleSheet.deleteRule(i);
         i--;
       }
@@ -867,24 +882,6 @@ mergeInto(LibraryManager.library, {
     {{{ makeSetValue('isFullscreen', '0', 'Browser.isFullScreen ? 1 : 0', 'i32') }}};
   },
 
-  emscripten_get_now: function() {
-    if (!_emscripten_get_now.actual) {
-      if (ENVIRONMENT_IS_NODE) {
-          _emscripten_get_now.actual = function() {
-            var t = process['hrtime']();
-            return t[0] * 1e3 + t[1] / 1e6;
-          }
-      } else if (typeof dateNow !== 'undefined') {
-        _emscripten_get_now.actual = dateNow;
-      } else if (ENVIRONMENT_IS_WEB && window['performance'] && window['performance']['now']) {
-        _emscripten_get_now.actual = function() { return window['performance']['now'](); };
-      } else {
-        _emscripten_get_now.actual = Date.now;
-      }
-    }
-    return _emscripten_get_now.actual();
-  },
-
   emscripten_create_worker: function(url) {
     url = Pointer_stringify(url);
     var id = Browser.workers.length;
@@ -895,7 +892,7 @@ mergeInto(LibraryManager.library, {
       buffer: 0,
       bufferSize: 0
     };
-    info.worker.onmessage = function(msg) {
+    info.worker.onmessage = function info_worker_onmessage(msg) {
       var info = Browser.workers[id];
       if (!info) return; // worker was destroyed meanwhile
       var callbackId = msg.data['callbackId'];

data/modules/emscripten/src/library_egl.js

@@ -9,10 +9,16 @@
 var LibraryEGL = {
   $EGL: {
     // This variable tracks the success status of the most recently invoked EGL function call.
-    eglErrorCode: 0x3000 /* EGL_SUCCESS */,
+    errorCode: 0x3000 /* EGL_SUCCESS */,
+    defaultDisplayInitialized: false,
+    currentContext: 0 /* EGL_NO_CONTEXT */,
+    currentReadSurface: 0 /* EGL_NO_SURFACE */,
+    currentDrawSurface: 0 /* EGL_NO_SURFACE */,
+
+    stringCache: {},
     
     setErrorCode: function(code) {
-      EGL.eglErrorCode = code;
+      EGL.errorCode = code;
     },
     
     chooseConfig: function(display, attribList, config, config_size, numConfigs) { 
@@ -63,6 +69,7 @@ var LibraryEGL = {
       if (minorVersion) {
         {{{ makeSetValue('minorVersion', '0', '4', 'i32') }}}; // Advertise EGL Minor version: '4'
       }
+      EGL.defaultDisplayInitialized = true;
       EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
       return 1;
     } 
@@ -78,18 +85,10 @@ var LibraryEGL = {
       EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
       return 0;
     }
-    // TODO: Tear down EGL here. Currently a no-op since we don't need to actually do anything here for the browser.
-    EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
-    return 1;
-  },
-  
-// EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy);
-  eglTerminate: function(display) {
-    if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
-      EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
-      return 0;
-    }
-    // TODO: Tear down EGL here. Currently a no-op since we don't need to actually do anything here for the browser.
+    EGL.currentContext = 0;
+    EGL.currentReadSurface = 0;
+    EGL.currentDrawSurface = 0;
+    EGL.defaultDisplayInitialized = false;
     EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
     return 1;
   },
@@ -246,6 +245,12 @@ var LibraryEGL = {
       EGL.setErrorCode(0x300D /* EGL_BAD_SURFACE */);
       return 1;
     }
+    if (EGL.currentReadSurface == surface) {
+      EGL.currentReadSurface = 0;
+    }
+    if (EGL.currentDrawSurface == surface) {
+      EGL.currentDrawSurface = 0;
+    }
     EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
     return 1; /* Magic ID for Emscripten 'default surface' */
   },
@@ -263,6 +268,7 @@ var LibraryEGL = {
     EGL.windowID = _glutCreateWindow();
     if (EGL.windowID != 0) {
       EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
+      // Note: This function only creates a context, but it shall not make it active.
       return 62004; // Magic ID for Emscripten EGLContext
     } else {
       EGL.setErrorCode(0x3009 /* EGL_BAD_MATCH */); // By the EGL 1.4 spec, an implementation that does not support GLES2 (WebGL in this case), this error code is set.
@@ -278,10 +284,17 @@ var LibraryEGL = {
       EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
       return 0;
     }
+    if (context != 62004 /* Magic ID for Emscripten EGLContext */) {
+      EGL.setErrorCode(0x3006 /* EGL_BAD_CONTEXT */);
+      return 0;
+    }
 
     _glutDestroyWindow(EGL.windowID);
     EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
-    return 62004; // Magic ID for Emscripten EGLContext
+    if (EGL.currentContext == context) {
+      EGL.currentContext = 0;
+    }
+    return 1 /* EGL_TRUE */;
   },
 
   // EGLAPI EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx);
@@ -405,7 +418,7 @@ var LibraryEGL = {
   
   // EGLAPI EGLint EGLAPIENTRY eglGetError(void);
   eglGetError: function() { 
-    return EGL.eglErrorCode;
+    return EGL.errorCode;
   },
 
   // EGLAPI const char * EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name);
@@ -416,15 +429,19 @@ var LibraryEGL = {
     }
     //\todo An EGL_NOT_INITIALIZED error is generated if EGL is not initialized for dpy. 
     EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
+    if (EGL.stringCache[name]) return EGL.stringCache[name];
+    var ret;
     switch(name) {
-      case 0x3053 /* EGL_VENDOR */: return allocate(intArrayFromString("Emscripten"), 'i8', ALLOC_NORMAL);
-      case 0x3054 /* EGL_VERSION */: return allocate(intArrayFromString("1.4 Emscripten EGL"), 'i8', ALLOC_NORMAL);
-      case 0x3055 /* EGL_EXTENSIONS */:  return allocate(intArrayFromString(""), 'i8', ALLOC_NORMAL); // Currently not supporting any EGL extensions.
-      case 0x308D /* EGL_CLIENT_APIS */: return allocate(intArrayFromString("OpenGL_ES"), 'i8', ALLOC_NORMAL);
+      case 0x3053 /* EGL_VENDOR */: ret = allocate(intArrayFromString("Emscripten"), 'i8', ALLOC_NORMAL); break;
+      case 0x3054 /* EGL_VERSION */: ret = allocate(intArrayFromString("1.4 Emscripten EGL"), 'i8', ALLOC_NORMAL); break;
+      case 0x3055 /* EGL_EXTENSIONS */:  ret = allocate(intArrayFromString(""), 'i8', ALLOC_NORMAL); break; // Currently not supporting any EGL extensions.
+      case 0x308D /* EGL_CLIENT_APIS */: ret = allocate(intArrayFromString("OpenGL_ES"), 'i8', ALLOC_NORMAL); break;
       default:
         EGL.setErrorCode(0x300C /* EGL_BAD_PARAMETER */);
         return 0;
     }
+    EGL.stringCache[name] = ret;
+    return ret;
   },
   
   // EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api);
@@ -471,21 +488,46 @@ var LibraryEGL = {
   eglMakeCurrent: function(display, draw, read, context) { 
     if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
       EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
-      return 0;
+      return 0 /* EGL_FALSE */;
     }
     //\todo An EGL_NOT_INITIALIZED error is generated if EGL is not initialized for dpy. 
-    if (context != 62004 /* Magic ID for Emscripten EGLContext */) {
+    if (context != 0 && context != 62004 /* Magic ID for Emscripten EGLContext */) {
       EGL.setErrorCode(0x3006 /* EGL_BAD_CONTEXT */);
       return 0;
     }
-    if (read != 62006 || draw != 62006 /* Magic ID for Emscripten 'default surface' */) {
+    if ((read != 0 && read != 62006) || (draw != 0 && draw != 62006 /* Magic ID for Emscripten 'default surface' */)) {
       EGL.setErrorCode(0x300D /* EGL_BAD_SURFACE */);
       return 0;
     }
+    EGL.currentContext = context;
+    EGL.currentDrawSurface = draw;
+    EGL.currentReadSurface = read;
     EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
-    return 1;
+    return 1 /* EGL_TRUE */;
+  },
+
+  // EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext(void);
+  eglGetCurrentContext: function() {
+    return EGL.currentContext;
   },
 
+  // EGLAPI EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw);
+  eglGetCurrentSurface: function(readdraw) {
+    if (readdraw == 0x305A /* EGL_READ */) {
+      return EGL.currentReadSurface;
+    } else if (readdraw == 0x3059 /* EGL_DRAW */) {
+      return EGL.currentDrawSurface;
+    } else {
+      EGL.setErrorCode(0x300C /* EGL_BAD_PARAMETER */);
+      return 0 /* EGL_NO_SURFACE */;
+    }
+  },
+
+  // EGLAPI EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void);
+  eglGetCurrentDisplay: function() {
+    return EGL.currentContext ? 62000 /* Magic ID for Emscripten 'default display' */ : 0;
+  },
+  
   // EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface);
   eglSwapBuffers: function() {
     EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);