TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #570 from eightyeight/box3f-overlap

Browse source 
Fixed Box3F::overlap
This commit is contained in:
Thomas Fischer 2014-03-15 09:15:12 +01:00
commit e906865a56
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/math/mBox.h
View file

@ -334,10 +334,18 @@ inline Box3F Box3F::getOverlap( const Box3F& otherBox ) const
Box3F overlap; Box3F overlap;
for( U32 i = 0; i < 3; ++ i ) for( U32 i = 0; i < 3; ++ i )
{
if( minExtents[ i ] > otherBox.maxExtents[ i ] || otherBox.minExtents[ i ] > maxExtents[ i ] ) if( minExtents[ i ] > otherBox.maxExtents[ i ] || otherBox.minExtents[ i ] > maxExtents[ i ] )
{
overlap.minExtents[ i ] = 0.f; overlap.minExtents[ i ] = 0.f;
overlap.maxExtents[ i ] = 0.f;
}
else else
{
overlap.minExtents[ i ] = getMax( minExtents[ i ], otherBox.minExtents[ i ] ); overlap.minExtents[ i ] = getMax( minExtents[ i ], otherBox.minExtents[ i ] );
overlap.maxExtents[ i ] = getMin( maxExtents[ i ], otherBox.maxExtents[ i ] );
}
}
return overlap; return overlap;
} }