Spaces:

Mistral-AI-Game-Jam
/

ParentalControl

Running on A10G

App Files Files Community

GitLab CI commited on Jan 24

Commit

c8cf522

1 Parent(s): 95b8b96

Update game build from GitLab CI

Browse files

Files changed (8) hide show

server/static/godot/index.apple-touch-icon.png +0 -0
server/static/godot/index.audio.worklet.js +2 -2
server/static/godot/index.html +102 -151
server/static/godot/index.icon.png +0 -0
server/static/godot/index.js +0 -0
server/static/godot/index.pck +0 -0
server/static/godot/index.wasm +2 -2
server/static/godot/index.worker.js +0 -161

server/static/godot/index.apple-touch-icon.png CHANGED Viewed

server/static/godot/index.audio.worklet.js CHANGED Viewed

@@ -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.');
 			}
 		}
 		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.process_notify();

 				GodotProcessor.write_input(this.input_buffer, input);
 				this.input.write(this.input_buffer);
 			} else {
+				// 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);
 					this.port.postMessage({ 'cmd': 'read', 'data': chunk });
 				}
 			} else {
+				// this.port.postMessage('Output buffer has not enough frames! Skipping output frame.'); // Uncomment this line to debug output buffer.
 			}
 		}
 		this.process_notify();

server/static/godot/index.html CHANGED Viewed

@@ -2,197 +2,125 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, user-scalable=no">
 		<title>Magame</title>
 		<style>
-body {
-	touch-action: none;
 	margin: 0;
-	border: 0 none;
 	padding: 0;
-	text-align: center;
 	background-color: black;
 }
 #canvas {
 	display: block;
-	margin: 0;
-	color: white;
 }
 #canvas:focus {
 	outline: none;
 }
-.godot {
-	font-family: 'Noto Sans', 'Droid Sans', Arial, sans-serif;
-	color: #e0e0e0;
-	background-color: #3b3943;
-	background-image: linear-gradient(to bottom, #403e48, #35333c);
-	border: 1px solid #45434e;
-	box-shadow: 0 0 1px 1px #2f2d35;
-}
-/* Status display */
-#status {
 	position: absolute;
 	left: 0;
-	top: 0;
 	right: 0;
 	bottom: 0;
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	/* don't consume click events - make children visible explicitly */
 	visibility: hidden;
 }
-#status-progress {
-	width: 366px;
-	height: 7px;
-	background-color: #38363A;
-	border: 1px solid #444246;
-	padding: 1px;
-	box-shadow: 0 0 2px 1px #1B1C22;
-	border-radius: 2px;
-	visibility: visible;
-}
-@media only screen and (orientation:portrait) {
-	#status-progress {
-		width: 61.8%;
-	}
-}
-#status-progress-inner {
-	height: 100%;
-	width: 0;
-	box-sizing: border-box;
-	transition: width 0.5s linear;
-	background-color: #202020;
-	border: 1px solid #222223;
-	box-shadow: 0 0 1px 1px #27282E;
-	border-radius: 3px;
 }
-#status-indeterminate {
-	height: 42px;
-	visibility: visible;
-	position: relative;
 }
-#status-indeterminate > div {
-	width: 4.5px;
-	height: 0;
-	border-style: solid;
-	border-width: 9px 3px 0 3px;
-	border-color: #2b2b2b transparent transparent transparent;
-	transform-origin: center 21px;
-	position: absolute;
 }
-#status-indeterminate > div:nth-child(1) { transform: rotate( 22.5deg); }
-#status-indeterminate > div:nth-child(2) { transform: rotate( 67.5deg); }
-#status-indeterminate > div:nth-child(3) { transform: rotate(112.5deg); }
-#status-indeterminate > div:nth-child(4) { transform: rotate(157.5deg); }
-#status-indeterminate > div:nth-child(5) { transform: rotate(202.5deg); }
-#status-indeterminate > div:nth-child(6) { transform: rotate(247.5deg); }
-#status-indeterminate > div:nth-child(7) { transform: rotate(292.5deg); }
-#status-indeterminate > div:nth-child(8) { transform: rotate(337.5deg); }
 #status-notice {
