diff options
Diffstat (limited to 'extern/bullet2/src/LinearMath/btConvexHull.cpp')
| -rw-r--r-- | extern/bullet2/src/LinearMath/btConvexHull.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/extern/bullet2/src/LinearMath/btConvexHull.cpp b/extern/bullet2/src/LinearMath/btConvexHull.cpp index 532d76d881f..2ae855dbc1f 100644 --- a/extern/bullet2/src/LinearMath/btConvexHull.cpp +++ b/extern/bullet2/src/LinearMath/btConvexHull.cpp @@ -22,13 +22,6 @@ subject to the following restrictions: -template <class T> -void Swap(T &a,T &b) -{ - T tmp = a; - a=b; - b=tmp; -} //---------------------------------- @@ -518,7 +511,7 @@ int4 HullLibrary::FindSimplex(btVector3 *verts,int verts_count,btAlignedObjectAr if(p3==p0||p3==p1||p3==p2) return int4(-1,-1,-1,-1); btAssert(!(p0==p1||p0==p2||p0==p3||p1==p2||p1==p3||p2==p3)); - if(btDot(verts[p3]-verts[p0],btCross(verts[p1]-verts[p0],verts[p2]-verts[p0])) <0) {Swap(p2,p3);} + if(btDot(verts[p3]-verts[p0],btCross(verts[p1]-verts[p0],verts[p2]-verts[p0])) <0) {btSwap(p2,p3);} return int4(p0,p1,p2,p3); } @@ -570,7 +563,7 @@ int HullLibrary::calchullgen(btVector3 *verts,int verts_count, int vlimit) vlimit-=4; while(vlimit >0 && ((te=extrudable(epsilon)) != 0)) { - int3 ti=*te; + //int3 ti=*te; int v=te->vmax; btAssert(v != -1); btAssert(!isextreme[v]); // wtf we've already done this vertex |