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

Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess

Browse source 
# Conflicts:
#	Engine/source/sfx/sfxSystem.cpp
This commit is contained in:
Azaezel 2018-04-23 10:08:14 -05:00
commit 13334b4d5c
22 changed files with 72 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -228,7 +228,7 @@ void PolyhedronBoxIntersector< Polyhedron >::_preprocess( const MatrixF& objToWo
Point2F p = _project( i, v2 ); // Second point on line.
if( frontFace != 0 )
swap( p, q );
T3D::swap( p, q );
Point2F normal( - ( p.y - q.y ), p.x - q.x );
normal.normalize();

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

@ -441,7 +441,7 @@ U32 PlaneSet< T >::clipPolygon( const Point3F* inVertices, U32 inNumVertices, Po
// Make the output of the last iteration the
// input of this iteration.
swap( tempPolygon, clippedPolygon );
T3D::swap( tempPolygon, clippedPolygon );
numTempPolygonVertices = numClippedPolygonVertices;
if( maxOutVertices < numTempPolygonVertices + 1 )

2
Engine/source/math/mathUtils.cpp
View file

@ -1706,7 +1706,7 @@ bool clipFrustumByPolygon( const Point3F* points, U32 numPoints, const RectI& vi
// Make the output of the last iteration the
// input of this iteration.
swap( tempPolygon, clippedPolygon );
T3D::swap( tempPolygon, clippedPolygon );
numTempPolygonVertices = numClippedPolygonVertices;
// Clip our current remainder of the original polygon