Merge pull request #2459 from erwincoumans/master

bump up to Bullet version 2.89 and update serialization structures
This commit is contained in:
erwincoumans
2019-10-30 13:14:49 -07:00
committed by GitHub
8 changed files with 2773 additions and 2673 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1 +1 @@
2.88 2.89

View File

@@ -155,15 +155,15 @@ struct btContactSolverInfoFloatData
float m_warmstartingFactor; float m_warmstartingFactor;
float m_articulatedWarmstartingFactor; float m_articulatedWarmstartingFactor;
float m_maxGyroscopicForce; float m_maxGyroscopicForce;
float m_singleAxisRollingFrictionThreshold;
float m_singleAxisRollingFrictionThreshold;
int m_numIterations; int m_numIterations;
int m_solverMode; int m_solverMode;
int m_restingContactRestitutionThreshold; int m_restingContactRestitutionThreshold;
int m_minimumSolverBatchSize;
int m_minimumSolverBatchSize;
int m_splitImpulse; int m_splitImpulse;
char m_padding[4];
}; };
#endif //BT_CONTACT_SOLVER_INFO #endif //BT_CONTACT_SOLVER_INFO

View File

@@ -1436,9 +1436,7 @@ void btDiscreteDynamicsWorld::serializeDynamicsWorldInfo(btSerializer* serialize
worldInfo->m_solverInfo.m_splitImpulse = getSolverInfo().m_splitImpulse; worldInfo->m_solverInfo.m_splitImpulse = getSolverInfo().m_splitImpulse;
// Fill padding with zeros to appease msan.
memset(worldInfo->m_solverInfo.m_padding, 0, sizeof(worldInfo->m_solverInfo.m_padding));
#ifdef BT_USE_DOUBLE_PRECISION #ifdef BT_USE_DOUBLE_PRECISION
const char* structType = "btDynamicsWorldDoubleData"; const char* structType = "btDynamicsWorldDoubleData";
#else //BT_USE_DOUBLE_PRECISION #else //BT_USE_DOUBLE_PRECISION

View File

@@ -25,13 +25,23 @@ subject to the following restrictions:
#include <float.h> #include <float.h>
/* SVN $Revision$ on $Date$ from http://bullet.googlecode.com*/ /* SVN $Revision$ on $Date$ from http://bullet.googlecode.com*/
#define BT_BULLET_VERSION 288 #define BT_BULLET_VERSION 289
inline int btGetVersion() inline int btGetVersion()
{ {
return BT_BULLET_VERSION; return BT_BULLET_VERSION;
} }
inline int btIsDoublePrecision()
{
#ifdef BT_USE_DOUBLE_PRECISION
return true;
#else
return false;
#endif
}
// The following macro "BT_NOT_EMPTY_FILE" can be put into a file // The following macro "BT_NOT_EMPTY_FILE" can be put into a file
// in order suppress the MS Visual C++ Linker warning 4221 // in order suppress the MS Visual C++ Linker warning 4221
// //

File diff suppressed because it is too large Load Diff

View File

@@ -481,7 +481,7 @@ public:
buffer[9] = '2'; buffer[9] = '2';
buffer[10] = '8'; buffer[10] = '8';
buffer[11] = '8'; buffer[11] = '9';
} }
virtual void startSerialization() virtual void startSerialization()

File diff suppressed because it is too large Load Diff