-	margin: 0 100px;
 	line-height: 1.3;
-	visibility: visible;
-	padding: 4px 6px;
-	visibility: visible;
 }
 		</style>
-		<link id='-gd-engine-icon' rel='icon' type='image/png' href='index.icon.png' />
-<link rel='apple-touch-icon' href='index.apple-touch-icon.png'/>
 	</head>
 	<body>
 		<canvas id="canvas">
-			HTML5 canvas appears to be unsupported in the current browser.<br >
-			Please try updating or use a different browser.
 		</canvas>
 		<div id="status">
-			<div id="status-progress" style="display: none;" oncontextmenu="event.preventDefault();">
-				<div id ="status-progress-inner"></div>
-			</div>
-			<div id="status-indeterminate" style="display: none;" oncontextmenu="event.preventDefault();">
-				<div></div>
-				<div></div>
-				<div></div>
-				<div></div>
-				<div></div>
-				<div></div>
-				<div></div>
-				<div></div>
-			</div>
-			<div id="status-notice" class="godot" style="display: none;"></div>
 		</div>
 		<script src="index.js"></script>
 		<script>
-const GODOT_CONFIG = {"args":[],"canvasResizePolicy":2,"executable":"index","experimentalVK":false,"fileSizes":{"index.pck":207184,"index.wasm":35410474},"focusCanvas":true,"gdextensionLibs":[]};
 const engine = new Engine(GODOT_CONFIG);
 (function () {
-	const INDETERMINATE_STATUS_STEP_MS = 100;
 	const statusProgress = document.getElementById('status-progress');
-	const statusProgressInner = document.getElementById('status-progress-inner');
-	const statusIndeterminate = document.getElementById('status-indeterminate');
 	const statusNotice = document.getElementById('status-notice');
 	let initializing = true;
-	let statusMode = 'hidden';
-	let animationCallbacks = [];
-	function animate(time) {
-		animationCallbacks.forEach((callback) => callback(time));
-		requestAnimationFrame(animate);
-	}
-	requestAnimationFrame(animate);
-	function animateStatusIndeterminate(ms) {
-		const i = Math.floor((ms / INDETERMINATE_STATUS_STEP_MS) % 8);
-		if (statusIndeterminate.children[i].style.borderTopColor === '') {
-			Array.prototype.slice.call(statusIndeterminate.children).forEach((child) => {
-				child.style.borderTopColor = '';
-			});
-			statusIndeterminate.children[i].style.borderTopColor = '#dfdfdf';
-		}
-	}
 	function setStatusMode(mode) {
 		if (statusMode === mode || !initializing) {
 			return;
 		}
-		[statusProgress, statusIndeterminate, statusNotice].forEach((elem) => {
-			elem.style.display = 'none';
-		});
-		animationCallbacks = animationCallbacks.filter(function (value) {
-			return (value !== animateStatusIndeterminate);
-		});
-		switch (mode) {
-		case 'progress':
-			statusProgress.style.display = 'block';
-			break;
-		case 'indeterminate':
-			statusIndeterminate.style.display = 'block';
-			animationCallbacks.push(animateStatusIndeterminate);
-			break;
-		case 'notice':
-			statusNotice.style.display = 'block';
-			break;
-		case 'hidden':
-			break;
-		default:
-			throw new Error('Invalid status mode');
 		}
 		statusMode = mode;
 	}
@@ -208,37 +136,60 @@ const engine = new Engine(GODOT_CONFIG);
 	}
 	function displayFailureNotice(err) {
-		const msg = err.message || err;
-		console.error(msg);
-		setStatusNotice(msg);
 		setStatusMode('notice');
 		initializing = false;
 	}
-	const missing = Engine.getMissingFeatures();
 	if (missing.length !== 0) {
-		const missingMsg = 'Error\nThe following features required to run Godot projects on the Web are missing:\n';
-		displayFailureNotice(missingMsg + missing.join('\n'));
 	} else {
-		setStatusMode('indeterminate');
 		engine.startGame({
 			'onProgress': function (current, total) {
-				if (total > 0) {
-					statusProgressInner.style.width = `${(current / total) * 100}%`;
-					setStatusMode('progress');
-					if (current === total) {
-						// wait for progress bar animation
-						setTimeout(() => {
-							setStatusMode('indeterminate');
-						}, 500);
-					}
 				} else {
-					setStatusMode('indeterminate');
 				}
 			},
 		}).then(() => {
 			setStatusMode('hidden');
-			initializing = false;
 		}, displayFailureNotice);
 	}
 }());

 <html lang="en">
 	<head>
 		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0">
 		<title>Magame</title>
 		<style>
