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

re-enable the fix for broken friction in Clang (got accidently undone in a recent commit)

Browse Source 
fix OSX build
This commit is contained in:
Erwin Coumans
2014-05-03 10:11:49 -07:00
parent 0e1a77047c
commit e279aed08f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
View File

@@ -606,8 +606,8 @@ void btSequentialImpulseConstraintSolver::setupFrictionConstraint(btSolverConstr
// btScalar positionalError = 0.f; // btScalar positionalError = 0.f;
btSimdScalar velocityError = desiredVelocity - rel_vel; btScalar velocityError = desiredVelocity - rel_vel;
btSimdScalar velocityImpulse = velocityError * btSimdScalar(solverConstraint.m_jacDiagABInv); btScalar velocityImpulse = velocityError * solverConstraint.m_jacDiagABInv;
solverConstraint.m_rhs = velocityImpulse; solverConstraint.m_rhs = velocityImpulse;
solverConstraint.m_rhsPenetration = 0.f; solverConstraint.m_rhsPenetration = 0.f;
solverConstraint.m_cfm = cfmSlip; solverConstraint.m_cfm = cfmSlip;

7
src/LinearMath/btCpuFeatureUtility.h
View File

@@ -5,9 +5,12 @@
#include "LinearMath/btScalar.h" #include "LinearMath/btScalar.h"
#include <string.h>//memset #include <string.h>//memset
#ifdef BT_USE_SSE #ifdef USE_SIMD
#include <emmintrin.h>
#ifdef BT_ALLOW_SSE4
#include <intrin.h> #include <intrin.h>
#endif #endif //BT_ALLOW_SSE4
#endif //USE_SIMD
#if defined BT_USE_NEON #if defined BT_USE_NEON
#define ARM_NEON_GCC_COMPATIBILITY 1 #define ARM_NEON_GCC_COMPATIBILITY 1