Merge branch 'master' into 2022.2

Author: JohannesDeml

.github/templates/upgrade-unity-pr-body.md

@@ -0,0 +1,14 @@
+## [Automated Workflow] Upgrade unity to {{ .unityversion }}
+
+>  [workflow file](https://github.com/JohannesDeml/UnityWebGL-LoadingTest/blob/master/.github/workflows/upgrade-unity.yml) using [create-pull-request](https://github.com/peter-evans/create-pull-request) & [render-template](https://github.com/chuhlomin/render-template)
+
+### Built version demos
+
+* https://deml.io/experiments/unity-webgl/{{ .unityversion }}-webgl2
+* https://deml.io/experiments/unity-webgl/{{ .unityversion }}-webgl1
+
+### Other links
+
+* [All builds](https://deml.io/experiments/unity-webgl)
+* [Game CI docker images](https://game.ci/docs/docker/versions)
+* [Unity Download Archive](https://unity.com/releases/editor/archive) 

.github/workflows/upgrade-unity.yml

@@ -1,4 +1,5 @@
 # Manually upgrade unity and update packages
+# Check if the Unity version already exists as a docker image: https://game.ci/docs/docker/versions
 name: Upgrade Unity version
 
 on:
@@ -117,14 +118,23 @@ jobs:
           GIT_USER: ${{ github.actor }}
 
 
+      - name: Render template
+        id: template
+        uses: chuhlomin/render-template@v1.4
+        with:
+          template: .github/templates/upgrade-unity-pr-body.md
+          vars: |
+            unityversion: ${{ steps.upgrade_name.outputs.NAME }}
+
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.PR_GITHUB_TOKEN }}
           commit-message: "[Automated workflow] upgrade-unity from ${{steps.last_unity_version.outputs.VERSION}} to ${{ inputs.unityVersion }}"
           branch: "ci/upgrade-unity/from-${{steps.last_unity_version.outputs.VERSION}}-to-${{ steps.upgrade_name.outputs.NAME }}"
           delete-branch: true
-          title: "[Automated workflow] upgrade-unity from ${{steps.last_unity_version.outputs.VERSION}} to ${{ inputs.unityVersion }} - URP: ${{ inputs.urp }}"
+          title: "[Automated workflow] upgrade-unity from ${{steps.last_unity_version.outputs.VERSION}} to ${{ steps.upgrade_name.outputs.NAME }}"
+          body: ${{ steps.template.outputs.result }}
 
       - name: Add tags
         run: |

Assets/Plugins/WebGL/WebGLTools/WebGlBridge.Commands.cs

@@ -8,6 +8,8 @@
 // </author>
 // --------------------------------------------------------------------------------------------------------------------
 
+using System;
+using System.Collections.Generic;
 using Supyrb.Attributes;
 using UnityEngine;
 
@@ -125,5 +127,39 @@ public void LogMessage(string message)
 		{
 			Debug.Log(message);
 		}
+		
+		/// <summary>
+		/// Log information of all texture formats that Unity supports, which ones are supported by
+		/// the current platform and browser, and which ones are not supported
+		/// </summary>
+		[WebGlCommand(Description = "Log supported and unsupported texture formats")]
+		public void LogTextureSupport()
+		{
+			List<TextureFormat> supportedFormats = new List<TextureFormat>();
+			List<TextureFormat> unsupportedFormats = new List<TextureFormat>();
+
+			foreach (TextureFormat textureFormat in Enum.GetValues(typeof(TextureFormat)))
+			{
+				var memberInfos = typeof(TextureFormat).GetMember(textureFormat.ToString());
+				object[] obsoleteAttributes = memberInfos[0].GetCustomAttributes(typeof(ObsoleteAttribute), false);
+				if (obsoleteAttributes.Length > 0)
+				{
+					// don't evaluate obsolete enum values
+					continue;
+				}
+
+				if (SystemInfo.SupportsTextureFormat(textureFormat))
+				{
+					supportedFormats.Add(textureFormat);
+				}
+				else
+				{
+					unsupportedFormats.Add(textureFormat);
+				}
+			}
+			
+			Debug.Log($"Supported Texture formats: \n{string.Join(", ", supportedFormats)}");
+			Debug.Log($"Unsupported Texture formats: \n{string.Join(", ", unsupportedFormats)}");
+		}
 	} 
 }

Assets/WebGLTemplates/Develop/debug-console.css

@@ -68,6 +68,10 @@
     content: '🛑';
 }
 
+#debugConsole .console-top-bar .timestamp-button .icon::before {
+    content: '🕰️';
+}
+
 #debugConsole .console-top-bar .separator {
     position: relative;
     flex-shrink: 0;
