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

Merge remote-tracking branch 'bp/master'

Browse Source
This commit is contained in:
Erwin Coumans (Google)
2015-04-28 20:57:41 -07:00
parent dd6ec0bcfd e884511924
commit 84f2d5b9a0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
View File

@@ -778,8 +778,10 @@ void btConeTwistConstraint::calcAngleInfo2(const btTransform& transA, const btTr
target[2] = x * ivA[2] + y * jvA[2] + z * kvA[2]; target[2] = x * ivA[2] + y * jvA[2] + z * kvA[2];
target.normalize(); target.normalize();
m_swingAxis = -ivB.cross(target); m_swingAxis = -ivB.cross(target);
m_swingCorrection = m_swingAxis.length(); m_swingCorrection = m_swingAxis.length();
m_swingAxis.normalize();
if (!btFuzzyZero(m_swingCorrection))
m_swingAxis.normalize();
} }
} }

2
src/LinearMath/btQuadWord.h
View File

@@ -73,7 +73,7 @@ public:
public: public:
#if defined(BT_USE_SSE) || defined(BT_USE_NEON) #if (defined(BT_USE_SSE_IN_API) && defined(BT_USE_SSE)) || defined(BT_USE_NEON)
// Set Vector // Set Vector
SIMD_FORCE_INLINE btQuadWord(const btSimdFloat4 vec) SIMD_FORCE_INLINE btQuadWord(const btSimdFloat4 vec)