Merge branch 'master' into 6000.3-urp

# Conflicts:
#	Packages/manifest.json
#	Packages/packages-lock.json

Author: JohannesDeml

.github/scripts/add-tags.sh

@@ -3,11 +3,14 @@
 # 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
+# sh add-tags.sh "6000.0.0f1" "true" "10" -> Creates tags for urp version with 10 second delay between pushes
 
 # Input parameters
 UNITY_VERSION=$1
 IS_URP=${2:-"false"}
-echo "Running add_tags.sh with UNITY_VERSION: $UNITY_VERSION, IS_URP: $IS_URP"
+DELAY_TAGS=${3:-"0"}
+
+echo "Running add_tags.sh with UNITY_VERSION: $UNITY_VERSION, IS_URP: $IS_URP, DELAY_TAGS: $DELAY_TAGS seconds"
 
 # Extract the value before the first dot as an integer
 MAJOR_VERSION=$(echo $UNITY_VERSION | cut -d. -f1)
@@ -19,22 +22,42 @@ then
 TAG_PREFIX=$UNITY_VERSION-urp
 fi
 
+# Build array of tags to create and push
+TAGS=()
+
 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"
+TAGS+=("$TAG_PREFIX-minsize-webgl1")
+TAGS+=("$TAG_PREFIX-webgl1")
 else
-git tag -a -f $TAG_PREFIX-minsize-webgl2 -m "[Automated workflow] Created by upgrade-unity"
+TAGS+=("$TAG_PREFIX-minsize-webgl2")
 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"
+TAGS+=("$TAG_PREFIX-webgl2")
+TAGS+=("$TAG_PREFIX-webgl2-debug")
 
 if [[ "$MAJOR_VERSION" -ge "6000" ]]
 then
-git tag -a -f $TAG_PREFIX-webgpu -m "[Automated workflow] Created by upgrade-unity"
+TAGS+=("$TAG_PREFIX-webgpu")
 fi
 
-git push origin -f --tags
+# Loop through tags, create and push each one with delay
+for i in "${!TAGS[@]}"; do
+  TAG="${TAGS[$i]}"
+  echo "Creating and pushing tag: $TAG"
+
+  # Create the tag
+  git tag -a -f "$TAG" -m "[Automated workflow] Created by upgrade-unity"
+
+  # Push the tag
+  git push origin -f "$TAG"
+
+  # Wait between pushes if not the last tag and delay is specified
+  if [[ $i -lt $((${#TAGS[@]} - 1)) ]] && [[ "$DELAY_TAGS" -gt "0" ]]
+  then
+    echo "Waiting $DELAY_TAGS seconds before next tag push..."
+    sleep $DELAY_TAGS
+  fi
+done
+
+echo "All tags created and pushed successfully."

.github/workflows/upgrade-unity.yml

@@ -29,6 +29,11 @@ on:
         required: false
         type: string
         default: '-accept-apiupdate'
+      delayTags:
+        description: 'Delay between tag pushes (in seconds, minimum 1)'
+        required: false
+        type: number
+        default: 1
 
 jobs:
   upgrade-unity-version:
@@ -45,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 seconds"
           if [[ "$BRANCH_NAME" == *"urp"* ]]
           then
             echo "urp: true"
@@ -57,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:
@@ -205,8 +212,9 @@ jobs:
             IS_URP=true
           fi
 
-          # Run add tags script
-          ./.github/scripts/add-tags.sh "$UNITY_VERSION" "$IS_URP"
+          # Run add tags script with delay parameter
+          ./.github/scripts/add-tags.sh "$UNITY_VERSION" "$IS_URP" "$DELAY_TAGS"
         env:
           UNITY_VERSION: ${{ inputs.unityVersion }}
+          DELAY_TAGS: ${{ inputs.delayTags }}
 

Assets/Plugins/WebGL/WebBridge/CommonCommands.cs

@@ -382,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/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

@@ -44,6 +44,8 @@ public static class WebToolPlugins
 		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
 
@@ -305,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

@@ -154,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

Assets/Scenes/Main.unity

@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 10
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -38,13 +38,12 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 12
-  m_GIWorkflowMode: 0
+  serializedVersion: 13
+  m_BakeOnSceneLoad: 0
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -67,9 +66,6 @@ LightmapSettings:
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
     m_TextureCompression: 1
-    m_FinalGather: 0
-    m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 256
     m_ReflectionCompression: 2
     m_MixedBakeMode: 2
     m_BakeBackend: 1
@@ -199,9 +195,8 @@ Light:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 170076733}
   m_Enabled: 1
-  serializedVersion: 10
+  serializedVersion: 11
   m_Type: 1
-  m_Shape: 0
   m_Color: {r: 0.99215686, g: 0.96962065, b: 0.85490197, a: 1}
   m_Intensity: 0.7
   m_Range: 10
@@ -251,8 +246,12 @@ Light:
   m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
   m_UseBoundingSphereOverride: 0
   m_UseViewFrustumForShadowCasterCull: 1
+  m_ForceVisible: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0
+  m_LightUnit: 1
+  m_LuxAtDistance: 1
+  m_EnableSpotReflector: 1
 --- !u!4 &170076735
 Transform:
   m_ObjectHideFlags: 0
@@ -426,6 +425,7 @@ GameObject:
   - component: {fileID: 624999761}
   - component: {fileID: 624999760}
   - component: {fileID: 624999759}
+  - component: {fileID: 624999763}
   m_Layer: 0
   m_Name: GroundPlane
   m_TagString: Untagged
@@ -472,6 +472,9 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 4294967295
   m_RendererPriority: 0
   m_Materials:
@@ -520,6 +523,21 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &624999763
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 624999758}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7cd0ca8b7204d4214b198040d886c542, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  CursorEnteredName: grab
+  CursorExitedName: default
+  DestroyOnClick: 0
 --- !u!1 &1116415927
 GameObject:
   m_ObjectHideFlags: 0
@@ -926,6 +944,7 @@ GameObject:
   - component: {fileID: 2066011077}
   - component: {fileID: 2066011076}
   - component: {fileID: 2066011080}
+  - component: {fileID: 2066011081}
   m_Layer: 0
   m_Name: RotatingCube
   m_TagString: Untagged
@@ -971,6 +990,9 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 4294967295
   m_RendererPriority: 0
   m_Materials:
@@ -1035,6 +1057,21 @@ MonoBehaviour:
   rotationAxis: {x: 0, y: 1, z: 0}
   degreePerSecond: 90
   updateType: 0
+--- !u!114 &2066011081
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2066011075}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7cd0ca8b7204d4214b198040d886c542, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  CursorEnteredName: pointer
+  CursorExitedName: default
+  DestroyOnClick: 1
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0