Add Unity 6 compatibility

lawwong · lawwong · commit 23da4e23884a · 2024-11-11T13:29:06.000+08:00
diff --git a/Assets/HTC.UnityPlugin/Pointer3D/Pointer3DInputModule.cs b/Assets/HTC.UnityPlugin/Pointer3D/Pointer3DInputModule.cs
@@ -87,7 +87,11 @@ public static void Initialize()
         {
             if (Active || isApplicationQuitting) { return; }
 
+#if UNITY_6000_0_OR_NEWER
+            var instances = FindObjectsByType<Pointer3DInputModule>(FindObjectsSortMode.None);
+#else
             var instances = FindObjectsOfType<Pointer3DInputModule>();
+#endif
             if (instances.Length > 0)
             {
                 instance = instances[0];
@@ -99,7 +103,11 @@ public static void Initialize()
                 EventSystem eventSystem = EventSystem.current;
                 if (eventSystem == null)
                 {
+#if UNITY_6000_0_OR_NEWER
+                    eventSystem = FindFirstObjectByType<EventSystem>();
+#else
                     eventSystem = FindObjectOfType<EventSystem>();
+#endif
                 }
                 if (eventSystem == null)
                 {
diff --git a/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/GraphicRaycastMethod.cs b/Assets/HTC.UnityPlugin/Pointer3D/RaycastMethod/GraphicRaycastMethod.cs
@@ -20,7 +20,11 @@ protected virtual void Reset()
         {
             if (m_Canvas == null)
             {
+#if UNITY_6000_0_OR_NEWER
+                m_Canvas = FindFirstObjectByType<Canvas>();
+#else
                 m_Canvas = FindObjectOfType<Canvas>();
+#endif
             }
         }
 #endif
diff --git a/Assets/HTC.UnityPlugin/Utility/RigidPose.cs b/Assets/HTC.UnityPlugin/Utility/RigidPose.cs
@@ -158,14 +158,11 @@ public static void SetPose(Transform target, RigidPose pose, Transform origin =
         public static void SetRigidbodyVelocity(Rigidbody rigidbody, Vector3 from, Vector3 to, float duration)
         {
             var diffPos = to - from;
-            if (Mathf.Approximately(diffPos.sqrMagnitude, 0f))
-            {
-                rigidbody.velocity = Vector3.zero;
-            }
-            else
-            {
-                rigidbody.velocity = diffPos / duration;
-            }
+#if UNITY_6000_0_OR_NEWER
+            rigidbody.linearVelocity = Mathf.Approximately(diffPos.sqrMagnitude, 0f) ? Vector3.zero : (diffPos / duration);
+#else
+            rigidbody.velocity = Mathf.Approximately(diffPos.sqrMagnitude, 0f) ? Vector3.zero : (diffPos / duration);
+#endif
         }
 
         // proper folloing duration is larger then 0.02 second, depends on the update rate
diff --git a/Assets/HTC.UnityPlugin/Utility/SingletonBehaviour.cs b/Assets/HTC.UnityPlugin/Utility/SingletonBehaviour.cs
@@ -38,7 +38,11 @@ public static void Initialize()
 
                 if (!Application.isPlaying || s_isApplicationQuitting) { return; }
 
+#if UNITY_6000_0_OR_NEWER
+                var instances = FindObjectsByType<T>(FindObjectsSortMode.None);
+#else
                 var instances = FindObjectsOfType<T>();
+#endif
                 if (instances.Length > 0)
                 {
                     s_instance = instances[0];
diff --git a/Assets/HTC.UnityPlugin/VRModule/Editor/VRModuleManagerEditor.cs b/Assets/HTC.UnityPlugin/VRModule/Editor/VRModuleManagerEditor.cs
@@ -15,6 +15,8 @@
 #if UNITY_2018_1_OR_NEWER
 using UnityEditor.PackageManager;
 using PackageInfo = UnityEditor.PackageManager.PackageInfo;
+using UnityEditor.Build;
+
 #endif
 
 #if UNITY_2017_3_OR_NEWER
@@ -533,12 +535,20 @@ private static void RemoveAllVIUSymbols()
 
         private static List<string> GetDefineSymbols()
         {
+#if UNITY_6000_0_OR_NEWER
+            return new List<string>(PlayerSettings.GetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget))).Split(';'));
+#else
             return new List<string>(PlayerSettings.GetScriptingDefineSymbolsForGroup(BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget)).Split(';'));
+#endif
         }
 
         private static void SetDefineSymbols(List<string> symbols)
         {
+#if UNITY_6000_0_OR_NEWER
+            PlayerSettings.SetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget)), string.Join(";", symbols.ToArray()));
+#else
             PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget), string.Join(";", symbols.ToArray()));
