Merge branch 'master' of https://github.com/JohannesDeml/UnityWebGL-LoadingTest into 2022.3

JohannesDeml · JohannesDeml · commit 25040515711d · 2024-06-06T16:50:17.000Z
diff --git a/.github/scripts/add-tags.sh b/.github/scripts/add-tags.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+# This script creates tags for the given unity version to trigger the release workflow
+# example usage
+# sh add-tags.sh "6000.0.0f1" -> Creates tags for non-urp version
+# sh add-tags.sh "6000.0.0f1" "true" -> Creates tags for urp version
+
+# Input parameters
+UNITY_VERSION=$1
+IS_URP=${2:-"false"}
+echo "Running add_tags.sh with UNITY_VERSION: $UNITY_VERSION, IS_URP: $IS_URP"
+
+# Extract the value before the first dot as an integer
+MAJOR_VERSION=$(echo $UNITY_VERSION | cut -d. -f1)
+BRANCH_NAME=${GITHUB_REF#refs/heads/}
+
+TAG_PREFIX=$UNITY_VERSION
+if [[ "$IS_URP" == "true" ]]
+then
+TAG_PREFIX=$UNITY_VERSION-urp
+fi
+
+if [[ "$MAJOR_VERSION" -lt "2023" ]]
+then
+git tag -a -f $TAG_PREFIX-minsize-webgl1 -m "[Automated workflow] Created by upgrade-unity"
+git tag -a -f $TAG_PREFIX-webgl1 -m "[Automated workflow] Created by upgrade-unity"
+else
+git tag -a -f $TAG_PREFIX-minsize-webgl2 -m "[Automated workflow] Created by upgrade-unity"
+fi
+# Push tags in between - pushing more than 3 tags won't trigger tag workflows
+git push origin -f --tags
+
+git tag -a -f $TAG_PREFIX-webgl2 -m "[Automated workflow] Created by upgrade-unity"
+git tag -a -f $TAG_PREFIX-webgl2-debug -m "[Automated workflow] Created by upgrade-unity"
+
+if [[ "$MAJOR_VERSION" -ge "6000" ]]
+then
+git tag -a -f $TAG_PREFIX-webgpu -m "[Automated workflow] Created by upgrade-unity"
+fi
+
+git push origin -f --tags
diff --git a/.github/workflows/upgrade-unity.yml b/.github/workflows/upgrade-unity.yml
@@ -168,35 +168,15 @@ jobs:
       - name: Add tags
         if: ${{ inputs.createTags || inputs.tagsOnly }}
         run: |
-          # Extract the first four characters of UNITY_VERSION
-          MAJOR_VERSION=${UNITY_VERSION:0:4}
           BRANCH_NAME=${GITHUB_REF#refs/heads/}
 
-          TAG_PREFIX=$UNITY_VERSION
-          if [[ "$BRANCH_NAME" == *"urp"* ]]
-          then
-            TAG_PREFIX=$UNITY_VERSION-urp
-          fi
-
-          if [[ "$MAJOR_VERSION" < "2023" ]]
-          then
-            git tag -a -f $TAG_PREFIX-minsize-webgl1 -m "[Automated workflow] Created by upgrade-unity"
-            git tag -a -f $TAG_PREFIX-webgl1 -m "[Automated workflow] Created by upgrade-unity"
-          else
-            git tag -a -f $TAG_PREFIX-minsize-webgl2 -m "[Automated workflow] Created by upgrade-unity"
-          fi
-          # Push tags in between - pushing more than 3 tags won't trigger tag workflows
-          git push origin -f --tags
-
-          git tag -a -f $TAG_PREFIX-webgl2 -m "[Automated workflow] Created by upgrade-unity"
-          git tag -a -f $TAG_PREFIX-webgl2-debug -m "[Automated workflow] Created by upgrade-unity"
-
-          if [[ "$MAJOR_VERSION" >= "6000" ]]
-          then
-            git tag -a -f $TAG_PREFIX-webgpu -m "[Automated workflow] Created by upgrade-unity"
+          IS_URP=false
+          if [[ "$BRANCH_NAME" == *"urp"* ]]; then
+            IS_URP=true
           fi
 
-          git push origin -f --tags
+          # Run add tags script
+          ./.github/scripts/add-tags.sh "$UNITY_VERSION" "$IS_URP"
         env:
           UNITY_VERSION: ${{ inputs.unityVersion }}
 
diff --git a/Assets/WebGLTemplates/Develop/index.html b/Assets/WebGLTemplates/Develop/index.html
@@ -4,6 +4,11 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link rel="stylesheet" href="debug-console.css">
+  <!-- Start loading assets right away, to have them (partly) loaded already when they are requested -->
+  <link rel="preload" href="Build//{{{ DATA_FILENAME }}}" as="fetch" type="application/octet-stream" crossorigin>
+  <link rel="preload" href="Build/{{{ FRAMEWORK_FILENAME }}}" as="script">
+  <link rel="preload" href="Build/{{{ CODE_FILENAME }}}" as="fetch" type="application/wasm" crossorigin>
   <title>{{{ PRODUCT_NAME }}}</title>
   <style>
     * {
@@ -113,7 +118,6 @@
       transition: 400ms linear;
     }
   </style>
-  <link rel="stylesheet" href="debug-console.css">
 </head>
 
 <body>
diff --git a/Assets/WebGLTemplates/Release/index.html b/Assets/WebGLTemplates/Release/index.html
@@ -4,6 +4,10 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <!-- Start loading assets right away, to have them (partly) loaded already when they are requested -->
+  <link rel="preload" href="Build//{{{ DATA_FILENAME }}}" as="fetch" type="application/octet-stream" crossorigin>
+  <link rel="preload" href="Build/{{{ FRAMEWORK_FILENAME }}}" as="script">
+  <link rel="preload" href="Build/{{{ CODE_FILENAME }}}" as="fetch" type="application/wasm" crossorigin>
   <title>{{{ PRODUCT_NAME }}}</title>
   <style>
     * {
diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
 
 ![Preview](./preview.png)
 
-[![](https://img.shields.io/github/release-date/JohannesDeml/UnityWebGL-LoadingTest.svg)](https://github.com/JohannesDeml/UnityWebGL-LoadingTest/releases) [![Tested up to Unity 2023.2](https://img.shields.io/badge/tested%20up%20to%20unity-2023.2-green.svg?logo=unity&cacheSeconds=2592000)](https://unity3d.com/get-unity/download/archive)
+[![](https://img.shields.io/github/release-date/JohannesDeml/UnityWebGL-LoadingTest.svg)](https://github.com/JohannesDeml/UnityWebGL-LoadingTest/releases) [![Tested up to Unity 6](https://img.shields.io/badge/tested%20up%20to%20unity-6000.0-green.svg?logo=unity&cacheSeconds=2592000)](https://unity3d.com/get-unity/download/archive)
 
-*Testing Unity's WebGL size and loading time for different versions (2018.4 - 2023.2) and platforms*
+*Testing Unity's WebGL size and loading time for different versions (2018.4 - 6000.0) and platforms*
 
 * [Unity Forum Thread](https://forum.unity.com/threads/webgl-builds-for-mobile.545877/)
 * [Overview page of all builds](https://deml.io/experiments/unity-webgl/)
@@ -26,6 +26,7 @@
 * Github Actions to automatically build the project and deploy it on the server via [Game CI](https://game.ci/)
 * Works with [Unity WebGL Publisher](https://play.unity.com/discover/all-showcases) (Use  [2020.3-lts](https://github.com/JohannesDeml/UnityWebGL-LoadingTest/tree/2020-lts) or [2020.3-lts-urp](https://github.com/JohannesDeml/UnityWebGL-LoadingTest/tree/2020-lts-urp) branch)
 * Tracking multiple Unity versions starting from 2018.4
+* Build targets for webgl1, webgl2 and webgpu
 
 ## Live Demos
 
@@ -125,7 +126,7 @@ Version | Size | Link
 * There are some combinations for **iOS** that have **problems**: With recent versions **URP with WebGL 1** does not work at all and **builtin render pipeline with WebGL 2** has performance problems or might not load at all. I recommend to either use URP with WebGL2 or builtin with WebGL1, if you are targeting iOS. You can always test the builds on your device, to see which combination might fit your needs: https://deml.io/experiments/unity-webgl/
 * If you want to use this project as a basis for your project, be sure to select the release/branch for your unity version. Beta versions oftentimes have problems, therefore I would recommend to use the latest LTS version to run your project.
 * The server is configured to support wasm streaming and brotli compression, see [.htaccess 2020](./Configuration/2020/.htaccess)  [.htaccess 2019](./Configuration/2019/.htaccess)
-* Some servers (such as itch.io) don't support brotli compression, you should then use gzip compression instead. If brotli is misconfigured or not supported you will get an error along the lines of:
+* Due to the odd way that Unity does brotli compression, some servers (such as itch.io) don't support it, you should [learn how to manually compress your game](https://miltoncandelero.github.io/unity-webgl-compression) or use gzip compression instead. If brotli is misconfigured or not supported you will get an error along the lines of:
   ```
   Unable to parse Build/WEBGL.framework.js.br! This can happen if build compression was enabled but web server hosting the content was misconfigured to not serve the file with HTTP Response Header "Content-Encoding: br" present. Check browser Console and Devtools Network tab to debug.
   ```
