Release for updated SDK 78.0.0

mderzelle · facebook-github-bot · commit cb69ab43190a · 2025-09-01T01:53:00.000-07:00
Summary:
- Code changes for Unity 6 support
- Remove stale scripts in SimultaneousHandsAndControllers sample
- Rename **TableTop** semantic to **Tabletop**

Reviewed By: markusscmeta

Differential Revision: D81315442

fbshipit-source-id: f8c538012cc10b4152845312e10a4a4656712b4b
diff --git a/Assets/Resources/ImmersiveDebuggerSettings.asset.meta b/Assets/Resources/ImmersiveDebuggerSettings.asset.meta
diff --git a/Assets/Resources/InputActions.asset.meta b/Assets/Resources/InputActions.asset.meta
diff --git a/Assets/StarterSamples/Core/DebugUI/Scripts/DebugUIBuilder.cs b/Assets/StarterSamples/Core/DebugUI/Scripts/DebugUIBuilder.cs
@@ -18,7 +18,6 @@
  * limitations under the License.
  */
 
-using System.Collections;
 using System.Collections.Generic;
 using Meta.XR.Samples;
 using UnityEngine;
@@ -111,7 +110,7 @@ public void Awake()
         instance = this;
         menuOffset = transform.position; // TODO: this is unpredictable/busted
         gameObject.SetActive(false);
-        rig = FindObjectOfType<OVRCameraRig>();
+        rig = FindFirstObjectByType<OVRCameraRig>();
         for (int i = 0; i < toEnable.Count; ++i)
         {
             toEnable[i].SetActive(false);
@@ -135,7 +134,7 @@ public void Awake()
             GameObject.Instantiate(uiHelpersToInstantiate);
         }
 
