diff options
| author | erwincoumans <erwincoumans@google.com> | 2020-09-24 10:12:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 10:12:24 -0700 |
| commit | b12da620abdff665d53cd953118a741758f28523 (patch) | |
| tree | 272559ef7a4dcef1f491cd4740bc8b8643ca6b99 | |
| parent | 0c563174fc1ecf25eec9b489e3676dbc751fc78f (diff) | |
| parent | e454b90c5b6f4c241a7b9cbb1c9ed4dd1f63046c (diff) | |
| download | bullet3-b12da620abdff665d53cd953118a741758f28523.tar.gz | |
Merge pull request #3082 from erwincoumans/master3.05
@erwincoumans bump up PyBullet and Bullet version to 3.05 (in sync for this release)
| -rw-r--r-- | Extras/Serialize/BulletFileLoader/autogenerated/bullet.h | 1 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | examples/pybullet/gym/pybullet_robots/laikago/laikago.py | 1 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | src/LinearMath/btScalar.h | 2 | ||||
| -rw-r--r-- | src/LinearMath/btSerializer.h | 6 |
6 files changed, 7 insertions, 7 deletions
diff --git a/Extras/Serialize/BulletFileLoader/autogenerated/bullet.h b/Extras/Serialize/BulletFileLoader/autogenerated/bullet.h index e8f85ab1d..bfec77bb2 100644 --- a/Extras/Serialize/BulletFileLoader/autogenerated/bullet.h +++ b/Extras/Serialize/BulletFileLoader/autogenerated/bullet.h @@ -760,7 +760,6 @@ typedef struct bInvalidHandle { int m_restingContactRestitutionThreshold; int m_minimumSolverBatchSize; int m_splitImpulse; - char m_padding[4]; }; @@ -1 +1 @@ -2.89 +3.05 diff --git a/examples/pybullet/gym/pybullet_robots/laikago/laikago.py b/examples/pybullet/gym/pybullet_robots/laikago/laikago.py index bb7220754..227c3317d 100644 --- a/examples/pybullet/gym/pybullet_robots/laikago/laikago.py +++ b/examples/pybullet/gym/pybullet_robots/laikago/laikago.py @@ -6,6 +6,7 @@ import time p.connect(p.GUI) p.setAdditionalSearchPath(pd.getDataPath()) +p.setPhysicsEngineParameter(enableConeFriction=0) plane = p.loadURDF("plane.urdf") p.setGravity(0, 0, -9.8) p.setTimeStep(1. / 500) @@ -501,7 +501,7 @@ if 'BT_USE_EGL' in EGL_CXX_FLAGS: setup( name='pybullet', - version='3.0.3', + version='3.0.5', description= 'Official Python Interface for the Bullet Physics SDK specialized for Robotics Simulation and Reinforcement Learning', long_description= diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h index 86d94e897..a92caf181 100644 --- a/src/LinearMath/btScalar.h +++ b/src/LinearMath/btScalar.h @@ -25,7 +25,7 @@ subject to the following restrictions: #include <float.h> /* SVN $Revision$ on $Date$ from http://bullet.googlecode.com*/ -#define BT_BULLET_VERSION 289 +#define BT_BULLET_VERSION 305 inline int btGetVersion() { diff --git a/src/LinearMath/btSerializer.h b/src/LinearMath/btSerializer.h index 2ee712047..6ea36fbb3 100644 --- a/src/LinearMath/btSerializer.h +++ b/src/LinearMath/btSerializer.h @@ -479,9 +479,9 @@ public: buffer[8] = 'V'; } - buffer[9] = '2'; - buffer[10] = '8'; - buffer[11] = '9'; + buffer[9] = '3'; + buffer[10] = '0'; + buffer[11] = '5'; } virtual void startSerialization() |