From 8cac48109110671b0359dcc2e7b8126d29398594 Mon Sep 17 00:00:00 2001 From: Lunkhound Date: Tue, 25 Nov 2014 12:44:22 -0800 Subject: [PATCH 1/4] quickfix: SSE was accidentally disabled on windows desktop by a change intended to disable it only for Windows Phone --- src/LinearMath/btScalar.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h index 520c3669f..5c543519d 100644 --- a/src/LinearMath/btScalar.h +++ b/src/LinearMath/btScalar.h @@ -72,8 +72,9 @@ inline int btGetVersion() #define btFsel(a,b,c) __fsel((a),(b),(c)) #else -#if (!defined (_M_ARM) && WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP)//Do not turn SSE on for Windows Phone Emulators -#if (defined (_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION)) +#if defined (_M_ARM) + //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 #define BT_USE_SIMD_VECTOR3 #endif From beaf1b5922220f106df065d5c90fb70fccefa76e Mon Sep 17 00:00:00 2001 From: Lunkhound Date: Tue, 25 Nov 2014 13:48:20 -0800 Subject: [PATCH 2/4] fix for fix --- src/LinearMath/btScalar.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h index 5c543519d..fdb736272 100644 --- a/src/LinearMath/btScalar.h +++ b/src/LinearMath/btScalar.h @@ -95,7 +95,6 @@ inline int btGetVersion() //#define BT_USE_SSE_IN_API #endif //BT_USE_SSE #include -#endif #endif #endif//_XBOX From 2118ade4657919996feffc61ec8998952c9ba483 Mon Sep 17 00:00:00 2001 From: Rhody Lugo Date: Fri, 12 Dec 2014 10:29:23 -0430 Subject: [PATCH 3/4] Stop adding motion in the kinematic character controller if the walk direction is near zero --- src/BulletDynamics/Character/btKinematicCharacterController.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BulletDynamics/Character/btKinematicCharacterController.cpp b/src/BulletDynamics/Character/btKinematicCharacterController.cpp index e853c469e..31faf1df5 100644 --- a/src/BulletDynamics/Character/btKinematicCharacterController.cpp +++ b/src/BulletDynamics/Character/btKinematicCharacterController.cpp @@ -636,7 +636,7 @@ void btKinematicCharacterController::playerStep ( btCollisionWorld* collisionWo // printf(" dt = %f", dt); // quick check... - if (!m_useWalkDirection && m_velocityTimeInterval <= 0.0) { + if (!m_useWalkDirection && (m_velocityTimeInterval <= 0.0 || m_walkDirection.fuzzyZero())) { // printf("\n"); return; // no motion } From c7503bb3da74a8642d061eedb9bc708066016abe Mon Sep 17 00:00:00 2001 From: a0121536 Date: Fri, 2 Jan 2015 13:06:47 +0200 Subject: [PATCH 4/4] Fix the shadows in the 'Gyroscopic' demo --- Demos/GyroscopicDemo/GyroscopicDemo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Demos/GyroscopicDemo/GyroscopicDemo.cpp b/Demos/GyroscopicDemo/GyroscopicDemo.cpp index 1655c16e8..31b399686 100644 --- a/Demos/GyroscopicDemo/GyroscopicDemo.cpp +++ b/Demos/GyroscopicDemo/GyroscopicDemo.cpp @@ -58,7 +58,7 @@ void GyroscopicDemo::initPhysics() setShadows(true); setCameraUp(btVector3(0,0,1)); setCameraForwardAxis(1); - m_sundirection.setValue(0,-1,-1); + m_sundirection.setValue(0,-1000,-1000); setCameraDistance(7.f); setupEmptyDynamicsWorld();