From 4e0643a51c6a6a1de802ce536c800ab265493a90 Mon Sep 17 00:00:00 2001 From: Leon Krause Date: Sun, 18 Mar 2018 16:40:20 +0100 Subject: [PATCH 1/3] Fix HTML5 start-up, remove godotfs.js --- .../{html_fs/godot.html => html/default.html} | 31 ++-- misc/dist/html_fs/godotfs.js | 149 ------------------ .../javascript/audio_server_javascript.cpp | 2 +- platform/javascript/detect.py | 1 + platform/javascript/javascript_main.cpp | 6 +- 5 files changed, 19 insertions(+), 170 deletions(-) rename misc/dist/{html_fs/godot.html => html/default.html} (94%) delete mode 100644 misc/dist/html_fs/godotfs.js diff --git a/misc/dist/html_fs/godot.html b/misc/dist/html/default.html similarity index 94% rename from misc/dist/html_fs/godot.html rename to misc/dist/html/default.html index 34df0939a1e..16c6621619d 100644 --- a/misc/dist/html_fs/godot.html +++ b/misc/dist/html/default.html @@ -365,34 +365,33 @@ Presentation.setStatus("Downloading..."); - //]]> - - + //]]> diff --git a/misc/dist/html_fs/godotfs.js b/misc/dist/html_fs/godotfs.js deleted file mode 100644 index 2c59344cf5c..00000000000 --- a/misc/dist/html_fs/godotfs.js +++ /dev/null @@ -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 - } - -})(); diff --git a/platform/javascript/audio_server_javascript.cpp b/platform/javascript/audio_server_javascript.cpp index 91a9bf381cc..105a2f62bbf 100644 --- a/platform/javascript/audio_server_javascript.cpp +++ b/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 */ diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 864af7c538b..93f0ce683e0 100644 --- a/platform/javascript/detect.py +++ b/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']) diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp index f99197906df..cdbf8b17c22 100644 --- a/platform/javascript/javascript_main.cpp +++ b/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'); }); ); From c445ba29aa7f035a2f5023ed79760dc9d2d3bfbc Mon Sep 17 00:00:00 2001 From: Leon Krause Date: Sun, 18 Mar 2018 16:41:43 +0100 Subject: [PATCH 2/3] Fix HTML5 key events --- platform/javascript/os_javascript.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index 6694417bcf0..8e8faf2df4b 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -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) From 6e549d41eb4fdbdcde0f609ff09c97691a888bd6 Mon Sep 17 00:00:00 2001 From: Leon Krause Date: Tue, 28 Nov 2017 23:30:57 +0100 Subject: [PATCH 3/3] Fix inverted relative mouse motion in HTML5 export (cherry picked from commit 640d8cc5d2749bbe29a6a85d076a7bdf264d146b) --- platform/javascript/os_javascript.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index 8e8faf2df4b..0c092f4f0b1 100644 --- a/platform/javascript/os_javascript.cpp +++ b/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;