asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #48250 from Faless/js/3.x_pwa_final

Browse source
This commit is contained in:
Rémi Verschelde 2021-04-28 16:41:16 +02:00 • committed by GitHub
commit 581afc76df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 552 additions and 253 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
misc/dist/html/full-size.html vendored
View file

@ -3,7 +3,6 @@
<head> <head>
<meta charset='utf-8' /> <meta charset='utf-8' />
<meta name='viewport' content='width=device-width, user-scalable=no' /> <meta name='viewport' content='width=device-width, user-scalable=no' />
<link id='-gd-engine-icon' rel='icon' type='image/png' href='favicon.png' />
<title>$GODOT_PROJECT_NAME</title> <title>$GODOT_PROJECT_NAME</title>
<style type='text/css'> <style type='text/css'>

42
misc/dist/html/offline-export.html vendored Normal file
View file

@ -0,0 +1,42 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>You are offline</title>
<style>
html {
background-color: #000000;
color: #ffffff;
}
body {
font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
margin: 2rem;
}
p {
margin-block: 1rem;
}
button {
display: block;
padding: 1rem 2rem;
margin: 3rem auto 0;
}
</style>
</head>
<body>
<h1>You are offline</h1>
<p>This application requires an Internet connection to run for the first time.</p>
<p>Press the button below to try reloading:</p>
<button type="button">Reload</button>
<script>
document.querySelector("button").addEventListener("click", () => {
window.location.reload();
});
</script>
</body>
</html>

17
misc/dist/html/service-worker.js vendored
View file

@ -5,22 +5,11 @@
// previously cached resources to be updated from the network. // previously cached resources to be updated from the network.
const CACHE_VERSION = "@GODOT_VERSION@"; const CACHE_VERSION = "@GODOT_VERSION@";
const CACHE_NAME = "@GODOT_NAME@-cache"; const CACHE_NAME = "@GODOT_NAME@-cache";
const OFFLINE_URL = "offline.html"; const OFFLINE_URL = "@GODOT_OFFLINE_PAGE@";
// Files that will be cached on load. // Files that will be cached on load.
const CACHED_FILES = [ const CACHED_FILES = @GODOT_CACHE@;
"godot.tools.html",
"offline.html",
"godot.tools.js",
"godot.tools.worker.js",
"godot.tools.audio.worklet.js",
"logo.svg",
"favicon.png",
];
// Files that we might not want the user to preload, and will only be cached on first load. // Files that we might not want the user to preload, and will only be cached on first load.
const CACHABLE_FILES = [ const CACHABLE_FILES = @GODOT_OPT_CACHE@;
"godot.tools.wasm",
];
const FULL_CACHE = CACHED_FILES.concat(CACHABLE_FILES); const FULL_CACHE = CACHED_FILES.concat(CACHABLE_FILES);
self.addEventListener("install", (event) => { self.addEventListener("install", (event) => {

24
platform/javascript/emscripten_helpers.py
View file

@ -1,4 +1,4 @@
import os import os, json
from SCons.Util import WhereIs from SCons.Util import WhereIs
@ -59,7 +59,23 @@ def create_template_zip(env, js, wasm, extra):
if env["tools"]: if env["tools"]:
# HTML # HTML
html = "#misc/dist/html/editor.html" html = "#misc/dist/html/editor.html"
subst_dict = {"@GODOT_VERSION@": get_build_version(), "@GODOT_NAME@": "GodotEngine"} cache = [
"godot.tools.html",
"offline.html",
"godot.tools.js",
"godot.tools.worker.js",
"godot.tools.audio.worklet.js",
"logo.svg",
"favicon.png",
]
opt_cache = ["godot.tools.wasm"]
subst_dict = {
"@GODOT_VERSION@": get_build_version(),
"@GODOT_NAME@": "GodotEngine",
"@GODOT_CACHE@": json.dumps(cache),
"@GODOT_OPT_CACHE@": json.dumps(opt_cache),
"@GODOT_OFFLINE_PAGE@": "offline.html",
}
html = env.Substfile(target="#bin/godot${PROGSUFFIX}.html", source=html, SUBST_DICT=subst_dict) html = env.Substfile(target="#bin/godot${PROGSUFFIX}.html", source=html, SUBST_DICT=subst_dict)
in_files.append(html) in_files.append(html)
out_files.append(zip_dir.File(binary_name + ".html")) out_files.append(zip_dir.File(binary_name + ".html"))
@ -82,6 +98,10 @@ def create_template_zip(env, js, wasm, extra):
# HTML # HTML
in_files.append("#misc/dist/html/full-size.html") in_files.append("#misc/dist/html/full-size.html")
out_files.append(zip_dir.File(binary_name + ".html")) out_files.append(zip_dir.File(binary_name + ".html"))
in_files.append(service_worker)
out_files.append(zip_dir.File(binary_name + ".service.worker.js"))
in_files.append("#misc/dist/html/offline-export.html")
out_files.append(zip_dir.File("godot.offline.html"))
zip_files = env.InstallAs(out_files, in_files) zip_files = env.InstallAs(out_files, in_files)
env.Zip( env.Zip(

721
platform/javascript/export/export.cpp
View file

File diff suppressed because it is too large Load diff