Merge pull request #359 from prenaux/develop

library.js, added llvm_invariant_start/end & llvm_bswap_i16 ; hello_world_gles.c, added F11 for fullscreen ;

1 files changed, 5 insertions, 2 deletions

diff --git a/src/library_glut.js b/src/library_glut.js
index e4b2d138..9ad83684 100644
--- a/src/library_glut.js
+++ b/src/library_glut.js
@@ -226,13 +226,13 @@ var LibraryGLUT = {
     onFullScreenEventChange: function(event){
       var width;
       var height;
-      if (document.fullScreen || document.mozFullScreen || document.webkitIsFullScreen) {
+      if (document["fullScreen"] || document["mozFullScreen"] || document["webkitIsFullScreen"]) {
         width = screen["width"];
         height = screen["height"];
       } else {
         width = GLUT.windowWidth;
         height = GLUT.windowHeight;
-	// TODO set position
+	    // TODO set position
         document.removeEventListener('fullscreenchange', GLUT.onFullScreenEventChange, true);
         document.removeEventListener('mozfullscreenchange', GLUT.onFullScreenEventChange, true);
         document.removeEventListener('webkitfullscreenchange', GLUT.onFullScreenEventChange, true);
@@ -241,6 +241,7 @@ var LibraryGLUT = {
       Module['canvas'].height = height;
       /* Can't call _glutReshapeWindow as that requests cancelling fullscreen. */
       if (GLUT.reshapeFunc) {
+        // console.log("GLUT.reshapeFunc (from FS): " + width + ", " + height);
         FUNCTION_TABLE[GLUT.reshapeFunc](width, height);
       }
       _glutPostRedisplay();
@@ -378,9 +379,11 @@ var LibraryGLUT = {
   glutReshapeWindow__deps: ['$GLUT', 'glutPostRedisplay'],
   glutReshapeWindow: function(width, height) {
     GLUT.cancelFullScreen();
+    // console.log("glutReshapeWindow: " + width + ", " + height);
     Module['canvas'].width  = width;
     Module['canvas'].height = height;
     if (GLUT.reshapeFunc) {
+      // console.log("GLUT.reshapeFunc: " + width + ", " + height);
       FUNCTION_TABLE[GLUT.reshapeFunc](width, height);
     }
     _glutPostRedisplay();