Merge pull request #17616 from eska014/2.1-html5

2.1 HTML5 fixes

misc/dist/html_fs/godot.html → misc/dist/html/default.html

@@ -365,34 +365,33 @@
 
 		Presentation.setStatus("Downloading...");
 
-	//]]></script>
-	<script type="text/javascript" src="$GODOT_FS"></script>
-	<script>
 		(function() {
 			var script = document.createElement('script');
 			script.src = "$GODOT_ASM";
 			script.onload = function() {
 				setTimeout(function() {
-					(function() {
-						var memoryInitializer = '$GODOT_MEM';
-						if (typeof Module.locateFile === 'function') {
-							memoryInitializer = Module.locateFile(memoryInitializer);
-						} else if (Module.memoryInitializerPrefixURL) {
-							memoryInitializer = Module.memoryInitializerPrefixURL + memoryInitializer;
-						}
-						var xhr = Module.memoryInitializerRequest = new XMLHttpRequest();
-						xhr.open('GET', memoryInitializer, true);
-						xhr.responseType = 'arraybuffer';
-						xhr.send(null);
-					})();
+					var memoryInitializer = '$GODOT_MEM';
+					if (typeof Module.locateFile === 'function') {
+						memoryInitializer = Module.locateFile(memoryInitializer);
+					} else if (Module.memoryInitializerPrefixURL) {
+						memoryInitializer = Module.memoryInitializerPrefixURL + memoryInitializer;
+					}
+
+					var xhr = Module.memoryInitializerRequest = new XMLHttpRequest();
+					xhr.open('GET', memoryInitializer, true);
+					xhr.responseType = 'arraybuffer';
+					xhr.send(null);
 
 					var script = document.createElement('script');
 					script.src = "$GODOT_JS";
+					script.onload = function() {
+						Module.FS.createPreloadedFile('/data.pck', null, 'data.pck', true, true, null, null, false, true);
+					};
 					document.body.appendChild(script);
 				}, 1); // delaying even 1ms is enough to allow compilation memory to be reclaimed
 			};
 			document.body.appendChild(script);
 		})();
-	</script>
+	//]]></script>
 </body>
 </html>

misc/dist/html_fs/godotfs.js

