Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/erwincoumans/bullet3

Browse Source
This commit is contained in:
erwincoumans
2017-10-08 11:35:06 -07:00
parent 2f2f070ab5 f230011028
commit 64b2164eee
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
View File

@@ -190,9 +190,9 @@ bool btVoronoiSimplexSolver::updateClosestVectorAndPoints()
const btVector3& c = m_simplexVectorW[2]; const btVector3& c = m_simplexVectorW[2];
const btVector3& d = m_simplexVectorW[3]; const btVector3& d = m_simplexVectorW[3];
bool hasSeperation = closestPtPointTetrahedron(p,a,b,c,d,m_cachedBC); bool hasSeparation = closestPtPointTetrahedron(p,a,b,c,d,m_cachedBC);
if (hasSeperation) if (hasSeparation)
{ {
m_cachedP1 = m_simplexPointsP[0] * m_cachedBC.m_barycentricCoords[0] + m_cachedP1 = m_simplexPointsP[0] * m_cachedBC.m_barycentricCoords[0] +

2
src/LinearMath/btVector3.h
View File

@@ -368,7 +368,7 @@ public:
return btAcos(dot(v) / s); return btAcos(dot(v) / s);
} }
/**@brief Return a vector will the absolute values of each element */ /**@brief Return a vector with the absolute values of each element */
SIMD_FORCE_INLINE btVector3 absolute() const SIMD_FORCE_INLINE btVector3 absolute() const
{ {