Merge branch 'master' into 2023.2

# Conflicts:
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/ProjectSettings.asset
#	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
 

.github/workflows/release.yml

@@ -73,14 +73,24 @@ jobs:
     if: ${{ github.ref == 'refs/heads/master' || needs.variables.outputs.TAG != needs.variables.outputs.UNITY_VERSION }}
     needs: [ variables ]
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           lfs: true
 
+      # Avoid running into space issues for github runners - Docker images can take up quite some space
+      - name: Free Disk Space
+        run: |
+          echo "Disk space before cleanup:"
+          df -h
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/share/boost
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          echo "Disk space after cleanup:"
+          df -h
+
       # Unity 2020 cache is not compatible with older versions
       - name: Unity Library Cache 2020 or higher
         if: ${{ !startsWith(needs.variables.outputs.UNITY_VERSION, '201') }}
@@ -111,6 +121,17 @@ jobs:
           versioning: None
           buildName: ${{ needs.variables.outputs.BUILD_NAME }}
 
+      - name: Check Disk Space After Build
+        run: |
+          echo "Disk space after build:"
+          df -h
+          AVAILABLE=$(df / | tail -1 | awk '{print $4}')
+          AVAILABLE_GB=$(echo $AVAILABLE | sed 's/G//')
+          echo "Available space: ${AVAILABLE_GB}GB"
+          if (( $(echo "$AVAILABLE_GB < 1" | bc -l) )); then
+            echo "::warning::Low disk space! Less than 1GB remaining."
+          fi
+
       - uses: actions/upload-artifact@v4
         with:
           name: ${{ needs.variables.outputs.BUILD_NAME }}

.github/workflows/upgrade-unity.yml

@@ -29,13 +29,16 @@ on:
         required: false
         type: string
         default: '-accept-apiupdate'
+      delayTags:
+        description: 'Delay before force pushing tags (in minutes)'
+        required: false
+        type: number
+        default: 0
 
 jobs:
   upgrade-unity-version:
     name: Upgrade Unity version and packages to ${{ inputs.unityVersion }}
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
     steps:
       - name: Log input parameter
         run: |
@@ -47,6 +50,7 @@ jobs:
           echo "Only create tags: $TAGS_ONLY"
           echo "Merge master into branch: $MERGE_MASTER"
           echo "Custom cli arguments: $CUSTOM_PARAMETERS"
+          echo "Delay tags: $DELAY_TAGS minutes"
           if [[ "$BRANCH_NAME" == *"urp"* ]]
           then
             echo "urp: true"
@@ -59,6 +63,7 @@ jobs:
           TAGS_ONLY: ${{ inputs.tagsOnly }}
           MERGE_MASTER: ${{ inputs.mergeMaster }}
           CUSTOM_PARAMETERS: ${{ inputs.customParameters }}
+          DELAY_TAGS: ${{ inputs.delayTags }}
 
       - uses: actions/checkout@v4
         with:
@@ -75,6 +80,18 @@ jobs:
         env:
           GIT_USER: ${{ github.actor }}
 
+      # Avoid running into space issues for github runners - Docker images can take up quite some space
+      - name: Free Disk Space
+        run: |
+          echo "Disk space before cleanup:"
+          df -h
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/share/boost
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          echo "Disk space after cleanup:"
+          df -h
+
       # Make sure the branch has the latest master changes in
       - name: Merge master into current branch
         if: ${{ inputs.mergeMaster }}
@@ -149,6 +166,18 @@ jobs:
           allowDirtyBuild: true
           manualExit: true
 
+      - name: Check Disk Space After Build
+        if: ${{ !inputs.tagsOnly }}
+        run: |
+          echo "Disk space after build:"
+          df -h
+          AVAILABLE=$(df / | tail -1 | awk '{print $4}')
+          AVAILABLE_GB=$(echo $AVAILABLE | sed 's/G//')
+          echo "Available space: ${AVAILABLE_GB}GB"
+          if (( $(echo "$AVAILABLE_GB < 1" | bc -l) )); then
+            echo "::warning::Low disk space! Less than 1GB remaining."
+          fi
+
       - name: Delete build folder with elevated rights
         if: ${{ !inputs.tagsOnly }}
         run: sudo rm -rf ./build
@@ -173,6 +202,16 @@ jobs:
           title: "[Automated workflow] upgrade-unity from ${{steps.last_unity_version.outputs.NAME}} to ${{ steps.upgrade_name.outputs.NAME }}"
           body: ${{ steps.template.outputs.result }}
 
+      - name: Wait before pushing tags
+        if: ${{ (inputs.createTags || inputs.tagsOnly) && inputs.delayTags > 0 }}
+        run: |
+          DELAY_SECONDS=$((DELAY_TAGS * 60))
+          echo "Waiting for $DELAY_TAGS minutes ($DELAY_SECONDS seconds) before pushing tags..."
+          sleep $DELAY_SECONDS
+          echo "Wait complete. Proceeding with tag push."
+        env:
+          DELAY_TAGS: ${{ inputs.delayTags }}
+
       - name: Add tags
         if: ${{ inputs.createTags || inputs.tagsOnly }}
         run: |

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}");
@@ -359,6 +382,17 @@ public void CheckOnlineStatus()
 			Debug.Log($"<color=#4D65A4>Online Status:</color> {(isOnline ? "<color=#3bb508>Connected</color>" : "<color=#b50808>Disconnected</color>")}");
 		}
 
