Merge main into feature/XRI3 (#1029)

keveleigh · web-flow · commit 0cb1fd35c50e · 2025-07-09T11:22:53.000-07:00
diff --git a/UnityProjects/MRTKDevTemplate/Assets/Editor/MeasureToolSettings.asset b/UnityProjects/MRTKDevTemplate/Assets/Editor/MeasureToolSettings.asset
@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e2305b64eca01f242a846e72381b866c, type: 3}
+  m_Name: MeasureToolSettings
+  m_EditorClassIdentifier: 
+  mode: 0
+  unit: 0
+  scale: 0
+  lineColor: {r: 0, g: 0, b: 0, a: 1}
+  handlesSize: 0.01
+  handlesColor: {r: 1, g: 1, b: 1, a: 1}
+  textSize: 16
+  textColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  offset: 0.03
+  lineThickness: 4
diff --git a/UnityProjects/MRTKDevTemplate/Assets/Editor/MeasureToolSettings.asset.meta b/UnityProjects/MRTKDevTemplate/Assets/Editor/MeasureToolSettings.asset.meta
diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/BoundsControlRuntimeExample.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/BoundsControlRuntimeExample.cs
@@ -62,7 +62,7 @@ private void SetStatus(string status)
         /// </summary>
         private IEnumerator Sequence()
         {
-            // Keep cycling through test until scene is exitted.
+            // Keep cycling through test until scene is exited.
             while (true)
             {
                 var cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/ScrollPanZoom/PanZoomBase.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/ScrollPanZoom/PanZoomBase.cs
@@ -196,15 +196,15 @@ public void PanVertically(float speed)
         }
 
         /// <summary>
-        /// Enables zoom operations using hand based interators.
+        /// Enables zoom operations using hand based interactors.
         /// </summary>
         public void EnableHandZoom()
         {
             handZoomEnabled = true;
         }
 
         /// <summary>
-        /// Disables zoom operations using hand based interators.
+        /// Disables zoom operations using hand based interactors.
         /// </summary>
         public void DisableHandZoom()
         {
diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/ScrollPanZoom/PanZoomBaseTexture.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/ScrollPanZoom/PanZoomBaseTexture.cs
@@ -78,7 +78,7 @@ private void Initialize(float newAspectRatio)
         /// </summary>
         /// <param name="uvCursorPosition">Normalized cursor position in the hit box. Center is assumed to be at (-0.5, 0.5).</param>        
         /// <param name="maxSpeed">The maximum speed that can be returned by this function.</param>
-        /// <param name="minDistanceFromCenterForAutoPan">The minium distances from the center at which to start panning.</param>
+        /// <param name="minDistanceFromCenterForAutoPan">The minimum distances from the center at which to start panning.</param>
         protected override float ComputePanSpeed(float uvCursorPosition, float maxSpeed, float minDistanceFromCenterForAutoPan)
         {
             // UV space from [0,1] -> Center: [-0.5, 0.5]
diff --git a/org.mixedrealitytoolkit.accessibility/Subsystems/MRTK/MRTKAccessibilitySubsystem.cs b/org.mixedrealitytoolkit.accessibility/Subsystems/MRTK/MRTKAccessibilitySubsystem.cs
@@ -126,7 +126,7 @@ public override bool TryUnregisterAccessibleObject(GameObject accessibleObject,
             /// <summary>
             /// Collects the registered <see cref="GameObject"/> instances from the requested <see cref="AccessibleObjectClassification"/> objects.
             /// </summary>
-            /// <param name="classifications">The combined flags specifiying the desired classification(s) (people, places, things, etc.).</param>
+            /// <param name="classifications">The combined flags specifying the desired classification(s) (people, places, things, etc.).</param>
             /// <param name="accessibleObjectsList">The collection which will receive the requested <see cref="GameObject"/> instances.</param>
             /// <remarks>When this method is called, the objectList will be cleared prior to adding the requested <see cref="GameObject"/> instances.</remarks>
             private void AssembleAccessibleObjects(
diff --git a/org.mixedrealitytoolkit.accessibility/Utilities/ScreenReaderSpatializationOption.cs b/org.mixedrealitytoolkit.accessibility/Utilities/ScreenReaderSpatializationOption.cs
@@ -11,7 +11,7 @@ public enum ScreenReaderSpatializationOption
     {
         /// <summary>
         /// The screen reader will not spatialize the audio. It will be played as a
-        /// 'flat strereo' presentation.
+        /// 'flat stereo' presentation.
         /// </summary>
         None = 0,
 
diff --git a/org.mixedrealitytoolkit.core/Subsystems/Speech/DictationSubsystem.cs b/org.mixedrealitytoolkit.core/Subsystems/Speech/DictationSubsystem.cs
@@ -121,7 +121,7 @@ public event Action<DictationSessionEventArgs> RecognitionFaulted
         #endregion IDictationSubsystem implementation
 
         /// <summary>
-        /// Registers a dication subsystem implementation based on the given subsystem parameters.
+        /// Registers a dictation subsystem implementation based on the given subsystem parameters.
         /// </summary>
         /// <param name="DictationSubsystemParams">The parameters defining the dictation subsystem functionality implemented
         /// by the subsystem provider.</param>
diff --git a/org.mixedrealitytoolkit.core/Tests/Runtime/InteractableEventRouterTests.cs b/org.mixedrealitytoolkit.core/Tests/Runtime/InteractableEventRouterTests.cs
@@ -285,7 +285,7 @@ public IEnumerator MultipleInteractableEventRoutersOnlyOneBubbledEventTest()
             levelA_router.AddEventRoute<TrickleChildHoverEvents>();
             levelA_router.AddEventRoute<TrickleChildSelectEvents>();
 
-            // Refersh level 0 router, to ensure it doesn't pickup levelB_testInteractableParent
+            // Refresh level 0 router, to ensure it doesn't pickup levelB_testInteractableParent
             level0_router.Refresh();
 
 
@@ -330,7 +330,7 @@ public IEnumerator MultipleInteractableEventRoutersOnlyOneTrickledEventTest()
             levelA_router.AddEventRoute<TrickleChildHoverEvents>();
             levelA_router.AddEventRoute<TrickleChildSelectEvents>();
 
-            // Refersh level 0 router, to ensure it doesn't pickup levelB_testInteractableParent
+            // Refresh level 0 router, to ensure it doesn't pickup levelB_testInteractableParent
             level0_router.Refresh();
 
             Assert.AreEqual(0, level2_testInteractableChild.ParentSelectEnteredCount, "No parent select entered events should have occurred yet.");
diff --git a/org.mixedrealitytoolkit.data/Runtime/Scripts/DataConsumers/DataConsumerCollection.cs b/org.mixedrealitytoolkit.data/Runtime/Scripts/DataConsumers/DataConsumerCollection.cs
@@ -56,7 +56,7 @@ public class DataConsumerCollection : DataConsumerGOBase, IDataConsumerCollectio
         [SerializeField]
         protected DataCollectionItemPlacerGOBase itemPlacer;
 
-        [Tooltip("Maximum number of items to allow in the prefeb re-use pool. This generally should be at least 2 times the number of items visible at any one time to allow for scrolling and paging.")]
+        [Tooltip("Maximum number of items to allow in the prefab re-use pool. This generally should be at least 2 times the number of items visible at any one time to allow for scrolling and paging.")]
         [SerializeField]
         protected int itemPrefabPoolSize = 20;
 
@@ -656,4 +656,4 @@ protected override void DetachDataConsumer()
         }
     }
 }
-#pragma warning restore CS1591
+#pragma warning restore CS1591
diff --git a/org.mixedrealitytoolkit.input/CHANGELOG.md b/org.mixedrealitytoolkit.input/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 * Added a project validation rule to ensure the Unity XR Hands subsystem is enabled in the OpenXR settings when the corresponding MRTK subsystem is enabled. [PR #973](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/973)
 * Added support for Unity's com.unity.cloud.gltfast and com.unity.cloud.ktx packages when loading controller models. [PR #631](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/631)
+* Added toggle for frame rate independent smoothing in camera simulation. [PR #1011](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1011)
 
 ### Fixed
 
diff --git a/org.mixedrealitytoolkit.input/Controllers/ActionBasedControllerWithFallbacks.cs b/org.mixedrealitytoolkit.input/Controllers/ActionBasedControllerWithFallbacks.cs
@@ -10,7 +10,7 @@
 namespace MixedReality.Toolkit.Input
 {
     /// <summary>
-    /// A specilized version of Unity's ActionBasedController that will fallback to other Input System actions for
+    /// A specialized version of Unity's ActionBasedController that will fallback to other Input System actions for
     /// position and rotation data when ActionBasedController's default track state has no position or rotation data. 
     /// </summary>
     /// <remarks>
diff --git a/org.mixedrealitytoolkit.input/Editor/Inspectors/CameraSimulationSettingsDrawer.cs b/org.mixedrealitytoolkit.input/Editor/Inspectors/CameraSimulationSettingsDrawer.cs
@@ -18,6 +18,7 @@ public class CameraSimulationSettingsDrawer : PropertyDrawer
 
         private readonly GUIContent moveSpeedContent = new GUIContent("Speed");
         private readonly GUIContent moveSmoothingContent = new GUIContent("Smoothed");
+        private readonly GUIContent frameRateIndependentContent = new GUIContent("Frame Rate Independent");
         private readonly GUIContent moveDepthContent = new GUIContent("Depth");
         private readonly GUIContent moveHorizontalContent = new GUIContent("Horizontal");
         private readonly GUIContent moveVerticalContent = new GUIContent("Vertical");
@@ -78,6 +79,7 @@ public override void OnGUI(
 
             SerializedProperty moveSpeed = property.FindPropertyRelative("moveSpeed");
             SerializedProperty moveSmoothing = property.FindPropertyRelative("isMovementSmoothed");
+            SerializedProperty frameRateIndependent = property.FindPropertyRelative("isFrameRateIndependent");
             SerializedProperty moveDepth = property.FindPropertyRelative("moveDepth");
             SerializedProperty moveHorizontal = property.FindPropertyRelative("moveHorizontal");
             SerializedProperty moveVertical = property.FindPropertyRelative("moveVertical");
@@ -97,6 +99,13 @@ public override void OnGUI(
                     ++rowMultiplier,
                     PropertyDrawerUtilities.Height),
                 moveSpeed, moveSpeedContent);
+            EditorGUI.PropertyField(
+                PropertyDrawerUtilities.GetPosition(
+                    position,
+                    PropertyDrawerUtilities.VerticalSpacing,
+                    ++rowMultiplier,
+                    PropertyDrawerUtilities.Height),
+                frameRateIndependent, frameRateIndependentContent);
             EditorGUI.PropertyField(
                 PropertyDrawerUtilities.GetPosition(
                     position,
diff --git a/org.mixedrealitytoolkit.input/Simulation/Devices/CameraSimulationSettings.cs b/org.mixedrealitytoolkit.input/Simulation/Devices/CameraSimulationSettings.cs
@@ -58,6 +58,19 @@ public bool IsMovementSmoothed
             set => isMovementSmoothed = value;
         }
 
+        [SerializeField]
+        [Tooltip("Multiply resulting speed with deltaTime?")]
+        private bool isFrameRateIndependent = true;
+
+        /// <summary>
+        /// Multiply resulting speed with deltaTime?
+        /// </summary>
+        public bool IsFrameRateIndependent
+        {
+            get => isFrameRateIndependent;
+            set => isFrameRateIndependent = value;
+        }
+
         [SerializeField]
         [Tooltip("The input action used to move the camera along the depth axis.")]
         private InputActionReference moveDepth;
diff --git a/org.mixedrealitytoolkit.input/Simulation/Devices/SimulatedHMD.cs b/org.mixedrealitytoolkit.input/Simulation/Devices/SimulatedHMD.cs
@@ -116,31 +116,50 @@ public void ResetToOrigin()
         /// <param name="isSmoothed">Should smoothing be applied to camera movement?</param>
         /// <param name="moveSpeed">Multiplier used to adjust how fast the camera moves.</param>
         /// <param name="rotationSensitivity">Multiplier used to adjust the sensitivity of the camera rotation.</param>
+        /// <param name="frameRateIndependent">Multiply resulting speed with deltaTime?</param>
         public void Update(
             Vector3 moveDelta,
             Vector3 rotationDelta,
             bool isSmoothed = true,
             float moveSpeed = 1f,
-            float rotationSensitivity = 1f)
+            float rotationSensitivity = 1f,
+            bool frameRateIndependent = true)
         {
             using (UpdatePerfMarker.Auto())
             {
                 if (simulatedHmd == null) { return; }
 
                 // Perform smoothing on move delta.
+                if (frameRateIndependent)
+                {
+                    smoothedMoveDelta = isSmoothed ?
+                        Smoothing.SmoothTo(smoothedMoveDelta, moveDelta, moveSmoothingTime, Time.deltaTime) :
+                        100f * Time.deltaTime * moveDelta;
+                }
                 // Yes; this isn't framerate independent. However; there's currently a Unity editor bug
                 // wherein the *polling rate* of your mouse can cause severe lagspikes in the
                 // editor; this causes deltaTimes to go all over the place while moving your mouse.
                 // Using fixedDeltaTime is a good workaround until this bug is resolved.
-                smoothedMoveDelta = isSmoothed ?
-                    Smoothing.SmoothTo(smoothedMoveDelta, moveDelta, moveSmoothingTime, Time.fixedDeltaTime) :
-                    moveDelta;
-
+                else
+                {
+                    smoothedMoveDelta = isSmoothed ?
+                        Smoothing.SmoothTo(smoothedMoveDelta, moveDelta, moveSmoothingTime, Time.fixedDeltaTime) :
+                        moveDelta;
+                }
+                
                 simulatedHmdState.trackingState = (int)(InputTrackingState.Position | InputTrackingState.Rotation);
 
                 // HMD poses are relative to the camera floor offset.
                 Transform origin = PlayspaceUtilities.XROrigin.CameraFloorOffsetObject.transform;
-                Vector3 cameraPosition = simulatedHmdState.centerEyePosition + Quaternion.Inverse(origin.rotation) * Camera.main.transform.rotation * (smoothedMoveDelta * moveSpeed);
+                Vector3 cameraPosition = simulatedHmdState.centerEyePosition;
+                if (frameRateIndependent)
+                {
+                    cameraPosition += Quaternion.Inverse(origin.rotation) * Camera.main.transform.rotation * (1000f * moveSpeed * Time.deltaTime * smoothedMoveDelta);
+                }
+                else
+                {
+                    cameraPosition += Quaternion.Inverse(origin.rotation) * Camera.main.transform.rotation * (smoothedMoveDelta * moveSpeed);
+                }
 
                 // Update camera rotation
                 cameraRotation += rotationDelta * rotationSensitivity;
diff --git a/org.mixedrealitytoolkit.input/Simulation/InputSimulator.cs b/org.mixedrealitytoolkit.input/Simulation/InputSimulator.cs
@@ -203,7 +203,8 @@ private void UpdateSimulatedHMD()
                     rotationDelta,
                     CameraSettings.IsMovementSmoothed,
                     CameraSettings.MoveSpeed,
-                    CameraSettings.RotationSensitivity);
+                    CameraSettings.RotationSensitivity,
+                    CameraSettings.IsFrameRateIndependent);
             }
         }
 
diff --git a/org.mixedrealitytoolkit.input/Simulation/Prefabs/MRTKInputSimulator.prefab b/org.mixedrealitytoolkit.input/Simulation/Prefabs/MRTKInputSimulator.prefab
@@ -50,6 +50,7 @@ MonoBehaviour:
     simulationEnabled: 1
     originOffset: {x: 0, y: 0, z: 0}
     isMovementSmoothed: 1
+    isFrameRateIndependent: 1
     moveDepth: {fileID: 7299012687604269993, guid: 70b361cf3c037d54896482d1ffd9f999, type: 3}
     moveHorizontal: {fileID: 8718149717473967433, guid: 70b361cf3c037d54896482d1ffd9f999, type: 3}
     moveVertical: {fileID: 8557015737124631664, guid: 70b361cf3c037d54896482d1ffd9f999, type: 3}
@@ -61,6 +62,7 @@ MonoBehaviour:
     invertPitch: 0
   eyeGazeSettings:
     simulationEnabled: 1
+    isTracked: 1
     eyeOriginOffset: {x: 0, y: 0, z: 0}
     lookHorizontal: {fileID: -7345170528461143681, guid: 70b361cf3c037d54896482d1ffd9f999, type: 3}
     lookVertical: {fileID: -4223466768389085971, guid: 70b361cf3c037d54896482d1ffd9f999, type: 3}
diff --git a/org.mixedrealitytoolkit.input/Simulation/Utilities/ControllerAnchorPosition.cs b/org.mixedrealitytoolkit.input/Simulation/Utilities/ControllerAnchorPosition.cs
@@ -14,7 +14,7 @@ public enum ControllerAnchorPoint
         /// </summary>
         Device = 0,
 
-        // Something which might be useful in the future. Applications like Beat Saber greatly benefitted from being able to offset the rotation and position of the controllers
+        // Something which might be useful in the future. Applications like Beat Saber greatly benefited from being able to offset the rotation and position of the controllers
         ///// <summary>
         ///// The Controller's anchor will be offset from the device's position by a fixed relative offset
         ///// </summary>
diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/FuzzyGazeInteractorTests.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/FuzzyGazeInteractorTests.cs
@@ -34,7 +34,7 @@ public IEnumerator BasicFuzzyGazeTest()
             FuzzyGazeInteractor fuzzyGazeInteractor = FindObjectUtility.FindAnyObjectByType<FuzzyGazeInteractor>();
             Assert.IsNotNull(fuzzyGazeInteractor, "There is no active FuzzyGazeInteractor found in the scene.");
 
-            // Instantiate two foregound cubes and one background cube for testing
+            // Instantiate two foreground cubes and one background cube for testing
             GameObject cube1 = GameObject.CreatePrimitive(PrimitiveType.Cube);
             cube1.AddComponent<StatefulInteractable>();
             cube1.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(0.07f, 0.2f, 1));
@@ -113,7 +113,7 @@ public IEnumerator FuzzyGazePrecisionTest()
             fuzzyGazeInteractor.performAdditionalRaycast = false;
 
             yield return RuntimeTestUtilities.WaitForUpdates();
-            // Instantiate one foregound cubes and one background cube for testing
+            // Instantiate one foreground cubes and one background cube for testing
             GameObject foregroundCube = GameObject.CreatePrimitive(PrimitiveType.Cube);
             foregroundCube.AddComponent<StatefulInteractable>();
             foregroundCube.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(0.241f, 0, 2));
diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverTapToPlaceTests.cs b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverTapToPlaceTests.cs
@@ -253,7 +253,7 @@ public IEnumerator TapToPlaceIsBeingPlacedBeforeStart()
             // Wait for solvers double click prevention timeout
             yield return new WaitForSeconds(0.5f + 0.1f);
 
-            // Must call StopPlacement for following tests to not fail because rig keept reference to the TapToPlace
+            // Must call StopPlacement for following tests to not fail because rig kept reference to the TapToPlace
             solver.StopPlacement();
 
             yield return RuntimeTestUtilities.WaitForUpdates(1);

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private void SetStatus(string status)`
`62`	`62`	`/// </summary>`
`63`	`63`	`private IEnumerator Sequence()`
`64`	`64`	`{`
`65`		`- // Keep cycling through test until scene is exitted.`
	`65`	`+ // Keep cycling through test until scene is exited.`
`66`	`66`	`while (true)`
`67`	`67`	`{`
`68`	`68`	`var cube = GameObject.CreatePrimitive(PrimitiveType.Cube);`
Original file line number	Diff line number	Diff line change
`@@ -196,15 +196,15 @@ public void PanVertically(float speed)`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`/// <summary>`
`199`		`- /// Enables zoom operations using hand based interators.`
	`199`	`+ /// Enables zoom operations using hand based interactors.`
`200`	`200`	`/// </summary>`
`201`	`201`	`public void EnableHandZoom()`
`202`	`202`	`{`
`203`	`203`	`handZoomEnabled = true;`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`/// <summary>`
`207`		`- /// Disables zoom operations using hand based interators.`
	`207`	`+ /// Disables zoom operations using hand based interactors.`
`208`	`208`	`/// </summary>`
`209`	`209`	`public void DisableHandZoom()`
`210`	`210`	`{`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ private void Initialize(float newAspectRatio)`
`78`	`78`	`/// </summary>`
`79`	`79`	`/// <param name="uvCursorPosition">Normalized cursor position in the hit box. Center is assumed to be at (-0.5, 0.5).</param>`
`80`	`80`	`/// <param name="maxSpeed">The maximum speed that can be returned by this function.</param>`
`81`		`- /// <param name="minDistanceFromCenterForAutoPan">The minium distances from the center at which to start panning.</param>`
	`81`	`+ /// <param name="minDistanceFromCenterForAutoPan">The minimum distances from the center at which to start panning.</param>`
`82`	`82`	`protected override float ComputePanSpeed(float uvCursorPosition, float maxSpeed, float minDistanceFromCenterForAutoPan)`
`83`	`83`	`{`
`84`	`84`	`// UV space from [0,1] -> Center: [-0.5, 0.5]`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public enum ScreenReaderSpatializationOption`
`11`	`11`	`{`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// The screen reader will not spatialize the audio. It will be played as a`
`14`		`- /// 'flat strereo' presentation.`
	`14`	`+ /// 'flat stereo' presentation.`
`15`	`15`	`/// </summary>`
`16`	`16`	`None = 0,`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public class DataConsumerCollection : DataConsumerGOBase, IDataConsumerCollectio`
`56`	`56`	`[SerializeField]`
`57`	`57`	`protected DataCollectionItemPlacerGOBase itemPlacer;`
`58`	`58`
`59`		`- [Tooltip("Maximum number of items to allow in the prefeb re-use pool. This generally should be at least 2 times the number of items visible at any one time to allow for scrolling and paging.")]`
	`59`	`+ [Tooltip("Maximum number of items to allow in the prefab re-use pool. This generally should be at least 2 times the number of items visible at any one time to allow for scrolling and paging.")]`
`60`	`60`	`[SerializeField]`
`61`	`61`	`protected int itemPrefabPoolSize = 20;`
`62`	`62`
`@@ -656,4 +656,4 @@ protected override void DetachDataConsumer()`
`656`	`656`	`}`
`657`	`657`	`}`
`658`	`658`	`}`
`659`		`-#pragma warning restore CS1591`
	`659`	`+#pragma warning restore CS1591`