Pr fixes (#10576)

* suppressed warning about the Oculus Integration SDK for OpenXR enabled unity versions

* Fixed whitespace issues

* Replacing Contains + indexing with TryGetValue

* Oculus Integration csc adjustments

* Moving variables inside ifdef

* typo

Author: RogPodge

Assets/MRTK/Core/Providers/Hands/BaseHandVisualizer.cs

@@ -127,11 +127,10 @@ public virtual void OnHandJointsUpdated(InputEventData<IDictionary<TrackedHandJo
                 {
                     TrackedHandJoint handJoint = (TrackedHandJoint)i;
                     // Skip this hand joint if the event data doesn't have an entry for it
-                    if (!eventData.InputData.ContainsKey(handJoint))
+                    if (!eventData.InputData.TryGetValue(handJoint, out MixedRealityPose handJointPose))
                     {
                         continue;
                     }
-                    MixedRealityPose handJointPose = eventData.InputData[handJoint];
                     Transform jointTransform = jointsArray[i];
 
                     if (jointTransform != null)

Assets/MRTK/Providers/Oculus/XRSDK/MRTK-Quest/Editor/OculusXRSDKHandtrackingConfigurationChecker.cs

@@ -228,11 +228,9 @@ static void UpdateCSC()
             List<string> warningNumbers = new List<string>();
 
             // List of new warning numbers to add to the csc file
+            // Empty as of Oculus Integration 39.0 https://developer.oculus.com/downloads/package/unity-integration/39.0
             List<string> warningNumbersToAdd = new List<string>()
             {
-                "414",
-                "618",
-                "649"
             };
 
             if (!File.Exists(cscFilePath))

Assets/MRTK/Providers/Oculus/XRSDK/OculusXRSDKDeviceManager.cs

@@ -48,8 +48,11 @@ public OculusXRSDKDeviceManager(
         public override void Initialize()
         {
             base.Initialize();
+#if !UNITY_2020_1_OR_NEWER
             UnityEngine.Debug.Log(@"Detected a potential deployment issue for the Oculus Quest. In order to use hand tracking with the Oculus Quest, download the Oculus Integration Package from the Unity Asset Store and run the Integration tool before deploying.
 The tool can be found under <i>Mixed Reality > Toolkit > Utilities > Oculus > Integrate Oculus Integration Unity Modules</i>");
+            // Add a note about abandoning Oculus XRSDK if on 2020+, use open xr instead please
+#endif
         }
 #endif
 

Assets/MRTK/Providers/Oculus/XRSDK/OculusXRSDKDeviceManagerProfile.cs

@@ -117,33 +117,18 @@ public OVRHand.TrackingConfidence MinimumHandConfidence
         /// Current tracking confidence of right hand. Value managed by OculusQuestHand.cs.
         /// </summary>
         public OVRHand.TrackingConfidence CurrentRightHandTrackingConfidence { get; set; }
-#endif
-
-        [SerializeField]
-        [Range(0f, 5f)]
-        [Tooltip("Time after which low confidence is considered unreliable, and tracking is set to false. Setting this to 0 means low-confidence is always acceptable.")]
-        private float lowConfidenceTimeThreshold = 0.2f;
-
-        /// <summary>
-        /// Time in seconds after which low confidence is considered unreliable, and tracking is set to false.
-        /// </summary>
-        public float LowConfidenceTimeThreshold
-        {
-            get => lowConfidenceTimeThreshold;
-            set => lowConfidenceTimeThreshold = value;
-        }
 
         [Header("Performance Configuration")]
         [SerializeField]
         [Tooltip("Default CPU performance level (0-2 is documented), (3-5 is undocumented).")]
         [Range(0, 5)]
-        private int defaultCpuLevel = 2;
+        private OVRManager.ProcessorPerformanceLevel defaultCpuLevel = OVRManager.ProcessorPerformanceLevel.SustainedHigh;
 
         /// <summary>
         /// Accessor for the Oculus CPU performance level.
         /// https://developer.oculus.com/documentation/native/android/mobile-power-overview
         /// </summary>
-        public int CPULevel
+        public OVRManager.ProcessorPerformanceLevel CPULevel
         {
             get => defaultCpuLevel;
             set
@@ -156,12 +141,12 @@ public int CPULevel
         [SerializeField]
         [Tooltip("Default GPU performance level (0-2 is documented), (3-5 is undocumented).")]
         [Range(0, 5)]
-        private int defaultGpuLevel = 2;
+        private OVRManager.ProcessorPerformanceLevel defaultGpuLevel = OVRManager.ProcessorPerformanceLevel.SustainedHigh;
 
         /// <summary>
         /// Accessor for the Oculus GPU performance level.
         /// </summary>
-        public int GPULevel
+        public OVRManager.ProcessorPerformanceLevel GPULevel
         {
             get => defaultGpuLevel;
             set
@@ -170,6 +155,22 @@ public int GPULevel
                 ApplyConfiguredPerformanceSettings();
             }
         }
+#endif
+
+        [SerializeField]
+        [Range(0f, 5f)]
+        [Tooltip("Time after which low confidence is considered unreliable, and tracking is set to false. Setting this to 0 means low-confidence is always acceptable.")]
+        private float lowConfidenceTimeThreshold = 0.2f;
+
+        /// <summary>
+        /// Time in seconds after which low confidence is considered unreliable, and tracking is set to false.
+        /// </summary>
+        public float LowConfidenceTimeThreshold
+        {
+            get => lowConfidenceTimeThreshold;
+            set => lowConfidenceTimeThreshold = value;
+        }
+        
 
 #if OCULUSINTEGRATION_PRESENT
         [Header("Super sampling")]
@@ -189,8 +190,8 @@ public void ApplyConfiguredPerformanceSettings()
         {
 #if OCULUSINTEGRATION_PRESENT
             UnityEngine.XR.XRSettings.eyeTextureResolutionScale = resolutionScale;
-            OVRManager.cpuLevel = CPULevel;
-            OVRManager.gpuLevel = GPULevel;
+            OVRManager.suggestedCpuPerfLevel = CPULevel;
+            OVRManager.suggestedGpuPerfLevel = GPULevel;
 
             if (OVRManager.fixedFoveatedRenderingSupported)
             {

Assets/MRTK/SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs

@@ -510,7 +510,7 @@ public virtual void Reset()
 
 #endregion IMixedRealityPointer Implementation
 
-#region IEquality Implementation
+        #region IEquality Implementation
 
         private static bool Equals(IMixedRealityPointer left, IMixedRealityPointer right)
         {
@@ -558,7 +558,7 @@ public override int GetHashCode()
 
 #endregion IEquality Implementation
 
-#region IMixedRealitySourcePoseHandler Implementation
+        #region IMixedRealitySourcePoseHandler Implementation
 
         private static readonly ProfilerMarker OnSourceLostPerfMarker = new ProfilerMarker("[MRTK] BaseControllerPointer.OnSourceLost");
 
@@ -594,7 +594,7 @@ public override void OnSourceLost(SourceStateEventData eventData)
 
 #endregion IMixedRealitySourcePoseHandler Implementation
 
-#region IMixedRealityInputHandler Implementation
+        #region IMixedRealityInputHandler Implementation
 
         private static readonly ProfilerMarker OnInputUpPerfMarker = new ProfilerMarker("[MRTK] BaseControllerPointer.OnInputUp");
 

Assets/MRTK/SDK/Features/UX/Scripts/RiggedHandVisualizer/RiggedHandVisualizer.cs

@@ -320,11 +320,10 @@ public override void OnHandJointsUpdated(InputEventData<IDictionary<TrackedHandJ
                     {
                         TrackedHandJoint handJoint = (TrackedHandJoint)i;
                         // Skip this hand joint if the event data doesn't have an entry for it
-                        if (!eventData.InputData.ContainsKey(handJoint))
+                        if (!eventData.InputData.TryGetValue(handJoint, out MixedRealityPose handJointPose))
                         {
                             continue;
                         }
-                        MixedRealityPose handJointPose = eventData.InputData[handJoint];
                         Transform jointTransform = riggedVisualJointsArray[i];
 
                         if (jointTransform != null)