+#endif
         }
 
         private static bool IsReferenced(Assembly assembly)
diff --git a/Assets/HTC.UnityPlugin/VRModule/Modules/UnityXRModuleUtil.cs b/Assets/HTC.UnityPlugin/VRModule/Modules/UnityXRModuleUtil.cs
@@ -246,7 +246,11 @@ public static VRModuleKnownXRInputSubsystem GetKnownActiveInputSubsystem()
             var activeSubsys = ListPool<XRInputSubsystem>.Get();
             try
             {
+#if UNITY_6000_0_OR_NEWER
+                SubsystemManager.GetSubsystems(activeSubsys);
+#else
                 SubsystemManager.GetInstances(activeSubsys);
+#endif
                 if (activeSubsys.Count == 0)
                 {
                     Debug.LogWarning("No XRInputSubsystem detected.");
@@ -257,7 +261,11 @@ public static VRModuleKnownXRInputSubsystem GetKnownActiveInputSubsystem()
                     {
                         if (!subsys.running) { continue; }
 
+#if UNITY_6000_0_OR_NEWER
+                        var subsysName = subsys.subsystemDescriptor.id;
+#else
                         var subsysName = subsys.SubsystemDescriptor.id;
+#endif
                         if (string.IsNullOrEmpty(subsysName)) { continue; }
 
                         foreach (var profile in inputSubsystemProfiles)
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Examples/3.3DDrag/Scripts/PlayGroundManager.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Examples/3.3DDrag/Scripts/PlayGroundManager.cs
@@ -35,7 +35,11 @@ public void ResetPositions()
                 var rb = dt.GetComponent<Rigidbody>();
                 if (rb != null)
                 {
+#if UNITY_6000_0_OR_NEWER
+                    rb.linearVelocity = Vector3.zero;
+#else
                     rb.velocity = Vector3.zero;
+#endif
                     rb.angularVelocity = Vector3.zero;
                 }
             }
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Examples/5.ColliderEvent/Scripts/ResetButton.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Examples/5.ColliderEvent/Scripts/ResetButton.cs
@@ -81,7 +81,11 @@ public void DoReset()
             {
                 rigid.MovePosition(storedPoses[i].pos);
                 rigid.MoveRotation(storedPoses[i].rot);
+#if UNITY_6000_0_OR_NEWER
+                rigid.linearVelocity = Vector3.zero;
+#else
                 rigid.velocity = Vector3.zero;
+#endif
                 //rigid.angularVelocity = Vector3.zero;
             }
             else
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Examples/8.NearFieldHandInteraction/Scripts/Lever.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Examples/8.NearFieldHandInteraction/Scripts/Lever.cs
@@ -9,7 +9,7 @@ namespace HTC.UnityPlugin.Vive
 {
     public class Lever : MonoBehaviour
     {
-        [Serializable] public class MoveEvent : UnityEvent<Transform> {}
+        [Serializable] public class MoveEvent : UnityEvent<Transform> { }
 
         public MoveEvent moved;
 
@@ -42,7 +42,11 @@ protected virtual void LateUpdate()
             // Lock velocity
             if (m_rigidbody)
             {
+#if UNITY_6000_0_OR_NEWER
+                m_rigidbody.linearVelocity = Vector3.zero;
+#else
                 m_rigidbody.velocity = Vector3.zero;
+#endif
             }
         }
 
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Examples/8.NearFieldHandInteraction/Scripts/PushButton.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Examples/8.NearFieldHandInteraction/Scripts/PushButton.cs
@@ -72,7 +72,11 @@ protected virtual void LateUpdate()
             // Lock velocity
             if (m_rigidbody)
             {
+#if UNITY_6000_0_OR_NEWER
+                m_rigidbody.linearVelocity = Vector3.zero;
+#else
                 m_rigidbody.velocity = Vector3.zero;
+#endif
             }
         }
 
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VIUSettingsEditor.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VIUSettingsEditor.cs
@@ -755,7 +755,9 @@ private static void OnVIUPreferenceGUI()
                 //    EditorGUILayout.HelpBox("AndroidNdkRoot is empty. Setup at Edit -> Preferences... -> External Tools -> Android SDK", MessageType.Warning);
                 //}
 
-#if UNITY_5_6_OR_NEWER && !UNITY_5_6_0 && !UNITY_5_6_1 && !UNITY_5_6_2
+#if UNITY_6000_0_OR_NEWER
+                if (PlayerSettings.GetApplicationIdentifier(UnityEditor.Build.NamedBuildTarget.Android).Equals("com.Company.ProductName"))
+#elif UNITY_5_6_OR_NEWER && !UNITY_5_6_0 && !UNITY_5_6_1 && !UNITY_5_6_2
                 if (PlayerSettings.GetApplicationIdentifier(BuildTargetGroup.Android).Equals("com.Company.ProductName"))
 #else
                 if (PlayerSettings.bundleIdentifier.Equals("com.Company.ProductName"))
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OculusGoSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OculusGoSettings.cs
@@ -392,7 +392,9 @@ public static partial class VIUSettingsEditor
         public const string URL_OCULUS_VR_PLUGIN = "https://assetstore.unity.com/packages/slug/82022?";
         private const string OCULUS_ANDROID_PACKAGE_NAME = "com.unity.xr.oculus.android";
         public const AndroidSdkVersions MIN_SUPPORTED_ANDROID_SDK_VERSION =
-#if UNITY_2020_1_OR_NEWER
+#if UNITY_6000_0_OR_NEWER
+            AndroidSdkVersions.AndroidApiLevel23;
+#elif UNITY_2020_1_OR_NEWER
             AndroidSdkVersions.AndroidApiLevel22;
 #else
             AndroidSdkVersions.AndroidApiLevel21;
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OculusSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OculusSettings.cs
@@ -33,7 +33,10 @@ public OculusRecommendedSettings()
             {
                 settingTitle = "Multithreaded Rendering",
                 skipCheckFunc = () => !VIUSettingsEditor.supportOculusGo,
-#if UNITY_2017_2_OR_NEWER
+#if UNITY_6000_0_OR_NEWER
+                currentValueFunc = () => PlayerSettings.GetMobileMTRendering(UnityEditor.Build.NamedBuildTarget.Android),
+                setValueFunc = v => PlayerSettings.SetMobileMTRendering(UnityEditor.Build.NamedBuildTarget.Android, v),
+#elif UNITY_2017_2_OR_NEWER
                 currentValueFunc = () => PlayerSettings.GetMobileMTRendering(BuildTargetGroup.Android),
                 setValueFunc = v => PlayerSettings.SetMobileMTRendering(BuildTargetGroup.Android, v),
 #else
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs
@@ -38,7 +38,10 @@ public WaveVRRecommendedSettings()
             {
                 settingTitle = "Multithreaded Rendering",
                 skipCheckFunc = () => !VIUSettingsEditor.supportWaveVR,
-#if UNITY_2017_2_OR_NEWER
+#if UNITY_6000_0_OR_NEWER
+                currentValueFunc = () => PlayerSettings.GetMobileMTRendering(NamedBuildTarget.Android),
+                setValueFunc = v => PlayerSettings.SetMobileMTRendering(NamedBuildTarget.Android, v),
+#elif UNITY_2017_2_OR_NEWER
                 currentValueFunc = () => PlayerSettings.GetMobileMTRendering(BuildTargetGroup.Android),
                 setValueFunc = v => PlayerSettings.SetMobileMTRendering(BuildTargetGroup.Android, v),
 #else
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/GrabbableBase.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/GrabbableBase.cs
@@ -395,7 +395,11 @@ protected void GrabTransformToPose(RigidPose targetPose)
 
             if (grabRigidbody != null)
             {
+#if UNITY_6000_0_OR_NEWER
+                grabRigidbody.linearVelocity = Vector3.zero;
+#else
                 grabRigidbody.velocity = Vector3.zero;
+#endif
                 grabRigidbody.angularVelocity = Vector3.zero;
             }
 
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/VivePose/ViveRigidPoseTracker.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/VivePose/ViveRigidPoseTracker.cs
@@ -46,14 +46,22 @@ protected virtual void FixedUpdate()
             }
             else
             {
+#if UNITY_6000_0_OR_NEWER
+                rigid.linearVelocity = Vector3.zero;
+#else
                 rigid.velocity = Vector3.zero;
+#endif
                 rigid.angularVelocity = Vector3.zero;
             }
         }
 
         protected override void OnDisable()
         {
+#if UNITY_6000_0_OR_NEWER
+            rigid.linearVelocity = Vector3.zero;
+#else
             rigid.velocity = Vector3.zero;
+#endif
             rigid.angularVelocity = Vector3.zero;
             base.OnDisable();
         }

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,11 @@ public static void Initialize()`
`87`	`87`	`{`
`88`	`88`	`if (Active \|\| isApplicationQuitting) { return; }`
`89`	`89`
	`90`	`+#if UNITY_6000_0_OR_NEWER`
	`91`	`+ var instances = FindObjectsByType<Pointer3DInputModule>(FindObjectsSortMode.None);`
	`92`	`+#else`
`90`	`93`	`var instances = FindObjectsOfType<Pointer3DInputModule>();`
	`94`	`+#endif`
`91`	`95`	`if (instances.Length > 0)`
`92`	`96`	`{`
`93`	`97`	`instance = instances[0];`
`@@ -99,7 +103,11 @@ public static void Initialize()`
`99`	`103`	`EventSystem eventSystem = EventSystem.current;`
`100`	`104`	`if (eventSystem == null)`
`101`	`105`	`{`
	`106`	`+#if UNITY_6000_0_OR_NEWER`
	`107`	`+ eventSystem = FindFirstObjectByType<EventSystem>();`
	`108`	`+#else`
`102`	`109`	`eventSystem = FindObjectOfType<EventSystem>();`
	`110`	`+#endif`
`103`	`111`	`}`
`104`	`112`	`if (eventSystem == null)`
`105`	`113`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,11 @@ protected virtual void Reset()`
`20`	`20`	`{`
`21`	`21`	`if (m_Canvas == null)`
`22`	`22`	`{`
	`23`	`+#if UNITY_6000_0_OR_NEWER`
	`24`	`+ m_Canvas = FindFirstObjectByType<Canvas>();`
	`25`	`+#else`
`23`	`26`	`m_Canvas = FindObjectOfType<Canvas>();`
	`27`	`+#endif`
`24`	`28`	`}`
`25`	`29`	`}`
`26`	`30`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,11 @@ public void ResetPositions()`
`35`	`35`	`var rb = dt.GetComponent<Rigidbody>();`
`36`	`36`	`if (rb != null)`
`37`	`37`	`{`
	`38`	`+#if UNITY_6000_0_OR_NEWER`
	`39`	`+ rb.linearVelocity = Vector3.zero;`
	`40`	`+#else`
`38`	`41`	`rb.velocity = Vector3.zero;`
	`42`	`+#endif`
`39`	`43`	`rb.angularVelocity = Vector3.zero;`
`40`	`44`	`}`
`41`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,11 @@ public void DoReset()`
`81`	`81`	`{`
`82`	`82`	`rigid.MovePosition(storedPoses[i].pos);`
`83`	`83`	`rigid.MoveRotation(storedPoses[i].rot);`
	`84`	`+#if UNITY_6000_0_OR_NEWER`
	`85`	`+ rigid.linearVelocity = Vector3.zero;`
	`86`	`+#else`
`84`	`87`	`rigid.velocity = Vector3.zero;`
	`88`	`+#endif`
`85`	`89`	`//rigid.angularVelocity = Vector3.zero;`
`86`	`90`	`}`
`87`	`91`	`else`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace HTC.UnityPlugin.Vive`
`9`	`9`	`{`
`10`	`10`	`public class Lever : MonoBehaviour`
`11`	`11`	`{`
`12`		`- [Serializable] public class MoveEvent : UnityEvent<Transform> {}`
	`12`	`+ [Serializable] public class MoveEvent : UnityEvent<Transform> { }`
`13`	`13`
`14`	`14`	`public MoveEvent moved;`
`15`	`15`
`@@ -42,7 +42,11 @@ protected virtual void LateUpdate()`
`42`	`42`	`// Lock velocity`
`43`	`43`	`if (m_rigidbody)`
`44`	`44`	`{`
	`45`	`+#if UNITY_6000_0_OR_NEWER`
	`46`	`+ m_rigidbody.linearVelocity = Vector3.zero;`
	`47`	`+#else`
`45`	`48`	`m_rigidbody.velocity = Vector3.zero;`
	`49`	`+#endif`
`46`	`50`	`}`
`47`	`51`	`}`
`48`	`52`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,11 @@ protected virtual void LateUpdate()`
`72`	`72`	`// Lock velocity`
`73`	`73`	`if (m_rigidbody)`
`74`	`74`	`{`
	`75`	`+#if UNITY_6000_0_OR_NEWER`
	`76`	`+ m_rigidbody.linearVelocity = Vector3.zero;`
	`77`	`+#else`
`75`	`78`	`m_rigidbody.velocity = Vector3.zero;`
	`79`	`+#endif`
`76`	`80`	`}`
`77`	`81`	`}`
`78`	`82`