TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-26 10:03:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'gg/development-3.6' into development

Browse source 
Conflicts:
	Engine/source/T3D/gameFunctions.cpp
This commit is contained in:
Daniel Buckmaster 2015-01-29 21:17:38 +11:00
commit 014b566014
29 changed files with 252 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/math/mPlane.h
View file

@ -383,9 +383,10 @@ inline PlaneF::Side PlaneF::whichSide( const OrientedBox3F& obb ) const
// Project the box onto the line defined by the plane center and normal.
// See "3D Game Engine Design" chapter 4.3.2.
const F32 r = obb.getHalfExtents().x * mFabs( mDot( obb.getAxis( 0 ), *this ) ) +
obb.getHalfExtents().y * mFabs( mDot( obb.getAxis( 1 ), *this ) ) +
obb.getHalfExtents().z * mFabs( mDot( obb.getAxis( 2 ), *this ) );
Point3F mObbHalf = obb.getHalfExtents();
const F32 r = mObbHalf.x * mFabs( mDot( obb.getAxis( 0 ), *this ) ) +
mObbHalf.y * mFabs( mDot( obb.getAxis( 1 ), *this ) ) +
mObbHalf.z * mFabs( mDot( obb.getAxis( 2 ), *this ) );
const F32 dist = distToPlane( obb.getCenter() );
if( dist > r )

2
Engine/source/math/mPlaneSet.h
View file

@ -458,7 +458,7 @@ U32 PlaneSet< T >::clipPolygon( const Point3F* inVertices, U32 inNumVertices, Po
// to indicate we haven't clipped anything.
if( !numClippedPolygonVertices )
return false;
return 0;
// On first iteration, replace the inVertices with the
// outVertices buffer.