+html, body, #canvas {
 	margin: 0;
 	padding: 0;
+	border: 0;
+}
+body {
+	color: white;
 	background-color: black;
+	overflow: hidden;
+	touch-action: none;
 }
 #canvas {
 	display: block;
 }
 #canvas:focus {
 	outline: none;
 }
+#status, #status-splash, #status-progress {
 	position: absolute;
 	left: 0;
 	right: 0;
+}
+#status, #status-splash {
+	top: 0;
 	bottom: 0;
+}
+#status {
+	background-color: #242424;
 	display: flex;
+	flex-direction: column;
 	justify-content: center;
 	align-items: center;
 	visibility: hidden;
 }
+#status-splash {
+	max-height: 100%;
+	max-width: 100%;
+	margin: auto;
 }
+#status-progress, #status-notice {
+	display: none;
 }
+#status-progress {
+	bottom: 10%;
+	width: 50%;
+	margin: 0 auto;
 }
 #status-notice {
+	background-color: #5b3943;
+	border-radius: 0.5rem;
+	border: 1px solid #9b3943;
+	color: #e0e0e0;
+	font-family: 'Noto Sans', 'Droid Sans', Arial, sans-serif;
 	line-height: 1.3;
+	margin: 0 2rem;
+	overflow: hidden;
+	padding: 1rem;
+	text-align: center;
+	z-index: 1;
 }
 		</style>
+		<link id="-gd-engine-icon" rel="icon" type="image/png" href="index.icon.png" />
+<link rel="apple-touch-icon" href="index.apple-touch-icon.png"/>
 	</head>
 	<body>
 		<canvas id="canvas">
+			Your browser does not support the canvas tag.
 		</canvas>
+		<noscript>
+			Your browser does not support JavaScript.
+		</noscript>
 		<div id="status">
+			<img id="status-splash" src="index.png" alt="">
+			<progress id="status-progress"></progress>
+			<div id="status-notice"></div>
 		</div>
 		<script src="index.js"></script>
 		<script>
+const GODOT_CONFIG = {"args":[],"canvasResizePolicy":2,"ensureCrossOriginIsolationHeaders":false,"executable":"index","experimentalVK":false,"fileSizes":{"index.pck":210672,"index.wasm":35376909},"focusCanvas":true,"gdextensionLibs":[]};
+const GODOT_THREADS_ENABLED = false;
 const engine = new Engine(GODOT_CONFIG);
 (function () {
+	const statusOverlay = document.getElementById('status');
 	const statusProgress = document.getElementById('status-progress');
 	const statusNotice = document.getElementById('status-notice');
 	let initializing = true;
+	let statusMode = '';
 	function setStatusMode(mode) {
 		if (statusMode === mode || !initializing) {
 			return;
 		}
+		if (mode === 'hidden') {
+			statusOverlay.remove();
+			initializing = false;
+			return;
 		}
+		statusOverlay.style.visibility = 'visible';
+		statusProgress.style.display = mode === 'progress' ? 'block' : 'none';
+		statusNotice.style.display = mode === 'notice' ? 'block' : 'none';
 		statusMode = mode;
 	}
 	}
 	function displayFailureNotice(err) {
+		console.error(err);
+		if (err instanceof Error) {
+			setStatusNotice(err.message);
+		} else if (typeof err === 'string') {
+			setStatusNotice(err);
+		} else {
+			setStatusNotice('An unknown error occured');
+		}
 		setStatusMode('notice');
 		initializing = false;
 	}
+	const missing = Engine.getMissingFeatures({
+		threads: GODOT_THREADS_ENABLED,
+	});
 	if (missing.length !== 0) {
+		if (GODOT_CONFIG['serviceWorker'] && GODOT_CONFIG['ensureCrossOriginIsolationHeaders'] && 'serviceWorker' in navigator) {
+			// There's a chance that installing the service worker would fix the issue
+			Promise.race([
+				navigator.serviceWorker.getRegistration().then((registration) => {
+					if (registration != null) {
+						return Promise.reject(new Error('Service worker already exists.'));
+					}
+					return registration;
+				}).then(() => engine.installServiceWorker()),
+				// For some reason, `getRegistration()` can stall
+				new Promise((resolve) => {
+					setTimeout(() => resolve(), 2000);
+				}),
+			]).catch((err) => {
+				console.error('Error while registering service worker:', err);
+			}).then(() => {
+				window.location.reload();
+			});
+		} else {
+			// Display the message as usual
+			const missingMsg = 'Error\nThe following features required to run Godot projects on the Web are missing:\n';
+			displayFailureNotice(missingMsg + missing.join('\n'));
+		}
 	} else {
+		setStatusMode('progress');
 		engine.startGame({
 			'onProgress': function (current, total) {
+				if (current > 0 && total > 0) {
+					statusProgress.value = current;
+					statusProgress.max = total;
 				} else {
+					statusProgress.removeAttribute('value');
+					statusProgress.removeAttribute('max');
 				}
 			},
 		}).then(() => {
 			setStatusMode('hidden');
 		}, displayFailureNotice);
 	}
 }());

