From a3ec1659157ed25237f2187d8f67e1ed91dc27ac Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sun, 24 Apr 2022 16:12:40 -0700 Subject: remove the 'override' keyword, Bullet is C++2003 --- examples/SharedMemory/PhysicsServerExample.cpp | 2 +- examples/pybullet/examples/profileTiming.py | 6 ++++-- examples/pybullet/gym/pybullet_robots/panda/panda_sim.py | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/examples/SharedMemory/PhysicsServerExample.cpp b/examples/SharedMemory/PhysicsServerExample.cpp index 3e11b30b4..2d2416c8e 100644 --- a/examples/SharedMemory/PhysicsServerExample.cpp +++ b/examples/SharedMemory/PhysicsServerExample.cpp @@ -655,7 +655,7 @@ public: return m_debugMode; } - virtual void clearLines() override + virtual void clearLines() { m_hashedLines.clear(); m_sortedIndices.clear(); diff --git a/examples/pybullet/examples/profileTiming.py b/examples/pybullet/examples/profileTiming.py index 96c25b300..88e987df3 100644 --- a/examples/pybullet/examples/profileTiming.py +++ b/examples/pybullet/examples/profileTiming.py @@ -5,13 +5,15 @@ import time import pybullet_data p.connect(p.GUI) +#p.configureDebugVisualizer(p.ENABLE_RENDERING,0) +p.configureDebugVisualizer(p.COV_ENABLE_SINGLE_STEP_RENDERING,1) p.setAdditionalSearchPath(pybullet_data.getDataPath()) t = time.time() + 3.1 -logId = p.startStateLogging(p.STATE_LOGGING_PROFILE_TIMINGS, "chrome_about_tracing.json") +logId = p.startStateLogging(p.STATE_LOGGING_PROFILE_TIMINGS, "single_step_no_stepsim_chrome_about_tracing.json") while (time.time() < t): - p.stepSimulation() + #p.stepSimulation() p.submitProfileTiming("pythontest") time.sleep(1./240.) p.submitProfileTiming("nested") diff --git a/examples/pybullet/gym/pybullet_robots/panda/panda_sim.py b/examples/pybullet/gym/pybullet_robots/panda/panda_sim.py index b4d688687..006974b5d 100644 --- a/examples/pybullet/gym/pybullet_robots/panda/panda_sim.py +++ b/examples/pybullet/gym/pybullet_robots/panda/panda_sim.py @@ -53,6 +53,7 @@ class PandaSim(object): pass def step(self): + self.bullet_client.getCameraImage(320,200) t = self.t self.t += 1./60. pos = [self.offset[0]+0.2 * math.sin(1.5 * t), self.offset[1]+0.044, self.offset[2]+-0.6 + 0.1 * math.cos(1.5 * t)] -- cgit v1.2.1 From 968b4356dca6c029b4fc0bf4e397135fb082da73 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sun, 24 Apr 2022 16:48:28 -0700 Subject: bump up pybullet version to 3.23 --- VERSION | 2 +- setup.py | 2 +- src/LinearMath/btScalar.h | 2 +- src/LinearMath/btSerializer.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 8838d68a7..0f4de9d99 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.22 +3.23 diff --git a/setup.py b/setup.py index a25959865..21a6c2d2f 100644 --- a/setup.py +++ b/setup.py @@ -505,7 +505,7 @@ if 'BT_USE_EGL' in EGL_CXX_FLAGS: setup( name='pybullet', - version='3.2.2', + version='3.2.3', 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 837696ced..e27b71594 100644 --- a/src/LinearMath/btScalar.h +++ b/src/LinearMath/btScalar.h @@ -25,7 +25,7 @@ subject to the following restrictions: #include /* SVN $Revision$ on $Date$ from http://bullet.googlecode.com*/ -#define BT_BULLET_VERSION 322 +#define BT_BULLET_VERSION 323 inline int btGetVersion() { diff --git a/src/LinearMath/btSerializer.h b/src/LinearMath/btSerializer.h index cf0f53c55..9c5525fb9 100644 --- a/src/LinearMath/btSerializer.h +++ b/src/LinearMath/btSerializer.h @@ -481,7 +481,7 @@ public: buffer[9] = '3'; buffer[10] = '2'; - buffer[11] = '2'; + buffer[11] = '3'; } virtual void startSerialization() -- cgit v1.2.1