+		/// <summary>
+		/// Sets the CSS cursor style for the Unity canvas element.
+		/// Browser Usage: <code>unityGame.SendMessage("WebGL", "SetCursor", "pointer");</code>
+		/// </summary>
+		/// <param name="cursorName">CSS cursor value (e.g., "default", "pointer", "grab", "crosshair", "text")</param>
+		[WebCommand(Description = "Set the CSS cursor style")]
+		public void SetCursor(string cursorName)
+		{
+			WebToolPlugins.SetCursor(cursorName);
+		}
+
 		/// <summary>
 		/// Captures the current screen and saves it as a PNG file.
 		/// </summary>

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/EventListeners/WebEventListeners.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UnityEngine;
 
@@ -36,6 +37,7 @@ private static void OnBeforeSceneLoadRuntimeMethod()
 		}
 #endif
 
+		[Conditional("UNITY_WEBGL")]
 		public static void AddEventListener(string eventName, Action callback)
 		{
 			instance.AddEventListenerInternal(eventName, callback);
@@ -59,7 +61,7 @@ private void AddEventListenerInternal(string eventName, Action callback)
 				// Add event listener on javascript side
 				_AddJsEventListener(eventName);
 #elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
-			Debug.Log($"<color=#00CCCC>{nameof(WebEventListeners)}.{nameof(AddEventListenerInternal)} add callback for {eventName}</color>");
+			UnityEngine.Debug.Log($"<color=#00CCCC>{nameof(WebEventListeners)}.{nameof(AddEventListenerInternal)} add callback for {eventName}</color>");
 #endif
 			}
 		}

Assets/Plugins/WebGL/WebTools/WebToolPlugins.cs

@@ -35,13 +35,17 @@ 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();
 		[DllImport("__Internal")]
 		private static extern void _DownloadFile(string filename, string content);
 		[DllImport("__Internal")]
 		private static extern void _DownloadBlob(string filename, byte[] byteArray, int byteLength, string mimeType);
+		[DllImport("__Internal")]
+		private static extern void _SetCursor(string cursorName);
 
 #endif
 
@@ -191,6 +195,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>
@@ -280,5 +307,28 @@ public static void DownloadBinaryFile(string filename, byte[] data, string mimeT
 				Debug.Log($"{nameof(WebToolPlugins)}.{nameof(DownloadBinaryFile)} called with filename: {filename}");
 			#endif
 		}
+
+		/// <summary>
+		/// Sets the CSS cursor style for the Unity canvas element.
+		/// <see href="https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/cursor"/>
+		/// </summary>
+		/// <param name="cursorName">The CSS cursor value (e.g., "pointer", "grab", "crosshair", "text", "default")</param>
+		/// <example>
+		/// <code>
+		/// // Example: Change cursor to pointer on hover
+		/// WebToolPlugins.SetCursor("pointer");
+		///
+		/// // Example: Reset to default cursor
+		/// WebToolPlugins.SetCursor("default");
+		/// </code>
+		/// </example>
+		public static void SetCursor(string cursorName)
+		{
+			#if UNITY_WEBGL && !UNITY_EDITOR
+				_SetCursor(cursorName);
+			#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
+				Debug.Log($"{nameof(WebToolPlugins)}.{nameof(SetCursor)} called with cursor: {cursorName}");
+			#endif
+		}
 	}
 }

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)
@@ -146,6 +154,21 @@ var WebGlPlugins =
         element.click();
         document.body.removeChild(element);
         URL.revokeObjectURL(url);
+    },
+
+    _SetCursor: function(cursorName) {
+        var cursorStr = UTF8ToString(cursorName);
+        // Check if canvas variable exists from the Unity template
+        var canvasElement = (typeof canvas !== 'undefined') ? canvas : null;
+        if (!canvasElement) {
+            canvasElement = document.getElementById('unity-canvas');
+        }
+        if (!canvasElement) {
+            canvasElement = document.querySelector('canvas');
+        }
+        if (canvasElement) {
+            canvasElement.style.cursor = cursorStr;
+        }
     }
 };
 

Assets/Prefabs/RigidbodyCube.prefab

@@ -13,6 +13,7 @@ GameObject:
   - component: {fileID: 23875290202771946}
   - component: {fileID: 65366149667932608}
   - component: {fileID: 54003196623453922}
+  - component: {fileID: 265791508532593724}
   m_Layer: 0
   m_Name: RigidbodyCube
   m_TagString: Untagged
@@ -136,3 +137,17 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 1
+--- !u!114 &265791508532593724
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1293945906612296}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7cd0ca8b7204d4214b198040d886c542, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  CursorEnteredName: pointer
+  CursorExitedName: default