GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 1.9

Browse Source 
# Conflicts:
#	Source/Engine/Audio/Audio.cpp
This commit is contained in:
Wojtek Figat
2024-07-05 22:18:40 +02:00
parent 230c57cca4 009e1aaebb
commit 559cd74647
122 changed files with 8832 additions and 4272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Core/Math/BoundingSphere.cpp
View File

@@ -140,7 +140,11 @@ void BoundingSphere::FromPoints(const Double3* points, int32 pointsCount, Boundi
void BoundingSphere::FromBox(const BoundingBox& box, BoundingSphere& result)
{
ASSERT(!box.Minimum.IsNanOrInfinity() && !box.Maximum.IsNanOrInfinity());
if (box.Minimum.IsNanOrInfinity() || box.Maximum.IsNanOrInfinity())
{
result = Empty;
return;
}
const Real x = box.Maximum.X - box.Minimum.X;
const Real y = box.Maximum.Y - box.Minimum.Y;
const Real z = box.Maximum.Z - box.Minimum.Z;