@@ -107,6 +111,14 @@
     display:none;
 }
 
+#debugConsole .timestamplog {
+    color: #888;
+}
+
+#debugConsole.hidelogtimestamps .timestamplog {
+    display: none;
+}
+
 #debugConsole .entry.warn {
     color: rgb(82, 70, 3);
     background-color: rgba(231, 196, 41, 0.9);
@@ -131,6 +143,10 @@
     border-bottom: 3px solid yellowgreen;
 }
 
+#debugConsole .timestamp-button.show {
+    border-bottom: 3px solid yellowgreen;
+}
+
 #debugConsole .bubble-click-indicator:before {
     content: attr(data-before);
     ;

Assets/WebGLTemplates/Develop/debug-console.js

@@ -31,9 +31,13 @@ function getCookie(cname) {
     return "";
 }
 
-var scrollToBottom = false; // Default to false, since continuous erros can overload the system
-if(getCookie("scrollToBottom") === "true") {
-    scrollToBottom = true;
+var scrollToBottom = true;
+if(getCookie("scrollToBottom") === "false") {
+    scrollToBottom = false;
+}
+var addTimestamp = true;
+if(getCookie("addTimestamp") === "false") {
+    addTimestamp = false;
 }
 
 function initialzeDebugConsole() {
@@ -74,6 +78,28 @@ function addDebugConsoleTopBar(debugConsole, consoleDiv) {
     separator.classList.add('separator');
     consoleTopBar.appendChild(separator);
 
+    // Add timestamp toggle
+    var timestampButton = document.createElement('button');
+    timestampButton.classList.add('timestamp-button', 'bubble-click-indicator');
+    timestampButton.title = 'Add timestamp to logs';
+    consoleTopBar.appendChild(timestampButton);
+
+    var timestampIcon = document.createElement('div');
+    timestampIcon.classList.add('icon');
+    timestampButton.appendChild(timestampIcon);
+    applyTimestamp(timestampButton, consoleDiv);
+
+    timestampButton.addEventListener('click', function () {
+        addTimestamp = !addTimestamp;
+        setCookie("addTimestamp", addTimestamp, 365);
+        applyTimestamp(timestampButton, consoleDiv);
+        // Show copy feedback to the user
+        timestampButton.classList.add('active');
+        setTimeout(function () {
+            timestampButton.classList.remove('active');
+        }, 1500);
+    });
+
     // Clear logs button
     var clearButton = document.createElement('button');
     clearButton.classList.add('clear-button', 'bubble-click-indicator');
@@ -207,6 +233,18 @@ function applyScrollToBottom(toBottomButton, consoleDiv) {
     }
 }
 
+function applyTimestamp(timestampButton, consoleDiv) {
+    timestampButton.setAttribute('data-before', addTimestamp ? 'Show' : 'Hide');
+    var debugConsole = document.getElementById('debugConsole');
+    if (addTimestamp) {
+        timestampButton.classList.add("show");
+        debugConsole.classList.remove("hidelogtimestamps");
+    } else {
+        timestampButton.classList.remove("show");
+        debugConsole.classList.add("hidelogtimestamps");
+    }
+}
+
 function setupConsoleLogPipe() {
     // Store actual console log functions
     let defaultConsoleLog = console.log;
@@ -293,10 +331,13 @@ function htmlLog(message, className) {
     consoleDiv.appendChild(entry);
 
     var text = document.createElement('p');
-    // Remove last line break if existing
-    if (message.endsWith("\n")) {
-        message = message.substring(0, message.length - "\n".length);
-    }
+    var time = new Date().toLocaleTimeString('en-US', {
+        hour12: false,
+        hour: "numeric",
+        minute: "numeric",
+        second: "numeric"}
+    );
+    message = "<span class='timestamplog'>[" + time + "] </span>" + message;
     message = message.replaceAll("\n", "<br />");
     text.innerHTML = message;
     entry.appendChild(text);

Assets/WebGLTemplates/Develop/index.html

@@ -11,8 +11,15 @@
       margin: 0;
     }
 
+    html {
+      /* fix mobile viewport menu bar on iOS */
+      height: -webkit-fill-available;
+    }
+
     body {
       height: 100%;
+      /* fix mobile viewport menu bar on iOS */
+      height: -webkit-fill-available;
       width: 100%;
       text-align: center;
     }

Assets/WebGLTemplates/Release/index.html

@@ -11,8 +11,15 @@
       margin: 0;
     }
 
+    html {
+      /* fix mobile viewport menu bar on iOS */
+      height: -webkit-fill-available;
+    }
+
     body {
       height: 100%;
+      /* fix mobile viewport menu bar on iOS */
+      height: -webkit-fill-available;
       width: 100%;
       text-align: center;
     }