Merge pull request #10331 from davidkline-ms/bpSolverWarning

David Kline · keveleigh · commit 09790c6580d9 · 2021-11-17T17:36:51.000-08:00
Backport recent v3 update to reduce debug log spam
diff --git a/Assets/MRTK/SDK/Features/Utilities/Solvers/HandConstraint.cs b/Assets/MRTK/SDK/Features/Utilities/Solvers/HandConstraint.cs
@@ -263,7 +263,7 @@ public override void SolverUpdate()
             if (SolverHandler.TrackedTargetType != TrackedObjectType.HandJoint &&
                 SolverHandler.TrackedTargetType != TrackedObjectType.ControllerRay)
             {
-                Debug.LogWarning("Solver HandConstraint requires TrackedObjectType of type HandJoint or ControllerRay");
+                // Requires HandJoint or ControllerRay target type.
                 return;
             }
 
@@ -705,6 +705,12 @@ protected override void OnEnable()
             trackedController = null;
             OnLastHandLost.Invoke();
             OnHandDeactivate.Invoke();
+
+            if (SolverHandler.TrackedTargetType != TrackedObjectType.HandJoint &&
+                SolverHandler.TrackedTargetType != TrackedObjectType.ControllerRay)
+            {
+                Debug.LogWarning("Solver HandConstraint requires TrackedObjectType of type HandJoint or ControllerRay.");
+            }
         }
 
         #endregion MonoBehaviour Implementation

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ public override void SolverUpdate()`
`263`	`263`	`if (SolverHandler.TrackedTargetType != TrackedObjectType.HandJoint &&`
`264`	`264`	`SolverHandler.TrackedTargetType != TrackedObjectType.ControllerRay)`
`265`	`265`	`{`
`266`		`- Debug.LogWarning("Solver HandConstraint requires TrackedObjectType of type HandJoint or ControllerRay");`
	`266`	`+ // Requires HandJoint or ControllerRay target type.`
`267`	`267`	`return;`
`268`	`268`	`}`
`269`	`269`
`@@ -705,6 +705,12 @@ protected override void OnEnable()`
`705`	`705`	`trackedController = null;`
`706`	`706`	`OnLastHandLost.Invoke();`
`707`	`707`	`OnHandDeactivate.Invoke();`
	`708`	`+`
	`709`	`+ if (SolverHandler.TrackedTargetType != TrackedObjectType.HandJoint &&`
	`710`	`+ SolverHandler.TrackedTargetType != TrackedObjectType.ControllerRay)`
	`711`	`+ {`
	`712`	`+ Debug.LogWarning("Solver HandConstraint requires TrackedObjectType of type HandJoint or ControllerRay.");`
	`713`	`+ }`
`708`	`714`	`}`
`709`	`715`
`710`	`716`	`#endregion MonoBehaviour Implementation`