Skip to content

Commit bd5a449

Browse files
committed
Fix another edge case uncovered by tests: scale of zero
1 parent 2632f14 commit bd5a449

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Assets/MixedRealityToolkit.Tests/EditModeTests/Core/Extensions/CameraExtensionTests.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void SetUp()
9090
TestColliders = new List<TestCollider>()
9191
{
9292
new TestCollider(-Vector3.forward, smallCubeSize, false, true),
93-
new TestCollider(-Vector3.forward - Vector3.right, smallCubeSize, false, true),
93+
new TestCollider(-Vector3.forward - Vector3.right, largeCubeSize, false, true),
9494
new TestCollider(Vector3.forward, smallCubeSize, true, false),
9595
new TestCollider(Vector3.forward, smallCubeSize, true, false),
9696
new TestCollider(Vector3.zero, Vector3.zero, false, false),
@@ -129,7 +129,9 @@ public void TestIsInFOVConeCachedSecondCamera()
129129
for (int i = 0; i < TestColliders.Count; i++)
130130
{
131131
var test = TestColliders[i];
132-
Assert.AreEqual(test.ShouldBeInFOVCamera2, testCamera2.IsInFOVConeCached(test.Collider), $"TestCollider[{i}] did not match");
132+
Assert.AreEqual(test.ShouldBeInFOVCamera1, testCamera.IsInFOVConeCached(test.Collider), $"TestCollider[{i}] did not match");
133+
Assert.AreEqual(test.ShouldBeInFOVCamera1, testCamera.IsInFOVConeCached(test.Collider), $"TestCollider[{i}] did not match");
134+
Assert.AreEqual(test.ShouldBeInFOVCamera2, testCamera2.IsInFOVConeCached(test.Collider), $"TestColliderSecondCamera[{i}] did not match");
133135
}
134136
}
135137

Assets/MixedRealityToolkit/Utilities/CameraFOVChecker.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static bool IsInFOVConeCached(this Camera cam,
3232
Collider myCollider)
3333
{
3434
// if the collider's size is zero, it is not visible. Return false.
35-
if(myCollider.bounds.size == Vector3.zero)
35+
if(myCollider.bounds.size == Vector3.zero || myCollider.transform.localScale == Vector3.zero)
3636
{
3737
return false;
3838
}

0 commit comments

Comments
 (0)