-        lp = FindObjectOfType<LaserPointer>();
+        lp = FindFirstObjectByType<LaserPointer>();
         if (!lp)
         {
             Debug.LogError("Debug UI requires use of a LaserPointer and will not function without it. " +
diff --git a/Assets/StarterSamples/Core/DebugUI/Scripts/HandedInputSelector.cs b/Assets/StarterSamples/Core/DebugUI/Scripts/HandedInputSelector.cs
@@ -19,10 +19,7 @@
  */
 
 using UnityEngine;
-using System.Collections;
 using UnityEngine.EventSystems;
-using UnityEngine.UI;
-using System;
 using Meta.XR.Samples;
 
 [MetaCodeSample("StarterSample.Core-DebugUI")]
@@ -33,8 +30,8 @@ public class HandedInputSelector : MonoBehaviour
 
     void Start()
     {
-        m_CameraRig = FindObjectOfType<OVRCameraRig>();
-        m_InputModule = FindObjectOfType<OVRInputModule>();
+        m_CameraRig = FindFirstObjectByType<OVRCameraRig>();
+        m_InputModule = FindFirstObjectByType<OVRInputModule>();
     }
 
     void Update()
diff --git a/Assets/StarterSamples/Core/HandsInteraction/Scripts/InteractableToolsInputRouter.cs b/Assets/StarterSamples/Core/HandsInteraction/Scripts/InteractableToolsInputRouter.cs
@@ -42,7 +42,7 @@ public static InteractableToolsInputRouter Instance
             {
                 if (_instance == null)
                 {
-                    var instances = FindObjectsOfType<InteractableToolsInputRouter>();
+                    var instances = FindObjectsByType<InteractableToolsInputRouter>(FindObjectsSortMode.None);
                     if (instances.Length > 0)
                     {
                         _instance = instances[0];
diff --git a/Assets/StarterSamples/Core/Locomotion/Scripts/LocomotionController.cs b/Assets/StarterSamples/Core/Locomotion/Scripts/LocomotionController.cs
@@ -18,10 +18,7 @@
  * limitations under the License.
  */
 
-using System;
 using UnityEngine;
-using System.Collections;
-using JetBrains.Annotations;
 using Meta.XR.Samples;
 using UnityEngine.Assertions;
 #if UNITY_EDITOR
@@ -58,7 +55,7 @@ void Start()
         //Assert.IsNotNull(PlayerController);
         if (CameraRig == null)
         {
-            CameraRig = FindObjectOfType<OVRCameraRig>();
+            CameraRig = FindFirstObjectByType<OVRCameraRig>();
         }
 
         Assert.IsNotNull(CameraRig);
diff --git a/Assets/StarterSamples/Usage/HandsTrainExample/Scripts/HandsActiveChecker.cs b/Assets/StarterSamples/Usage/HandsTrainExample/Scripts/HandsActiveChecker.cs
@@ -20,7 +20,6 @@
 
 
 using System.Collections;
-using System.Collections.Generic;
 using Meta.XR.Samples;
 using UnityEngine;
 using UnityEngine.Assertions;
@@ -61,7 +60,7 @@ private void Update()
 
     private IEnumerator GetCenterEye()
     {
-        if ((_cameraRig = FindObjectOfType<OVRCameraRig>()) != null)
+        if ((_cameraRig = FindFirstObjectByType<OVRCameraRig>()) != null)
         {
             while (!_centerEye)
             {
diff --git a/Assets/StarterSamples/Usage/HandsTrainExample/Scripts/PanelHMDFollower.cs b/Assets/StarterSamples/Usage/HandsTrainExample/Scripts/PanelHMDFollower.cs
@@ -43,7 +43,7 @@ public class PanelHMDFollower : MonoBehaviour
 
         private void Awake()
         {
-            _cameraRig = FindObjectOfType<OVRCameraRig>();
+            _cameraRig = FindFirstObjectByType<OVRCameraRig>();
             _panelInitialPosition = transform.position;
         }
 
diff --git a/Assets/StarterSamples/Usage/Locomotion/Scripts/LocomotionSampleSupport.cs b/Assets/StarterSamples/Usage/Locomotion/Scripts/LocomotionSampleSupport.cs
@@ -40,15 +40,15 @@ private LocomotionTeleport TeleportController
 
     public void Start()
     {
-        lc = FindObjectOfType<LocomotionController>();
+        lc = FindFirstObjectByType<LocomotionController>();
         DebugUIBuilder.instance.AddButton("Node Teleport w/ A", SetupNodeTeleport);
         DebugUIBuilder.instance.AddButton("Dual-stick teleport", SetupTwoStickTeleport);
         DebugUIBuilder.instance.AddButton("L Strafe R Teleport", SetupLeftStrafeRightTeleport);
         //DebugUIBuilder.instance.AddButton("R Turn L Teleport", SetupRightTurnLeftTeleport);
         DebugUIBuilder.instance.AddButton("Walk Only", SetupWalkOnly);
 
         // This is just a quick hack-in, need a prefab-based way of setting this up easily.
-        EventSystem eventSystem = FindObjectOfType<EventSystem>();
+        EventSystem eventSystem = FindFirstObjectByType<EventSystem>();
         if (eventSystem == null)
         {
             Debug.LogError("Need EventSystem");
diff --git a/Assets/StarterSamples/Usage/OVROverlayCanvas.unity b/Assets/StarterSamples/Usage/OVROverlayCanvas.unity
@@ -866,7 +866,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ee10491ef6d5d1d49a270cf6b09bdc19, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  rectTransform: {fileID: 0}
+  _enableMipmapping: 0
+  _dynamicResolution: 1
+  _redrawResolutionThreshold: 2147483647
+  rectTransform: {fileID: 314378549}
   maxTextureSize: 2048
   manualRedraw: 0
   renderInterval: 2
@@ -1622,7 +1625,7 @@ MonoBehaviour:
   hideTimeoutPeriod: 0.1
   dimOnHideRequest: 1
   depthScaleMultiplier: 0.03
-  matchNormalOnPhysicsColliders: 0
+  matchNormalOnPhysicsColliders: 1
   rayTransform: {fileID: 2144179061}
 --- !u!4 &851230874
 Transform:
diff --git a/Assets/StarterSamples/Usage/Passthrough/Scripts/FlashlightController.cs b/Assets/StarterSamples/Usage/Passthrough/Scripts/FlashlightController.cs
@@ -19,10 +19,8 @@
  */
 
 using System.Collections;
-using System.Collections.Generic;
 using Meta.XR.Samples;
 using UnityEngine;
-using UnityEngine.UI;
 
 [MetaCodeSample("StarterSample-Passthrough")]
 public class FlashlightController : MonoBehaviour
@@ -95,7 +93,7 @@ void FindHands()
     {
         if (skeletons[0] == null || skeletons[1] == null)
         {
-            OVRSkeleton[] foundSkeletons = FindObjectsOfType<OVRSkeleton>();
+            OVRSkeleton[] foundSkeletons = FindObjectsByType<OVRSkeleton>(FindObjectsSortMode.None);
             if (foundSkeletons[0])
             {
                 skeletons[0] = foundSkeletons[0];
diff --git a/Assets/StarterSamples/Usage/Passthrough/Scripts/SceneSampler.cs b/Assets/StarterSamples/Usage/Passthrough/Scripts/SceneSampler.cs
@@ -32,7 +32,8 @@ public class SceneSampler : MonoBehaviour
     void Awake()
     {
         // Make sure we have only one instance of SceneSampler game object when jumping between scene
-        if (FindObjectsOfType<SceneSampler>().Any(sceneSampler => sceneSampler != this))
+        var samplers = FindObjectsByType<SceneSampler>(FindObjectsSortMode.None);
+        if (samplers.Any(sceneSampler => sceneSampler != this))
         {
             Destroy(gameObject);
             return;
diff --git a/Assets/StarterSamples/Usage/TouchPro/Scripts/SceneSettings.cs b/Assets/StarterSamples/Usage/TouchPro/Scripts/SceneSettings.cs
@@ -52,7 +52,7 @@ private void Start()
     private static void CollidersSetContactOffset(float contactOffset)
     {
         // @Note: This does not find inactive objects.
-        Collider[] allColliders = GameObject.FindObjectsOfType<Collider>();
+        Collider[] allColliders = FindObjectsByType<Collider>(FindObjectsSortMode.None);
         foreach (Collider collider in allColliders)
         {
             collider.contactOffset = contactOffset;
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.meta.xr.sdk.core": "77.0.0",
+    "com.meta.xr.sdk.core": "78.0.0",
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
     "com.unity.ai.navigation": "1.1.5",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.meta.xr.sdk.core": {
-      "version": "77.0.0",
+      "version": "78.0.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {},

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static InteractableToolsInputRouter Instance`
`42`	`42`	`{`
`43`	`43`	`if (_instance == null)`
`44`	`44`	`{`
`45`		`- var instances = FindObjectsOfType<InteractableToolsInputRouter>();`
	`45`	`+ var instances = FindObjectsByType<InteractableToolsInputRouter>(FindObjectsSortMode.None);`
`46`	`46`	`if (instances.Length > 0)`
`47`	`47`	`{`
`48`	`48`	`_instance = instances[0];`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`
`21`	`21`
`22`	`22`	`using System.Collections;`
`23`		`-using System.Collections.Generic;`
`24`	`23`	`using Meta.XR.Samples;`
`25`	`24`	`using UnityEngine;`
`26`	`25`	`using UnityEngine.Assertions;`
`@@ -61,7 +60,7 @@ private void Update()`
`61`	`60`
`62`	`61`	`private IEnumerator GetCenterEye()`
`63`	`62`	`{`
`64`		`- if ((_cameraRig = FindObjectOfType<OVRCameraRig>()) != null)`
	`63`	`+ if ((_cameraRig = FindFirstObjectByType<OVRCameraRig>()) != null)`
`65`	`64`	`{`
`66`	`65`	`while (!_centerEye)`
`67`	`66`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public class PanelHMDFollower : MonoBehaviour`
`43`	`43`
`44`	`44`	`private void Awake()`
`45`	`45`	`{`
`46`		`- _cameraRig = FindObjectOfType<OVRCameraRig>();`
	`46`	`+ _cameraRig = FindFirstObjectByType<OVRCameraRig>();`
`47`	`47`	`_panelInitialPosition = transform.position;`
`48`	`48`	`}`
`49`	`49`