@@ -1,149 +0,0 @@
-
-var Module;
-if (typeof Module === 'undefined') Module = eval('(function() { try { return Module || {} } catch(e) { return {} } })()');
-if (!Module.expectedDataFileDownloads) {
-  Module.expectedDataFileDownloads = 0;
-  Module.finishedDataFileDownloads = 0;
-}
-Module.expectedDataFileDownloads++;
-(function() {
-
-    function fetchRemotePackage(packageName, callback, errback) {
-      var xhr = new XMLHttpRequest();
-      xhr.open('GET', packageName, true);
-      xhr.responseType = 'arraybuffer';
-      xhr.onprogress = function(event) {
-        var url = packageName;
-        if (event.loaded && event.total) {
-          if (!xhr.addedTotal) {
-            xhr.addedTotal = true;
-            if (!Module.dataFileDownloads) Module.dataFileDownloads = {};
-            Module.dataFileDownloads[url] = {
-              loaded: event.loaded,
-              total: event.total
-            };
-          } else {
-            Module.dataFileDownloads[url].loaded = event.loaded;
-          }
-          var total = 0;
-          var loaded = 0;
-          var num = 0;
-          for (var download in Module.dataFileDownloads) {
-          var data = Module.dataFileDownloads[download];
-            total += data.total;
-            loaded += data.loaded;
-            num++;
-          }
-          total = Math.ceil(total * Module.expectedDataFileDownloads/num);
-          if (Module['setStatus']) Module['setStatus']('Downloading data... (' + loaded + '/' + total + ')');
-        } else if (!Module.dataFileDownloads) {
-          if (Module['setStatus']) Module['setStatus']('Downloading data...');
-        }
-      };
-      xhr.onload = function(event) {
-        var packageData = xhr.response;
-        callback(packageData);
-      };
-      xhr.send(null);
-    };
-
-    function handleError(error) {
-      console.error('package error:', error);
-    };
-
-      var fetched = null, fetchedCallback = null;
-      fetchRemotePackage('data.pck', function(data) {
-        if (fetchedCallback) {
-          fetchedCallback(data);
-          fetchedCallback = null;
-        } else {
-          fetched = data;
-        }
-      }, handleError);
-
-  function runWithFS() {
-
-function assert(check, msg) {
-  if (!check) throw msg + new Error().stack;
-}
-
-    function DataRequest(start, end, crunched, audio) {
-      this.start = start;
-      this.end = end;
-      this.crunched = crunched;
-      this.audio = audio;
-    }
-    DataRequest.prototype = {
-      requests: {},
-      open: function(mode, name) {
-        this.name = name;
-        this.requests[name] = this;
-        Module['addRunDependency']('fp ' + this.name);
-      },
-      send: function() {},
-      onload: function() {
-        var byteArray = this.byteArray.subarray(this.start, this.end);
-
-          this.finish(byteArray);
-
-      },
-      finish: function(byteArray) {
-        var that = this;
-        Module['FS_createPreloadedFile'](this.name, null, byteArray, true, true, function() {
-          Module['removeRunDependency']('fp ' + that.name);
-        }, function() {
-          if (that.audio) {
-            Module['removeRunDependency']('fp ' + that.name); // workaround for chromium bug 124926 (still no audio with this, but at least we don't hang)
-          } else {
-            Module.printErr('Preloading file ' + that.name + ' failed');
-          }
-        }, false, true); // canOwn this data in the filesystem, it is a slide into the heap that will never change
-        this.requests[this.name] = null;
-      },
-    };
-      new DataRequest(0, $DPLEN, 0, 0).open('GET', '/data.pck');
-
-    var PACKAGE_PATH;
-    if (typeof window === 'object') {
-      PACKAGE_PATH = window['encodeURIComponent'](window.location.pathname.toString().substring(0, window.location.pathname.toString().lastIndexOf('/')) + '/');
-    } else {
-      // worker
-      PACKAGE_PATH = encodeURIComponent(location.pathname.toString().substring(0, location.pathname.toString().lastIndexOf('/')) + '/');
-    }
-    var PACKAGE_NAME = 'data.pck';
-    var REMOTE_PACKAGE_NAME = 'data.pck';
-    var PACKAGE_UUID = 'b39761ce-0348-4959-9b16-302ed8e1592e';
-
-    function processPackageData(arrayBuffer) {
-      Module.finishedDataFileDownloads++;
-      assert(arrayBuffer, 'Loading data file failed.');
-      var byteArray = new Uint8Array(arrayBuffer);
-      var curr;
-
-      // Reuse the bytearray from the XHR as the source for file reads.
-      DataRequest.prototype.byteArray = byteArray;
-          DataRequest.prototype.requests["/data.pck"].onload();
-          Module['removeRunDependency']('datafile_datapack');
-
-    };
-    Module['addRunDependency']('datafile_datapack');
-
-    if (!Module.preloadResults) Module.preloadResults = {};
-
-      Module.preloadResults[PACKAGE_NAME] = {fromCache: false};
-      if (fetched) {
-        processPackageData(fetched);
-        fetched = null;
-      } else {
-        fetchedCallback = processPackageData;
-      }
-
-  }
-  if (Module['calledRun']) {
-    runWithFS();
-  } else {
-    if (!Module['preRun']) Module['preRun'] = [];
-    Module["preRun"].push(runWithFS); // FS is not initialized yet, wait for it
-  }
-
-})();

platform/javascript/audio_server_javascript.cpp

@@ -778,7 +778,7 @@ AudioServerJavascript::AudioServerJavascript() {
 
 		_as_audioctx = new (window.AudioContext || window.webkitAudioContext)();
 
-		audio_server_mix_function = Module.cwrap('audio_server_mix_function', 'void', ['number']);
+		audio_server_mix_function = cwrap('audio_server_mix_function', null, ['number']);
 	);
 	/* clang-format on */
 

platform/javascript/detect.py

@@ -91,6 +91,7 @@ def configure(env):
         env.Append(LINKFLAGS=['--compression', lzma_binpath + "," + lzma_decoder + "," + lzma_dec])
 
     env.Append(LINKFLAGS=['-s', 'ASM_JS=1'])
