Browse Source

Fixed Box3F::overlap

Daniel Buckmaster 11 years ago
parent
commit
535f6b6bd7
1 changed files with 8 additions and 0 deletions
  1. 8 0
      Engine/source/math/mBox.h

+ 8 - 0
Engine/source/math/mBox.h

@@ -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;
 }
 }