default / max tests wip

Author: bethalha-havok

Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/ProximityEffect/ProximityEffect.cs

@@ -137,30 +137,37 @@ public void UpdateScaling(Vector3 boundsCenter, Vector3 boundsExtents)
             {
                 foreach (var pointer in inputSource.Pointers)
                 {
-                    if (pointer.IsInteractionEnabled && !proximityPointers.Contains(pointer))
+                    // don't use IsInteractionEnabled for near pointers as the pointers might have a different radius when deciding
+                    // if they can interact with a near-by object - we might still want to show proximity scaling even if
+                    // eg. grab pointer decides it's too far away to actually perform the interaction
+                    if (pointer.IsActive
+                        && (pointer.IsInteractionEnabled || pointer is IMixedRealityNearPointer)
+                        && !proximityPointers.Contains(pointer))
                     {
                         proximityPointers.Add(pointer);
                     }
                 }
             }
 
             // Get the max radius possible of our current bounds plus the proximity
-            float maxRadius = Mathf.Max(Mathf.Max(boundsExtents.x, boundsExtents.y), boundsExtents.z);
-            maxRadius *= maxRadius;
-            maxRadius += config.ObjectCloseProximity + config.ObjectMediumProximity;
+            float squareMaxLength= boundsExtents.sqrMagnitude + (3 * config.ObjectMediumProximity * config.ObjectMediumProximity);
 
             // Grab points within sphere of influence from valid pointers
             foreach (var pointer in proximityPointers)
             {
-                if (IsPointWithinBounds(boundsCenter, pointer.Position, maxRadius))
+                
+                if (IsPointWithinBounds(boundsCenter, pointer.Position, squareMaxLength))
                 {
                     proximityPoints.Add(pointer.Position);
                 }
-
-                Vector3? point = pointer.Result?.Details.Point;
-                if (point.HasValue && IsPointWithinBounds(boundsCenter, pointer.Result.Details.Point, maxRadius))
-                {
-                    proximityPoints.Add(pointer.Result.Details.Point);
+                
+                if (pointer.Result?.CurrentPointerTarget != null)
+                { 
+                    Vector3? point = pointer.Result?.Details.Point;
+                    if (point.HasValue && IsPointWithinBounds(boundsCenter, pointer.Result.Details.Point, squareMaxLength))
+                    {
+                        proximityPoints.Add(pointer.Result.Details.Point);
+                    }
                 }
             }
 
@@ -278,11 +285,11 @@ private bool IsPointWithinBounds(Vector3 position, Vector3 point, float radiusSq
         /// <returns>ProximityState for given distance</returns>
         private ProximityState GetProximityState(float sqrDistance)
         {
-            if (sqrDistance < config.ObjectCloseProximity * config.ObjectCloseProximity)
+            if (sqrDistance <= (config.ObjectCloseProximity * config.ObjectCloseProximity))
             {
                 return ProximityState.CloseProximity;
             }
-            else if (sqrDistance < config.ObjectMediumProximity * config.ObjectMediumProximity)
+            else if (sqrDistance <= (config.ObjectMediumProximity * config.ObjectMediumProximity))
             {
                 return ProximityState.MediumProximity;
             }

Assets/MixedRealityToolkit.Tests/PlayModeTests/Experimental/BoundsControlTests.cs

@@ -381,12 +381,12 @@ public IEnumerator ScaleHandlesOnProximity()
             proximityConfig.FarGrowRate = 1.0f;
             bbox.CreateRig();
             yield return null; // wait so rig gameobjects get recreated
-            yield return TestCurrentProximityConfiguration(bbox, hand);
+            yield return TestCurrentProximityConfiguration(bbox, hand, "Defaults");
 
             // reset hand
             yield return hand.MoveTo(initialHandPosition);
 
-            //--- 3. now test custom configuration is applied during runtime
+            //--- 3. now test custom configuration is applied during runtime - max proximity values
             proximityConfig.CloseScale = 4.0f;
             proximityConfig.MediumScale = 3.0f;
             proximityConfig.FarScale = 2.0f;
@@ -396,7 +396,18 @@ public IEnumerator ScaleHandlesOnProximity()
 
             bbox.CreateRig();
             yield return null; // wait so rig gameobjects get recreated
-            yield return TestCurrentProximityConfiguration(bbox, hand);
+            yield return TestCurrentProximityConfiguration(bbox, hand, "Custom runtime config max");
+
+            // reset hand
+            yield return hand.MoveTo(initialHandPosition); 
+
+            //--- 4. custom config - min values
+            proximityConfig.ObjectMediumProximity = 0.005f;
+            proximityConfig.ObjectCloseProximity = 0.001f;
+
+            bbox.CreateRig();
+            yield return null; // wait so rig gameobjects get recreated
+            yield return TestCurrentProximityConfiguration(bbox, hand, "Custom runtime config min");
         }
 
 
@@ -405,49 +416,55 @@ public IEnumerator ScaleHandlesOnProximity()
         /// </summary>
         /// <param name="bbox">Bounds Control to test on</param>
         /// <param name="hand">Test hand to use for testing proximity to handle</param>
-        private IEnumerator TestCurrentProximityConfiguration(BoundsControl bbox, TestHand hand)
+        private IEnumerator TestCurrentProximityConfiguration(BoundsControl bbox, TestHand hand, string testDescription)
         {
+            const float handOffset = 0.036718f; // TODO : THIS OFFSET IS STILL WRONG!
+
             // get config and scaling handle
             ScaleHandlesConfiguration scaleHandleConfig = bbox.ScaleHandlesConfiguration;
             Vector3 defaultHandleSize = Vector3.one * scaleHandleConfig.HandleSize;
             Transform scaleHandle = bbox.gameObject.transform.Find("rigRoot/corner_3");
             Transform proximityScaledVisual = scaleHandle.GetChild(0)?.GetChild(0);
             var frontRightCornerPos = scaleHandle.position;
+            // compensate for hand offset 
+            frontRightCornerPos.y += handOffset;
 
             //yield return null;
 
             // check far scale applied
             ProximityEffectConfiguration proximityConfig = bbox.HandleProximityEffectConfiguration;
             Vector3 expectedFarScale = defaultHandleSize * proximityConfig.FarScale;
-            Assert.AreEqual(proximityScaledVisual.localScale, expectedFarScale, "Proximity far scale wasn't applied to handle");
+            yield return PlayModeTestUtilities.WaitForEnterKey();
+            Assert.AreEqual(proximityScaledVisual.localScale, expectedFarScale, testDescription + " - Proximity far scale wasn't applied to handle");
 
             // move into medium range and check if scale was applied
             Vector3 mediumProximityTestDist = frontRightCornerPos;
-            mediumProximityTestDist.x += (proximityConfig.ObjectMediumProximity);
+            mediumProximityTestDist.x += proximityConfig.ObjectMediumProximity;
             yield return hand.MoveTo(mediumProximityTestDist, 50);
             yield return PlayModeTestUtilities.WaitForEnterKey();
             Vector3 expectedMediumScale = defaultHandleSize * proximityConfig.MediumScale;
-            Assert.AreEqual(proximityScaledVisual.localScale, expectedMediumScale, "Proximity medium scale wasn't applied to handle");
+            Assert.AreEqual(proximityScaledVisual.localScale, expectedMediumScale, testDescription + " - Proximity medium scale wasn't applied to handle");
 
             // move into close scale range and check if scale was applied
             Vector3 closeProximityTestDir = frontRightCornerPos;
             closeProximityTestDir.x += proximityConfig.ObjectCloseProximity;
             yield return hand.MoveTo(closeProximityTestDir);
             Vector3 expectedCloseScale = defaultHandleSize * proximityConfig.CloseScale;
-            Assert.AreEqual(proximityScaledVisual.localScale, expectedCloseScale, "Proximity close scale wasn't applied to handle");
+            yield return PlayModeTestUtilities.WaitForEnterKey();
+            Assert.AreEqual(proximityScaledVisual.localScale, expectedCloseScale, testDescription + " - Proximity close scale wasn't applied to handle");
 
-            const float moveOutOfScaleConstant = 0.01f;
+            float moveOutOfScaleConstant = proximityConfig.ObjectCloseProximity;
             // move out of close scale again - should fall back to medium proximity
             closeProximityTestDir.x += moveOutOfScaleConstant;
             yield return hand.MoveTo(closeProximityTestDir);
             yield return PlayModeTestUtilities.WaitForEnterKey();
-            Assert.AreEqual(proximityScaledVisual.localScale, expectedMediumScale, "Proximity medium scale wasn't applied to handle");
+            Assert.AreEqual(proximityScaledVisual.localScale, expectedMediumScale, testDescription + " - Proximity medium scale wasn't applied to handle");
 
             // move slightly out of medium proximity and check if far scaling is applied
             mediumProximityTestDist.x += moveOutOfScaleConstant;
             yield return hand.MoveTo(mediumProximityTestDist);
             yield return PlayModeTestUtilities.WaitForEnterKey();
-            Assert.AreEqual(proximityScaledVisual.localScale, expectedFarScale, "Proximity far scale wasn't applied to handle");
+            Assert.AreEqual(proximityScaledVisual.localScale, expectedFarScale, testDescription + " - Proximity far scale wasn't applied to handle");
 
             yield return null;
         }