summaryrefslogtreecommitdiffstats
path: root/platform/web/js
diff options
context:
space:
mode:
Diffstat (limited to 'platform/web/js')
-rw-r--r--platform/web/js/engine/config.js2
-rw-r--r--platform/web/js/engine/engine.js16
-rw-r--r--platform/web/js/engine/features.js22
-rw-r--r--platform/web/js/libs/audio.worklet.js4
-rw-r--r--platform/web/js/libs/library_godot_input.js135
5 files changed, 166 insertions, 13 deletions
diff --git a/platform/web/js/engine/config.js b/platform/web/js/engine/config.js
index 0b6626968e..a7134da6fa 100644
--- a/platform/web/js/engine/config.js
+++ b/platform/web/js/engine/config.js
@@ -19,7 +19,7 @@ const EngineConfig = {}; // eslint-disable-line no-unused-vars
const InternalConfig = function (initConfig) { // eslint-disable-line no-unused-vars
const cfg = /** @lends {InternalConfig.prototype} */ {
/**
- * Whether the unload the engine automatically after the instance is initialized.
+ * Whether to unload the engine automatically after the instance is initialized.
*
* @memberof EngineConfig
* @default
diff --git a/platform/web/js/engine/engine.js b/platform/web/js/engine/engine.js
index 3d6720a2fc..7e24ad9ae2 100644
--- a/platform/web/js/engine/engine.js
+++ b/platform/web/js/engine/engine.js
@@ -179,9 +179,7 @@ const Engine = (function () {
preloader.preloadedFiles.length = 0; // Clear memory
me.rtenv['callMain'](me.config.args);
initPromise = null;
- if (me.config.serviceWorker && 'serviceWorker' in navigator) {
- navigator.serviceWorker.register(me.config.serviceWorker);
- }
+ me.installServiceWorker();
resolve();
});
});
@@ -242,6 +240,17 @@ const Engine = (function () {
this.rtenv['request_quit']();
}
},
+
+ /**
+ * Install the progressive-web app service worker.
+ * @returns {Promise} The service worker registration promise.
+ */
+ installServiceWorker: function () {
+ if (this.config.serviceWorker && 'serviceWorker' in navigator) {
+ return navigator.serviceWorker.register(this.config.serviceWorker);
+ }
+ return Promise.resolve();
+ },
};
Engine.prototype = proto;
@@ -252,6 +261,7 @@ const Engine = (function () {
Engine.prototype['startGame'] = Engine.prototype.startGame;
Engine.prototype['copyToFS'] = Engine.prototype.copyToFS;
Engine.prototype['requestQuit'] = Engine.prototype.requestQuit;
+ Engine.prototype['installServiceWorker'] = Engine.prototype.installServiceWorker;
// Also expose static methods as instance methods
Engine.prototype['load'] = Engine.load;
Engine.prototype['unload'] = Engine.unload;
diff --git a/platform/web/js/engine/features.js b/platform/web/js/engine/features.js
index b7c6c9d445..81bc82f3c6 100644
--- a/platform/web/js/engine/features.js
+++ b/platform/web/js/engine/features.js
@@ -72,8 +72,14 @@ const Features = { // eslint-disable-line no-unused-vars
*
* @returns {Array<string>} A list of human-readable missing features.
* @function Engine.getMissingFeatures
+ * @typedef {{ threads: boolean }} SupportedFeatures
+ * @param {SupportedFeatures} supportedFeatures
*/
- getMissingFeatures: function () {
+ getMissingFeatures: function (supportedFeatures = {}) {
+ const {
+ threads: supportsThreads = true,
+ } = supportedFeatures;
+
const missing = [];
if (!Features.isWebGLAvailable(2)) {
missing.push('WebGL2 - Check web browser configuration and hardware support');
@@ -84,12 +90,16 @@ const Features = { // eslint-disable-line no-unused-vars
if (!Features.isSecureContext()) {
missing.push('Secure Context - Check web server configuration (use HTTPS)');
}
- if (!Features.isCrossOriginIsolated()) {
- missing.push('Cross Origin Isolation - Check web server configuration (send correct headers)');
- }
- if (!Features.isSharedArrayBufferAvailable()) {
- missing.push('SharedArrayBuffer - Check web server configuration (send correct headers)');
+
+ if (supportsThreads) {
+ if (!Features.isCrossOriginIsolated()) {
+ missing.push('Cross-Origin Isolation - Check that the web server configuration sends the correct headers.');
+ }
+ if (!Features.isSharedArrayBufferAvailable()) {
+ missing.push('SharedArrayBuffer - Check that the web server configuration sends the correct headers.');
+ }
}
+
// Audio is normally optional since we have a dummy fallback.
return missing;
},
diff --git a/platform/web/js/libs/audio.worklet.js b/platform/web/js/libs/audio.worklet.js
index 89b581b3d6..3b94cab85c 100644
--- a/platform/web/js/libs/audio.worklet.js
+++ b/platform/web/js/libs/audio.worklet.js
@@ -167,7 +167,7 @@ class GodotProcessor extends AudioWorkletProcessor {
GodotProcessor.write_input(this.input_buffer, input);
this.input.write(this.input_buffer);
} else {
- this.port.postMessage('Input buffer is full! Skipping input frame.');
+ // this.port.postMessage('Input buffer is full! Skipping input frame.'); // Uncomment this line to debug input buffer.
}
}
const process_output = GodotProcessor.array_has_data(outputs);
@@ -184,7 +184,7 @@ class GodotProcessor extends AudioWorkletProcessor {
this.port.postMessage({ 'cmd': 'read', 'data': chunk });
}
} else {
- this.port.postMessage('Output buffer has not enough frames! Skipping output frame.');
+ // this.port.postMessage('Output buffer has not enough frames! Skipping output frame.'); // Uncomment this line to debug output buffer.
}
}
this.process_notify();
diff --git a/platform/web/js/libs/library_godot_input.js b/platform/web/js/libs/library_godot_input.js
index eaff40f89c..1292c468f5 100644
--- a/platform/web/js/libs/library_godot_input.js
+++ b/platform/web/js/libs/library_godot_input.js
@@ -29,6 +29,110 @@
/**************************************************************************/
/*
+ * IME API helper.
+ */
+
+const GodotIME = {
+ $GodotIME__deps: ['$GodotRuntime', '$GodotEventListeners'],
+ $GodotIME__postset: 'GodotOS.atexit(function(resolve, reject) { GodotIME.clear(); resolve(); });',
+ $GodotIME: {
+ ime: null,
+ active: false,
+
+ getModifiers: function (evt) {
+ return (evt.shiftKey + 0) + ((evt.altKey + 0) << 1) + ((evt.ctrlKey + 0) << 2) + ((evt.metaKey + 0) << 3);
+ },
+
+ ime_active: function (active) {
+ function focus_timer() {
+ GodotIME.active = true;
+ GodotIME.ime.focus();
+ }
+
+ if (GodotIME.ime) {
+ if (active) {
+ GodotIME.ime.style.display = 'block';
+ setInterval(focus_timer, 100);
+ } else {
+ GodotIME.ime.style.display = 'none';
+ GodotConfig.canvas.focus();
+ GodotIME.active = false;
+ }
+ }
+ },
+
+ ime_position: function (x, y) {
+ if (GodotIME.ime) {
+ GodotIME.ime.style.left = `${x}px`;
+ GodotIME.ime.style.top = `${y}px`;
+ }
+ },
+
+ init: function (ime_cb, key_cb, code, key) {
+ function key_event_cb(pressed, evt) {
+ const modifiers = GodotIME.getModifiers(evt);
+ GodotRuntime.stringToHeap(evt.code, code, 32);
+ GodotRuntime.stringToHeap(evt.key, key, 32);
+ key_cb(pressed, evt.repeat, modifiers);
+ evt.preventDefault();
+ }
+ function ime_event_cb(event) {
+ if (GodotIME.ime) {
+ if (event.type === 'compositionstart') {
+ ime_cb(0, null);
+ GodotIME.ime.innerHTML = '';
+ } else if (event.type === 'compositionupdate') {
+ const ptr = GodotRuntime.allocString(event.data);
+ ime_cb(1, ptr);
+ GodotRuntime.free(ptr);
+ } else if (event.type === 'compositionend') {
+ const ptr = GodotRuntime.allocString(event.data);
+ ime_cb(2, ptr);
+ GodotRuntime.free(ptr);
+ GodotIME.ime.innerHTML = '';
+ }
+ }
+ }
+
+ const ime = document.createElement('div');
+ ime.className = 'ime';
+ ime.style.background = 'none';
+ ime.style.opacity = 0.0;
+ ime.style.position = 'fixed';
+ ime.style.left = '0px';
+ ime.style.top = '0px';
+ ime.style.width = '2px';
+ ime.style.height = '2px';
+ ime.style.display = 'none';
+ ime.contentEditable = 'true';
+
+ GodotEventListeners.add(ime, 'compositionstart', ime_event_cb, false);
+ GodotEventListeners.add(ime, 'compositionupdate', ime_event_cb, false);
+ GodotEventListeners.add(ime, 'compositionend', ime_event_cb, false);
+ GodotEventListeners.add(ime, 'keydown', key_event_cb.bind(null, 1), false);
+ GodotEventListeners.add(ime, 'keyup', key_event_cb.bind(null, 0), false);
+
+ ime.onblur = function () {
+ this.style.display = 'none';
+ GodotConfig.canvas.focus();
+ GodotIME.active = false;
+ };
+
+ GodotConfig.canvas.parentElement.appendChild(ime);
+ GodotIME.ime = ime;
+ },
+
+ clear: function () {
+ if (GodotIME.ime) {
+ GodotIME.ime.remove();
+ GodotIME.ime = null;
+ }
+ },
+ },
+};
+mergeInto(LibraryManager.library, GodotIME);
+
+/*
* Gamepad API helper.
*/
const GodotInputGamepads = {
@@ -338,7 +442,7 @@ mergeInto(LibraryManager.library, GodotInputDragDrop);
* Godot exposed input functions.
*/
const GodotInput = {
- $GodotInput__deps: ['$GodotRuntime', '$GodotConfig', '$GodotEventListeners', '$GodotInputGamepads', '$GodotInputDragDrop'],
+ $GodotInput__deps: ['$GodotRuntime', '$GodotConfig', '$GodotEventListeners', '$GodotInputGamepads', '$GodotInputDragDrop', '$GodotIME'],
$GodotInput: {
getModifiers: function (evt) {
return (evt.shiftKey + 0) + ((evt.altKey + 0) << 1) + ((evt.ctrlKey + 0) << 2) + ((evt.metaKey + 0) << 3);
@@ -462,6 +566,35 @@ const GodotInput = {
},
/*
+ * IME API
+ */
+ godot_js_set_ime_active__proxy: 'sync',
+ godot_js_set_ime_active__sig: 'vi',
+ godot_js_set_ime_active: function (p_active) {
+ GodotIME.ime_active(p_active);
+ },
+
+ godot_js_set_ime_position__proxy: 'sync',
+ godot_js_set_ime_position__sig: 'vii',
+ godot_js_set_ime_position: function (p_x, p_y) {
+ GodotIME.ime_position(p_x, p_y);
+ },
+
+ godot_js_set_ime_cb__proxy: 'sync',
+ godot_js_set_ime_cb__sig: 'viiii',
+ godot_js_set_ime_cb: function (p_ime_cb, p_key_cb, code, key) {
+ const ime_cb = GodotRuntime.get_func(p_ime_cb);
+ const key_cb = GodotRuntime.get_func(p_key_cb);
+ GodotIME.init(ime_cb, key_cb, code, key);
+ },
+
+ godot_js_is_ime_focused__proxy: 'sync',
+ godot_js_is_ime_focused__sig: 'i',
+ godot_js_is_ime_focused: function () {
+ return GodotIME.active;
+ },
+
+ /*
* Gamepad API
*/
godot_js_input_gamepad_cb__proxy: 'sync',