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
2015-02-04 10:15:21 -08:00
parent a164245915 76b80ca71b
commit d84afc11b9
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/GyroscopicDemo/GyroscopicDemo.cpp
View File

@@ -58,7 +58,7 @@ void GyroscopicDemo::initPhysics()
setShadows(true); setShadows(true);
setCameraUp(btVector3(0,0,1)); setCameraUp(btVector3(0,0,1));
setCameraForwardAxis(1); setCameraForwardAxis(1);
m_sundirection.setValue(0,-1,-1); m_sundirection.setValue(0,-1000,-1000);
setCameraDistance(7.f); setCameraDistance(7.f);
setupEmptyDynamicsWorld(); setupEmptyDynamicsWorld();

2
src/BulletDynamics/Character/btKinematicCharacterController.cpp
View File

@@ -636,7 +636,7 @@ void btKinematicCharacterController::playerStep ( btCollisionWorld* collisionWo
// printf(" dt = %f", dt); // printf(" dt = %f", dt);
// quick check... // quick check...
if (!m_useWalkDirection && m_velocityTimeInterval <= 0.0) { if (!m_useWalkDirection && (m_velocityTimeInterval <= 0.0 || m_walkDirection.fuzzyZero())) {
// printf("\n"); // printf("\n");
return; // no motion return; // no motion
} }

6
src/LinearMath/btScalar.h
View File

@@ -72,8 +72,9 @@ inline int btGetVersion()
#define btFsel(a,b,c) __fsel((a),(b),(c)) #define btFsel(a,b,c) __fsel((a),(b),(c))
#else #else
#if (!defined (_M_ARM) && WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP)//Do not turn SSE on for Windows Phone Emulators #if defined (_M_ARM)
#if (defined (_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION)) //Do not turn SSE on for ARM (may want to turn on BT_USE_NEON however)
#elif (defined (_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION))
#if _MSC_VER>1400 #if _MSC_VER>1400
#define BT_USE_SIMD_VECTOR3 #define BT_USE_SIMD_VECTOR3
#endif #endif
@@ -94,7 +95,6 @@ inline int btGetVersion()
//#define BT_USE_SSE_IN_API //#define BT_USE_SSE_IN_API
#endif //BT_USE_SSE #endif //BT_USE_SSE
#include <emmintrin.h> #include <emmintrin.h>
#endif
#endif #endif
#endif//_XBOX #endif//_XBOX