Merge branch 'master' into 2022.3

# Conflicts:
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/ProjectVersion.txt

Author: JohannesDeml

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

@@ -5,7 +5,8 @@
 ### Built version demos
 
 * https://deml.io/experiments/unity-webgl/{{ .unityversion }}-webgl2
-* https://deml.io/experiments/unity-webgl/{{ .unityversion }}-webgl1
+* https://deml.io/experiments/unity-webgl/{{ .unityversion }}-webgl2-debug
+* https://deml.io/experiments/unity-webgl/{{ .unityversion }}-minsize-webgl2
 
 ### Other links
 

Assets/Plugins/WebGL/WebBridge/CommonCommands.cs

@@ -66,6 +66,25 @@ public void LogMemory()
 			WebToolPlugins.LogMemory();
 		}
 
+		/// <summary>
+		/// Logs the rough device memory capped between 0.25 and 8 GB
+		/// Browser Usage: <code>unityGame.SendMessage("WebGL","LogDeviceMemory");</code>
+		/// </summary>
+		[WebCommand(Description = "Logs the device memory")]
+		[ContextMenu(nameof(LogDeviceMemory))]
+		public void LogDeviceMemory()
+		{
+			float deviceMemoryInMb = WebToolPlugins.GetDeviceMemory();
+			if (deviceMemoryInMb > 0)
+			{
+				Debug.Log($"Device Memory: {deviceMemoryInMb} GB");
+			}
+			else
+			{
+				Debug.Log("Device Memory information is not available on this device or browser.");
+			}
+		}
+
 		/// <summary>
 		/// Allocate memory to test memory usage and limits
 		/// The memory will be stored in a list to prevent it from being garbage collected
@@ -192,7 +211,11 @@ public void LogInitializationTime()
 		[WebCommand(Description = "Find GameObject by name and log its components")]
 		public void FindGameObjectByName(string name)
 		{
+#if UNITY_6000_0_OR_NEWER
+			var gameObjects = GameObject.FindObjectsByType<GameObject>(FindObjectsSortMode.None).Where(go => go.name == name).ToArray();
+#else
 			var gameObjects = GameObject.FindObjectsOfType<GameObject>().Where(go => go.name == name).ToArray();
+#endif
 			if (gameObjects.Length == 0)
 			{
 				Debug.Log($"No GameObject found with the name: {name}");

Assets/Plugins/WebGL/WebBridge/WebBridge.cs

@@ -70,12 +70,14 @@ private static void AddAllWebCommands()
 		private static void SetGlobalVariables()
 		{
 			var graphicsDevice = SystemInfo.graphicsDeviceType;
-			string webGraphics = string.Empty;
+			string webGraphics;
 			switch (graphicsDevice)
 			{
+#if !UNITY_2023_1_OR_NEWER
 				case GraphicsDeviceType.OpenGLES2:
 					webGraphics = "WebGL 1";
 					break;
+#endif
 				case GraphicsDeviceType.OpenGLES3:
 					webGraphics = "WebGL 2";
 					break;

Assets/Plugins/WebGL/WebTools/WebToolPlugins.cs

@@ -35,6 +35,8 @@ public static class WebToolPlugins
 		[DllImport("__Internal")]
 		private static extern uint _GetTotalMemorySize();
 		[DllImport("__Internal")]
+		private static extern uint _GetDeviceMemorySize();
+		[DllImport("__Internal")]
 		private static extern bool _CopyToClipboard(string text);
 		[DllImport("__Internal")]
 		private static extern int _IsOnline();
@@ -191,6 +193,29 @@ public static float GetTotalMemorySize()
 #endif
 		}
 
+		/// <summary>
+		/// Get the device memory size in MB if supported by the browser
+		/// Uses navigator.deviceMemory which is supported by chromium based browsers
+		/// <see href="https://developer.mozilla.org/en-US/docs/Web/API/Navigator/deviceMemory"/>
+		/// </summary>
+		/// <returns>Size in MB or -1 if not supported</returns>
+		public static float GetDeviceMemory()
+		{
+#if UNITY_WEBGL && !UNITY_EDITOR
+			var gb = _GetDeviceMemorySize();
+			if (gb > 0)
+			{
+				return gb * 1024f; // convert to MB
+			}
+			return -1f;
+#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
+			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(GetDeviceMemory)} called");
+			return -1f;
+#else
+			return -1f;
+#endif
+		}
+
 		/// <summary>
 		/// Get the managed memory size used by the application in MB
 		/// </summary>

Assets/Plugins/WebGL/WebTools/WebToolPlugins.jslib

@@ -99,6 +99,14 @@ var WebGlPlugins =
         return -1;
     },
 
+    _GetDeviceMemorySize: function()
+    {
+        if(navigator.deviceMemory) {
+            return navigator.deviceMemory;
+        }
+        return -1;
+    },
+
     _CopyToClipboard: function(text) {
         var str = UTF8ToString(text);
         navigator.clipboard.writeText(str)

ProjectSettings/ProjectSettings.asset

@@ -18,7 +18,7 @@ PlayerSettings:
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
   m_ShowUnitySplashScreen: 0
-  m_ShowUnitySplashLogo: 1
+  m_ShowUnitySplashLogo: 0
   m_SplashScreenOverlayOpacity: 1
   m_SplashScreenAnimation: 1
   m_SplashScreenLogoStyle: 0

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 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)
+[![](https://img.shields.io/github/release-date/JohannesDeml/UnityWebGL-LoadingTest.svg)](https://github.com/JohannesDeml/UnityWebGL-LoadingTest/releases) [![Tested up to Unity 6.1](https://img.shields.io/badge/tested%20up%20to%20unity-6000.1-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 - 6000.0) and settings*
+*Testing Unity's WebGL size and loading time for different versions (2018.4 - 6000.1) and settings*
 
 * [Overview page of all builds](https://deml.io/experiments/unity-webgl/)
 * [Implementation in Godot](https://github.com/JohannesDeml/Godot-Web-LoadingTest)