Skip to content

Commit

Permalink
Merge pull request bulletphysics#2459 from erwincoumans/master
Browse files Browse the repository at this point in the history
bump up to Bullet version 2.89 and update serialization structures
  • Loading branch information
erwincoumans authored Oct 30, 2019
2 parents a1cb87c + b2732b1 commit bda04cf
Show file tree
Hide file tree
Showing 8 changed files with 2,773 additions and 2,673 deletions.
3,025 changes: 1,558 additions & 1,467 deletions Extras/Serialize/BulletFileLoader/autogenerated/bullet.h

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.88
2.89
6 changes: 3 additions & 3 deletions src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,15 @@ struct btContactSolverInfoFloatData
float m_warmstartingFactor;
float m_articulatedWarmstartingFactor;
float m_maxGyroscopicForce;
float m_singleAxisRollingFrictionThreshold;

float m_singleAxisRollingFrictionThreshold;
int m_numIterations;
int m_solverMode;
int m_restingContactRestitutionThreshold;
int m_minimumSolverBatchSize;

int m_minimumSolverBatchSize;
int m_splitImpulse;
char m_padding[4];

};

#endif //BT_CONTACT_SOLVER_INFO
4 changes: 1 addition & 3 deletions src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1436,9 +1436,7 @@ void btDiscreteDynamicsWorld::serializeDynamicsWorldInfo(btSerializer* serialize

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
const char* structType = "btDynamicsWorldDoubleData";
#else //BT_USE_DOUBLE_PRECISION
Expand Down
12 changes: 11 additions & 1 deletion src/LinearMath/btScalar.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,23 @@ subject to the following restrictions:
#include <float.h>

/* SVN $Revision$ on $Date$ from http://bullet.googlecode.com*/
#define BT_BULLET_VERSION 288
#define BT_BULLET_VERSION 289

inline int btGetVersion()
{
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
// in order suppress the MS Visual C++ Linker warning 4221
//
Expand Down
1,198 changes: 599 additions & 599 deletions src/LinearMath/btSerializer.cpp

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/LinearMath/btSerializer.h
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ class btDefaultSerializer : public btSerializer

buffer[9] = '2';
buffer[10] = '8';
buffer[11] = '8';
buffer[11] = '9';
}

virtual void startSerialization()
Expand Down
1,197 changes: 599 additions & 598 deletions src/LinearMath/btSerializer64.cpp

Large diffs are not rendered by default.

0 comments on commit bda04cf

Please sign in to comment.