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

fix compile issues

Browse Source
This commit is contained in:
Erwin Coumans
2016-12-16 18:43:21 -08:00
parent 8ff1e55166
commit 379a852f93
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -330,11 +330,11 @@ btScalar btSequentialImpulseConstraintSolver::resolveSplitPenetrationImpulseCach
return deltaImpulse; return deltaImpulse;
} }
btScalar btSequentialImpulseConstraintSolver::resolveSplitPenetrationSIMD(btSolverBody& body1,btSolverBody& body2,const btSolverConstraint& c) btSimdScalar btSequentialImpulseConstraintSolver::resolveSplitPenetrationSIMD(btSolverBody& body1,btSolverBody& body2,const btSolverConstraint& c)
{ {
#ifdef USE_SIMD #ifdef USE_SIMD
if (!c.m_rhsPenetration) if (!c.m_rhsPenetration)
return; return 0.f;
gNumSplitImpulseRecoveries++; gNumSplitImpulseRecoveries++;

2
src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
View File

@@ -92,7 +92,7 @@ protected:
void convertContact(btPersistentManifold* manifold,const btContactSolverInfo& infoGlobal); void convertContact(btPersistentManifold* manifold,const btContactSolverInfo& infoGlobal);
btScalar resolveSplitPenetrationSIMD( btSimdScalar resolveSplitPenetrationSIMD(
btSolverBody& bodyA,btSolverBody& bodyB, btSolverBody& bodyA,btSolverBody& bodyB,
const btSolverConstraint& contactConstraint); const btSolverConstraint& contactConstraint);