switch to godot 3.4

godot.javascript.opt.tools.threads.engine.js

@@ -240,13 +240,6 @@ const InternalConfig = function (initConfig) { // eslint-disable-line no-unused-
 		 * @default
 		 */
 		experimentalVK: false,
-		/**
-		 * The progressive web app service worker to install.
-		 * @memberof EngineConfig
-		 * @default
-		 * @type {string}
-		 */
-		serviceWorker: '',
 		/**
 		 * @ignore
 		 * @type {Array.<string>}
@@ -390,7 +383,6 @@ const InternalConfig = function (initConfig) { // eslint-disable-line no-unused-
 		this.persistentDrops = parse('persistentDrops', this.persistentDrops);
 		this.experimentalVK = parse('experimentalVK', this.experimentalVK);
 		this.focusCanvas = parse('focusCanvas', this.focusCanvas);
-		this.serviceWorker = parse('serviceWorker', this.serviceWorker);
 		this.gdnativeLibs = parse('gdnativeLibs', this.gdnativeLibs);
 		this.fileSizes = parse('fileSizes', this.fileSizes);
 		this.args = parse('args', this.args);
@@ -681,9 +673,6 @@ 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);
-							}
 							resolve();
 						});
 					});

godot.javascript.opt.tools.threads.service.worker.js

@@ -3,9 +3,8 @@
 // that they need an Internet connection to run the project if desired.
 // Incrementing CACHE_VERSION will kick off the install event and force
 // previously cached resources to be updated from the network.
-const CACHE_VERSION = "4.0.alpha.custom_build";
-const CACHE_PREFIX = "GodotEngine-sw-cache-";
-const CACHE_NAME = CACHE_PREFIX + CACHE_VERSION;
+const CACHE_VERSION = "3.4.4.rc.custom_build";
+const CACHE_NAME = "GodotEngine-cache";
 const OFFLINE_URL = "offline.html";
 // Files that will be cached on load.
 const CACHED_FILES = ["godot.tools.html", "offline.html", "godot.tools.js", "godot.tools.worker.js", "godot.tools.audio.worklet.js", "logo.svg", "favicon.png"];
@@ -14,35 +13,26 @@ const CACHABLE_FILES = ["godot.tools.wasm"];
 const FULL_CACHE = CACHED_FILES.concat(CACHABLE_FILES);
 
 self.addEventListener("install", (event) => {
-	event.waitUntil(caches.open(CACHE_NAME).then(cache => cache.addAll(CACHED_FILES)));
+	event.waitUntil(async function () {
+		const cache = await caches.open(CACHE_NAME);
+		// Clear old cache (including optionals).
+		await Promise.all(FULL_CACHE.map(path => cache.delete(path)));
+		// Insert new one.
+		const done = await cache.addAll(CACHED_FILES);
+		return done;
+	}());
 });
 
 self.addEventListener("activate", (event) => {
-	event.waitUntil(caches.keys().then(
-		function (keys) {
-			// Remove old caches.
-			return Promise.all(keys.filter(key => key.startsWith(CACHE_PREFIX) && key != CACHE_NAME).map(key => caches.delete(key)));
-		}).then(function() {
-			// Enable navigation preload if available.
-			return ("navigationPreload" in self.registration) ? self.registration.navigationPreload.enable() : Promise.resolve();
-		})
-	);
+	event.waitUntil(async function () {
+		if ("navigationPreload" in self.registration) {
+			await self.registration.navigationPreload.enable();
+		}
+	}());
+	// Tell the active service worker to take control of the page immediately.
+	self.clients.claim();
 });
 
-async function fetchAndCache(event, cache, isCachable) {
-	// Use the preloaded response, if it's there
-	let response = await event.preloadResponse;
-	if (!response) {
-		// Or, go over network.
-		response = await self.fetch(event.request);
-	}
-	if (isCachable) {
-		// And update the cache
-		cache.put(event.request, response.clone());
-	}
-	return response;
-}
-
 self.addEventListener("fetch", (event) => {
 	const isNavigate = event.request.mode === "navigate";
 	const url = event.request.url || "";
@@ -52,54 +42,32 @@ self.addEventListener("fetch", (event) => {
 	const isCachable = FULL_CACHE.some(v => v === local) || (base === referrer && base.endsWith(CACHED_FILES[0]));
 	if (isNavigate || isCachable) {
 		event.respondWith(async function () {
-			// Try to use cache first
-			const cache = await caches.open(CACHE_NAME);
-			if (event.request.mode === "navigate") {
-				// Check if we have full cache during HTML page request.
-				const fullCache = await Promise.all(FULL_CACHE.map(name => cache.match(name)));
-				const missing = fullCache.some(v => v === undefined);
-				if (missing) {
-					try {
-						// Try network if some cached file is missing (so we can display offline page in case).
-						return await fetchAndCache(event, cache, isCachable);
-					} catch (e) {
-						// And return the hopefully always cached offline page in case of network failure.
-						console.error("Network error: ", e);
-						return await caches.match(OFFLINE_URL);
-					}
+			try {
+				// Use the preloaded response, if it's there
+				let request = event.request.clone();
+				let response = await event.preloadResponse;
+				if (!response) {
+					// Or, go over network.
+					response = await fetch(event.request);
 				}
-			}
-			const cached = await cache.match(event.request);
-			if (cached) {
-				return cached;
-			} else {
-				// Try network if don't have it in cache.
-				return await fetchAndCache(event, cache, isCachable);
+				if (isCachable) {
+					// Update the cache
+					const cache = await caches.open(CACHE_NAME);
+					cache.put(request, response.clone());
+				}
+				return response;
+			} catch (error) {
+				const cache = await caches.open(CACHE_NAME);
+				if (event.request.mode === "navigate") {
+					// Check if we have full cache.
+					const cached = await Promise.all(FULL_CACHE.map(name => cache.match(name)));
+					const missing = cached.some(v => v === undefined);
+					const cachedResponse = missing ? await caches.match(OFFLINE_URL) : await caches.match(CACHED_FILES[0]);
+					return cachedResponse;
+				}
+				const cachedResponse = await caches.match(event.request);
+				return cachedResponse;
 			}
 		}());
 	}
 });
-
-self.addEventListener("message", (event) => {
-	// No cross origin
-	if (event.origin != self.origin) {
-		return;
-	}
-	const id = event.source.id || "";
-	const msg = event.data || "";
-	// Ensure it's one of our clients.
-	self.clients.get(id).then(function (client) {
-		if (!client) {
-			return; // Not a valid client.
-		}
-		if (msg === "claim") {
-			self.skipWaiting().then(() => self.clients.claim());
-		} else if (msg === "clear") {
-			caches.delete(CACHE_NAME);
-		} else if (msg === "update") {
-			self.skipWaiting().then(() => self.clients.claim()).then(() => self.clients.matchAll()).then(all => all.forEach(c => c.navigate(c.url)));
-		} else {
-			onClientMessage(event);
-		}
-	});
-});

godot.javascript.opt.tools.threads.wasm

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b78c77d76f67d77ed74206ab81993952200f85c344c59e1403d69535783fd5a7
-size 57390540
+oid sha256:7a390630633cdc5dfca6c15f9abf92b797ead61561ee1bbe211066abc7ce72b2
+size 38752316

godot.javascript.opt.tools.threads.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:138d96d977649424c38c3ca82b869c6e1f187afbc86606cdf2b680ab1e453680
-size 23833082
+oid sha256:3e1e62876866875fd9f2cf81bd6e04bd7262888eefc6bc1474d7ce9738fc32b8
+size 17239261

godot.tools.html

@@ -23,7 +23,7 @@
 	<link id="-gd-engine-icon" rel="icon" type="image/png" href="favicon.png" />
 	<link rel="apple-touch-icon" type="image/png" href="favicon.png" />
 	<link rel="manifest" href="manifest.json" />
-	<title>Godot Engine Web Editor (4.0.alpha.custom_build)</title>
+	<title>Godot Engine Web Editor (3.4.4.rc.custom_build)</title>
 	<style>
 		*:focus {
 			/* More visible outline for better keyboard navigation. */
@@ -265,7 +265,6 @@
 		<button id="btn-close-editor" class="btn close-btn" disabled="disabled" onclick="closeEditor()">×</button>
 		<button id="btn-tab-game" class="btn tab-btn" disabled="disabled" onclick="showTab('game')">Game</button>
 		<button id="btn-close-game" class="btn close-btn"  disabled="disabled" onclick="closeGame()">×</button>
-		<button id="btn-tab-update" class="btn tab-btn" style="display: none;">Update</button>
 	</div>
 	<div id="tabs">
 		<div id="tab-loader">
@@ -273,7 +272,7 @@
 				<br />
 				<img src="logo.svg" alt="Godot Engine logo" width="1024" height="414" style="width: auto; height: auto; max-width: min(85%, 50vh); max-height: 250px" />
 				<br />
-				4.0.alpha.custom_build
+				3.4.4.rc.custom_build
 				<br />
 				<a href="releases/">Need an old version?</a>
 				<br />
@@ -282,7 +281,8 @@
 				<label for="videoMode" style="margin-right: 1rem">Video driver:</label>
 				<select id="videoMode">
 					<option value="" selected="selected">Auto</option>
-					<option value="opengl3">WebGL 2</option>
+					<option value="GLES2">WebGL</option>
+					<option value="GLES3">WebGL 2</option>
 				</select>
 				<br />
 				<br />
@@ -295,7 +295,7 @@
 				<br />
 				<button class="btn" onclick="clearPersistence()" style="margin-bottom: 1.5rem">Clear persistent data</button>
 				<br />
-				<a href="https://docs.godotengine.org/en/latest/tutorials/editor/using_the_web_editor.html">Web editor documentation</a>
+				<a href="https://docs.godotengine.org/en/3.4/tutorials/editor/using_the_web_editor.html">Web editor documentation</a>
 			</div>
 		</div>
 		<div id="tab-editor" style="display: none;">
@@ -325,39 +325,10 @@
 			<div id="status-notice" class="godot" style="display: none;"></div>
 		</div>
 	</div>
-	<script>//<![CDATA[
+	<script>
 		window.addEventListener("load", () => {
-			function notifyUpdate(sw) {
-				const btn = document.getElementById("btn-tab-update");
-				btn.onclick = function () {
-					if (!window.confirm("Are you sure you want to update?\nClicking \"OK\" will reload all active instances!")) {
-						return;
-					}
-					sw.postMessage("update");
-					btn.innerHTML = "Updating...";
-					btn.disabled = true;
-				};
-				btn.style.display = "";
-			}
 			if ("serviceWorker" in navigator) {
-				navigator.serviceWorker.register("service.worker.js").then(function (reg) {
-					if (reg.waiting) {
-						notifyUpdate(reg.waiting);
-					}
-					reg.addEventListener("updatefound", function () {
-						const update = reg.installing;
-						update.addEventListener("statechange", function () {
-							if (update.state === "installed") {
-								// It's a new install, claim and perform aggressive caching.
-								if (!reg.active) {
-									update.postMessage("claim");
-								} else {
-									notifyUpdate(update);
-								}
-							}
-						});
-					});
-				});
+				navigator.serviceWorker.register("service.worker.js");
 			}
 
 			if (localStorage.getItem("welcomeModalDismissed") !== 'true') {
@@ -372,7 +343,7 @@
 				localStorage.setItem("welcomeModalDismissed", 'true');
 			}
 		}
-	//]]></script>
+	</script>
 	<script src="godot.tools.js"></script>
 	<script>//<![CDATA[
 
@@ -591,9 +562,8 @@
 				const is_project_manager = args.filter(function(v) { return v == '--project-manager' }).length != 0;
 				const is_game = !is_editor && !is_project_manager;
 				if (video_driver) {
-					args.push('--rendering-driver', video_driver);
+					args.push('--video-driver', video_driver);
 				}
-
 				if (is_game) {
 					if (game) {
 						console.error("A game is already running. Close it first");
@@ -681,9 +651,9 @@
 					selectVideoMode();
 					showTab('editor');
 					setLoaderEnabled(false);
-					const args = ['--project-manager', '--single-window'];
+					const args = ['--project-manager'];
 					if (video_driver) {
-						args.push('--rendering-driver', video_driver);
+						args.push('--video-driver', video_driver);
 					}
 					editor.start({'args': args, 'persistentDrops': true}).then(function() {
 						setStatusMode('hidden');

godot.tools.wasm

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b78c77d76f67d77ed74206ab81993952200f85c344c59e1403d69535783fd5a7
-size 57390540
+oid sha256:7a390630633cdc5dfca6c15f9abf92b797ead61561ee1bbe211066abc7ce72b2
+size 38752316

index.html

@@ -23,7 +23,7 @@
 	<link id="-gd-engine-icon" rel="icon" type="image/png" href="favicon.png" />
 	<link rel="apple-touch-icon" type="image/png" href="favicon.png" />
 	<link rel="manifest" href="manifest.json" />
-	<title>Godot Engine Web Editor (4.0.alpha.custom_build)</title>
+	<title>Godot Engine Web Editor (3.4.4.rc.custom_build)</title>
 	<style>
 		*:focus {
 			/* More visible outline for better keyboard navigation. */
@@ -265,7 +265,6 @@
 		<button id="btn-close-editor" class="btn close-btn" disabled="disabled" onclick="closeEditor()">×</button>
 		<button id="btn-tab-game" class="btn tab-btn" disabled="disabled" onclick="showTab('game')">Game</button>
 		<button id="btn-close-game" class="btn close-btn"  disabled="disabled" onclick="closeGame()">×</button>
-		<button id="btn-tab-update" class="btn tab-btn" style="display: none;">Update</button>
 	</div>
 	<div id="tabs">
 		<div id="tab-loader">
@@ -273,7 +272,7 @@
 				<br />
 				<img src="logo.svg" alt="Godot Engine logo" width="1024" height="414" style="width: auto; height: auto; max-width: min(85%, 50vh); max-height: 250px" />
 				<br />
-				4.0.alpha.custom_build
+				3.4.4.rc.custom_build
 				<br />
 				<a href="releases/">Need an old version?</a>
 				<br />
@@ -282,7 +281,8 @@
 				<label for="videoMode" style="margin-right: 1rem">Video driver:</label>
 				<select id="videoMode">
 					<option value="" selected="selected">Auto</option>
-					<option value="opengl3">WebGL 2</option>
+					<option value="GLES2">WebGL</option>
+					<option value="GLES3">WebGL 2</option>
 				</select>
 				<br />
 				<br />
@@ -295,7 +295,7 @@
 				<br />
 				<button class="btn" onclick="clearPersistence()" style="margin-bottom: 1.5rem">Clear persistent data</button>
 				<br />
-				<a href="https://docs.godotengine.org/en/latest/tutorials/editor/using_the_web_editor.html">Web editor documentation</a>
+				<a href="https://docs.godotengine.org/en/3.4/tutorials/editor/using_the_web_editor.html">Web editor documentation</a>
 			</div>
 		</div>
 		<div id="tab-editor" style="display: none;">
@@ -325,39 +325,10 @@
 			<div id="status-notice" class="godot" style="display: none;"></div>
 		</div>
 	</div>
-	<script>//<![CDATA[
+	<script>
 		window.addEventListener("load", () => {
-			function notifyUpdate(sw) {
-				const btn = document.getElementById("btn-tab-update");
-				btn.onclick = function () {
-					if (!window.confirm("Are you sure you want to update?\nClicking \"OK\" will reload all active instances!")) {
-						return;
-					}
-					sw.postMessage("update");
-					btn.innerHTML = "Updating...";
-					btn.disabled = true;
-				};
-				btn.style.display = "";
-			}
 			if ("serviceWorker" in navigator) {
-				navigator.serviceWorker.register("service.worker.js").then(function (reg) {
-					if (reg.waiting) {
-						notifyUpdate(reg.waiting);
-					}
-					reg.addEventListener("updatefound", function () {
-						const update = reg.installing;
-						update.addEventListener("statechange", function () {
-							if (update.state === "installed") {
-								// It's a new install, claim and perform aggressive caching.
-								if (!reg.active) {
-									update.postMessage("claim");
-								} else {
-									notifyUpdate(update);
-								}
-							}
-						});
-					});
-				});
+				navigator.serviceWorker.register("service.worker.js");
 			}
 
 			if (localStorage.getItem("welcomeModalDismissed") !== 'true') {
@@ -372,7 +343,7 @@
 				localStorage.setItem("welcomeModalDismissed", 'true');
 			}
 		}
-	//]]></script>
+	</script>
 	<script src="godot.tools.js"></script>
 	<script>//<![CDATA[
 
@@ -591,9 +562,8 @@
 				const is_project_manager = args.filter(function(v) { return v == '--project-manager' }).length != 0;
 				const is_game = !is_editor && !is_project_manager;
 				if (video_driver) {
-					args.push('--rendering-driver', video_driver);
+					args.push('--video-driver', video_driver);
 				}
-
 				if (is_game) {
 					if (game) {
 						console.error("A game is already running. Close it first");
@@ -681,9 +651,9 @@
 					selectVideoMode();
 					showTab('editor');
 					setLoaderEnabled(false);
-					const args = ['--project-manager', '--single-window'];
+					const args = ['--project-manager'];
 					if (video_driver) {
-						args.push('--rendering-driver', video_driver);
+						args.push('--video-driver', video_driver);
 					}
 					editor.start({'args': args, 'persistentDrops': true}).then(function() {
 						setStatusMode('hidden');

service.worker.js

@@ -3,9 +3,8 @@
 // that they need an Internet connection to run the project if desired.
 // Incrementing CACHE_VERSION will kick off the install event and force
 // previously cached resources to be updated from the network.
-const CACHE_VERSION = "4.0.alpha.custom_build";
-const CACHE_PREFIX = "GodotEngine-sw-cache-";
-const CACHE_NAME = CACHE_PREFIX + CACHE_VERSION;
+const CACHE_VERSION = "3.4.4.rc.custom_build";
+const CACHE_NAME = "GodotEngine-cache";
 const OFFLINE_URL = "offline.html";
 // Files that will be cached on load.
 const CACHED_FILES = ["godot.tools.html", "offline.html", "godot.tools.js", "godot.tools.worker.js", "godot.tools.audio.worklet.js", "logo.svg", "favicon.png"];
@@ -14,35 +13,26 @@ const CACHABLE_FILES = ["godot.tools.wasm"];
 const FULL_CACHE = CACHED_FILES.concat(CACHABLE_FILES);
 
 self.addEventListener("install", (event) => {
-	event.waitUntil(caches.open(CACHE_NAME).then(cache => cache.addAll(CACHED_FILES)));
+	event.waitUntil(async function () {
+		const cache = await caches.open(CACHE_NAME);
+		// Clear old cache (including optionals).
+		await Promise.all(FULL_CACHE.map(path => cache.delete(path)));
+		// Insert new one.
+		const done = await cache.addAll(CACHED_FILES);
+		return done;
+	}());
 });
 
 self.addEventListener("activate", (event) => {
-	event.waitUntil(caches.keys().then(
-		function (keys) {
-			// Remove old caches.
-			return Promise.all(keys.filter(key => key.startsWith(CACHE_PREFIX) && key != CACHE_NAME).map(key => caches.delete(key)));
-		}).then(function() {
-			// Enable navigation preload if available.
-			return ("navigationPreload" in self.registration) ? self.registration.navigationPreload.enable() : Promise.resolve();
-		})
-	);
+	event.waitUntil(async function () {
+		if ("navigationPreload" in self.registration) {
+			await self.registration.navigationPreload.enable();
+		}
+	}());
+	// Tell the active service worker to take control of the page immediately.
+	self.clients.claim();
 });
 
-async function fetchAndCache(event, cache, isCachable) {
-	// Use the preloaded response, if it's there
-	let response = await event.preloadResponse;
-	if (!response) {
-		// Or, go over network.
-		response = await self.fetch(event.request);
-	}
-	if (isCachable) {
-		// And update the cache
-		cache.put(event.request, response.clone());
-	}
-	return response;
-}
-
 self.addEventListener("fetch", (event) => {
 	const isNavigate = event.request.mode === "navigate";
 	const url = event.request.url || "";
@@ -52,54 +42,32 @@ self.addEventListener("fetch", (event) => {
 	const isCachable = FULL_CACHE.some(v => v === local) || (base === referrer && base.endsWith(CACHED_FILES[0]));
 	if (isNavigate || isCachable) {
 		event.respondWith(async function () {
-			// Try to use cache first
-			const cache = await caches.open(CACHE_NAME);
-			if (event.request.mode === "navigate") {
-				// Check if we have full cache during HTML page request.
-				const fullCache = await Promise.all(FULL_CACHE.map(name => cache.match(name)));
-				const missing = fullCache.some(v => v === undefined);
-				if (missing) {
-					try {
-						// Try network if some cached file is missing (so we can display offline page in case).
-						return await fetchAndCache(event, cache, isCachable);
-					} catch (e) {
-						// And return the hopefully always cached offline page in case of network failure.
-						console.error("Network error: ", e);
-						return await caches.match(OFFLINE_URL);
-					}
+			try {
+				// Use the preloaded response, if it's there
+				let request = event.request.clone();
+				let response = await event.preloadResponse;
+				if (!response) {
+					// Or, go over network.
+					response = await fetch(event.request);
 				}
-			}
-			const cached = await cache.match(event.request);
-			if (cached) {
-				return cached;
-			} else {
-				// Try network if don't have it in cache.
-				return await fetchAndCache(event, cache, isCachable);
+				if (isCachable) {
+					// Update the cache
+					const cache = await caches.open(CACHE_NAME);
+					cache.put(request, response.clone());
+				}
+				return response;
+			} catch (error) {
+				const cache = await caches.open(CACHE_NAME);
+				if (event.request.mode === "navigate") {
+					// Check if we have full cache.
+					const cached = await Promise.all(FULL_CACHE.map(name => cache.match(name)));
+					const missing = cached.some(v => v === undefined);
+					const cachedResponse = missing ? await caches.match(OFFLINE_URL) : await caches.match(CACHED_FILES[0]);
+					return cachedResponse;
+				}
+				const cachedResponse = await caches.match(event.request);
+				return cachedResponse;
 			}
 		}());
 	}
 });
-
-self.addEventListener("message", (event) => {
-	// No cross origin
-	if (event.origin != self.origin) {
-		return;
-	}
-	const id = event.source.id || "";
-	const msg = event.data || "";
-	// Ensure it's one of our clients.
-	self.clients.get(id).then(function (client) {
-		if (!client) {
-			return; // Not a valid client.
-		}
-		if (msg === "claim") {
-			self.skipWaiting().then(() => self.clients.claim());
-		} else if (msg === "clear") {
-			caches.delete(CACHE_NAME);
-		} else if (msg === "update") {
-			self.skipWaiting().then(() => self.clients.claim()).then(() => self.clients.matchAll()).then(all => all.forEach(c => c.navigate(c.url)));
-		} else {
-			onClientMessage(event);
-		}
-	});
-});

style.css

@@ -1,28 +0,0 @@
-body {
-	padding: 2rem;
-	font-family: -apple-system, BlinkMacSystemFont, "Arial", sans-serif;
-}
-
-h1 {
-	font-size: 16px;
-	margin-top: 0;
-}
-
-p {
-	color: rgb(107, 114, 128);
-	font-size: 15px;
-	margin-bottom: 10px;
-	margin-top: 5px;
-}
-
-.card {
-	max-width: 620px;
-	margin: 0 auto;
-	padding: 16px;
-	border: 1px solid lightgray;
-	border-radius: 16px;
-}
-
-.card p:last-child {
-	margin-bottom: 0;
-}