From 7e5eacc43d03fd03e0ecfe12d2e0cccd0abf10de Mon Sep 17 00:00:00 2001 From: James Urquhart Date: Sat, 4 Feb 2023 12:35:33 +0000 Subject: [PATCH] Fix SceneContainer ray test --- Engine/source/scene/sceneContainer.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Engine/source/scene/sceneContainer.cpp b/Engine/source/scene/sceneContainer.cpp index 2696c858a..ad7bb3540 100644 --- a/Engine/source/scene/sceneContainer.cpp +++ b/Engine/source/scene/sceneContainer.cpp @@ -1047,11 +1047,13 @@ bool SceneContainer::_castRay( U32 type, const Point3F& start, const Point3F& en if (simpleCase) { - foundCandidate = foundCandidate && SceneRayHelper::castInBinSimple(rayParams, rayQuery, mBinArray, info, del); + if (SceneRayHelper::castInBinSimple(rayParams, rayQuery, mBinArray, info, del)) + foundCandidate = true; } else { - foundCandidate = foundCandidate && SceneRayHelper::castInBins(rayParams, rayQuery, mBinArray, info, del); + if (SceneRayHelper::castInBins(rayParams, rayQuery, mBinArray, info, del)) + foundCandidate = true; } mSearchInProgress = false; @@ -1171,11 +1173,13 @@ bool SceneContainer::collideBox(const Point3F &start, const Point3F &end, U32 ma if (simpleCase) { - foundCandidate = foundCandidate && SceneRayHelper::castInBinSimple(rayParams, rayQuery, mBinArray, info, BoxRayCallbackDelegate()); + if (SceneRayHelper::castInBinSimple(rayParams, rayQuery, mBinArray, info, BoxRayCallbackDelegate())) + foundCandidate = true; } else { - foundCandidate = foundCandidate && SceneRayHelper::castInBins(rayParams, rayQuery, mBinArray, info, BoxRayCallbackDelegate()); + if (SceneRayHelper::castInBins(rayParams, rayQuery, mBinArray, info, BoxRayCallbackDelegate())) + foundCandidate = true; } mSearchInProgress = false;