+    env.Append(LINKFLAGS=['-s', 'EXTRA_EXPORTED_RUNTIME_METHODS="[\'FS\']"'])
     env.Append(LINKFLAGS=['--separate-asm'])
     env.Append(LINKFLAGS=['-O2'])
     # env.Append(LINKFLAGS=['-g4'])

platform/javascript/javascript_main.cpp

@@ -67,7 +67,7 @@ static void _godot_draw(void) {
 
 extern "C" {
 
-void main_after_fs_sync(int value) {
+void main_after_fs_sync() {
 
 	start_step = 1;
 	printf("FS SYNCHED!\n");
@@ -110,9 +110,7 @@ int main(int argc, char *argv[]) {
 		 FS.syncfs(true, function (err) {
 			 assert(!err);
 			 console.log("done syncinc!");
-			 _after_sync_cb = Module.cwrap('main_after_fs_sync', 'void',['number']);
-			 _after_sync_cb(0);
-
+			 ccall('main_after_fs_sync');
 		 });
 
 	  );

platform/javascript/os_javascript.cpp

@@ -189,8 +189,8 @@ static EM_BOOL _mousemove_callback(int event_type, const EmscriptenMouseEvent *m
 	ev.mouse_motion.global_x = ev.mouse_motion.x = mouse_event->canvasX;
 	ev.mouse_motion.global_y = ev.mouse_motion.y = mouse_event->canvasY;
 
-	ev.mouse_motion.relative_x = _input->get_mouse_pos().x - ev.mouse_motion.x;
-	ev.mouse_motion.relative_y = _input->get_mouse_pos().y - ev.mouse_motion.y;
+	ev.mouse_motion.relative_x = ev.mouse_motion.x - _input->get_mouse_pos().x;
+	ev.mouse_motion.relative_y = ev.mouse_motion.y - _input->get_mouse_pos().y;
 
 	_input->set_mouse_pos(Point2(ev.mouse_motion.x, ev.mouse_motion.y));
 	ev.mouse_motion.speed_x = _input->get_mouse_speed().x;
@@ -310,8 +310,8 @@ static EM_BOOL _touchmove_callback(int event_type, const EmscriptenTouchEvent *t
 		ev.mouse_motion.button_mask = _input->get_mouse_button_mask() >> 1;
 		ev.mouse_motion.global_x = ev.mouse_motion.x = touch_event->touches[lowest_id_index].canvasX;
 		ev.mouse_motion.global_y = ev.mouse_motion.y = touch_event->touches[lowest_id_index].canvasY;
-		ev.mouse_motion.relative_x = _input->get_mouse_pos().x - ev.mouse_motion.x;
-		ev.mouse_motion.relative_y = _input->get_mouse_pos().y - ev.mouse_motion.y;
+		ev.mouse_motion.relative_x = ev.mouse_motion.x - _input->get_mouse_pos().x;
+		ev.mouse_motion.relative_y = ev.mouse_motion.y - _input->get_mouse_pos().y;
 
 		_input->set_mouse_pos(Point2(ev.mouse_motion.x, ev.mouse_motion.y));
 		ev.mouse_motion.speed_x = _input->get_mouse_speed().x;
@@ -497,9 +497,9 @@ void OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver, i
 	SET_EM_CALLBACK("#canvas", touchmove, _touchmove_callback)
 	SET_EM_CALLBACK("#canvas", touchend, _touchpress_callback)
 	SET_EM_CALLBACK("#canvas", touchcancel, _touchpress_callback)
-	SET_EM_CALLBACK("#canvas", keydown, _keydown_callback)
-	SET_EM_CALLBACK("#canvas", keypress, _keypress_callback)
-	SET_EM_CALLBACK("#canvas", keyup, _keyup_callback)
+	SET_EM_CALLBACK("#window", keydown, _keydown_callback)
+	SET_EM_CALLBACK("#window", keypress, _keypress_callback)
+	SET_EM_CALLBACK("#window", keyup, _keyup_callback)
 	SET_EM_CALLBACK(NULL, resize, _browser_resize_callback)
 	SET_EM_CALLBACK(NULL, fullscreenchange, _fullscreen_change_callback)
 	SET_EM_CALLBACK_NODATA(gamepadconnected, joy_callback_func)