server/static/godot/index.icon.png CHANGED Viewed

server/static/godot/index.js CHANGED Viewed

The diff for this file is too large to render. See raw diff

server/static/godot/index.pck CHANGED Viewed

Binary files a/server/static/godot/index.pck and b/server/static/godot/index.pck differ

server/static/godot/index.wasm CHANGED Viewed

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f5082a4e3d191de748c21ba54b8490614c4ca4a092c6db3f35a40e5183d459bd
-size 35410474

 version https://git-lfs.github.com/spec/v1
+oid sha256:fe5cebc590758c10bc4469be5a591e28edbde5ec8f458f21baeb83db50d028b9
+size 35376909

server/static/godot/index.worker.js DELETED Viewed

@@ -1,161 +0,0 @@
-/**
- * @license
- * Copyright 2015 The Emscripten Authors
- * SPDX-License-Identifier: MIT
- */
-// Pthread Web Worker startup routine:
-// This is the entry point file that is loaded first by each Web Worker
-// that executes pthreads on the Emscripten application.
-'use strict';
-var Module = {};
-// Thread-local guard variable for one-time init of the JS state
-var initializedJS = false;
-function assert(condition, text) {
-  if (!condition) abort('Assertion failed: ' + text);
-}
-function threadPrintErr() {
-  var text = Array.prototype.slice.call(arguments).join(' ');
-  console.error(text);
-}
-function threadAlert() {
-  var text = Array.prototype.slice.call(arguments).join(' ');
-  postMessage({cmd: 'alert', text: text, threadId: Module['_pthread_self']()});
-}
-// We don't need out() for now, but may need to add it if we want to use it
-// here. Or, if this code all moves into the main JS, that problem will go
-// away. (For now, adding it here increases code size for no benefit.)
-var out = () => { throw 'out() is not defined in worker.js.'; }
-var err = threadPrintErr;
-self.alert = threadAlert;
-Module['instantiateWasm'] = (info, receiveInstance) => {
-  // Instantiate from the module posted from the main thread.
-  // We can just use sync instantiation in the worker.
-  var module = Module['wasmModule'];
-  // We don't need the module anymore; new threads will be spawned from the main thread.
-  Module['wasmModule'] = null;
-  var instance = new WebAssembly.Instance(module, info);
-  // TODO: Due to Closure regression https://github.com/google/closure-compiler/issues/3193,
-  // the above line no longer optimizes out down to the following line.
-  // When the regression is fixed, we can remove this if/else.
-  return receiveInstance(instance);
-}
-// Turn unhandled rejected promises into errors so that the main thread will be
-// notified about them.
-self.onunhandledrejection = (e) => {
-  throw e.reason ?? e;
-};
-function handleMessage(e) {
-  try {
-    if (e.data.cmd === 'load') { // Preload command that is called once per worker to parse and load the Emscripten code.
-    // Until we initialize the runtime, queue up any further incoming messages.
-    let messageQueue = [];
-    self.onmessage = (e) => messageQueue.push(e);
-    // And add a callback for when the runtime is initialized.
-    self.startWorker = (instance) => {
-      Module = instance;
-      // Notify the main thread that this thread has loaded.
-      postMessage({ 'cmd': 'loaded' });
-      // Process any messages that were queued before the thread was ready.
-      for (let msg of messageQueue) {
-        handleMessage(msg);
-      }
-      // Restore the real message handler.
-      self.onmessage = handleMessage;
-    };
-      // Module and memory were sent from main thread
-      Module['wasmModule'] = e.data.wasmModule;
-      // Use `const` here to ensure that the variable is scoped only to
-      // that iteration, allowing safe reference from a closure.
-      for (const handler of e.data.handlers) {
-        Module[handler] = function() {
-          postMessage({ cmd: 'callHandler', handler, args: [...arguments] });
-        }
-      }
-      Module['wasmMemory'] = e.data.wasmMemory;
-      Module['buffer'] = Module['wasmMemory'].buffer;
-      Module['workerID'] = e.data.workerID;
-      Module['ENVIRONMENT_IS_PTHREAD'] = true;
-      if (typeof e.data.urlOrBlob == 'string') {
-        importScripts(e.data.urlOrBlob);
-      } else {
-        var objectUrl = URL.createObjectURL(e.data.urlOrBlob);
-        importScripts(objectUrl);
-        URL.revokeObjectURL(objectUrl);
-      }
-      Godot(Module);
-    } else if (e.data.cmd === 'run') {
-      // Pass the thread address to wasm to store it for fast access.
-      Module['__emscripten_thread_init'](e.data.pthread_ptr, /*isMainBrowserThread=*/0, /*isMainRuntimeThread=*/0, /*canBlock=*/1);
-      // Await mailbox notifications with `Atomics.waitAsync` so we can start
-      // using the fast `Atomics.notify` notification path.
-      Module['__emscripten_thread_mailbox_await'](e.data.pthread_ptr);
-      assert(e.data.pthread_ptr);
-      // Also call inside JS module to set up the stack frame for this pthread in JS module scope
-      Module['establishStackSpace']();
-      Module['PThread'].receiveObjectTransfer(e.data);
-      Module['PThread'].threadInitTLS();
-      if (!initializedJS) {
-        initializedJS = true;
-      }
-      try {
-        Module['invokeEntryPoint'](e.data.start_routine, e.data.arg);
-      } catch(ex) {
-        if (ex != 'unwind') {
-          // The pthread "crashed".  Do not call `_emscripten_thread_exit` (which
-          // would make this thread joinable).  Instead, re-throw the exception
-          // and let the top level handler propagate it back to the main thread.
-          throw ex;
-        }
-      }
-    } else if (e.data.cmd === 'cancel') { // Main thread is asking for a pthread_cancel() on this thread.
-      if (Module['_pthread_self']()) {
-        Module['__emscripten_thread_exit'](-1);
-      }
-    } else if (e.data.target === 'setimmediate') {
-      // no-op
-    } else if (e.data.cmd === 'checkMailbox') {
-      if (initializedJS) {
-        Module['checkMailbox']();
-      }
-    } else if (e.data.cmd) {
-      // The received message looks like something that should be handled by this message
-      // handler, (since there is a e.data.cmd field present), but is not one of the
-      // recognized commands:
-      err('worker.js received unknown command ' + e.data.cmd);
-      err(e.data);
-    }
-  } catch(ex) {
-    err('worker.js onmessage() captured an uncaught exception: ' + ex);
-    if (ex && ex.stack) err(ex.stack);
-    if (Module['__emscripten_thread_crashed']) {
-      Module['__emscripten_thread_crashed']();
-    }
-    throw ex;
-  }
-};
-self.onmessage = handleMessage;