Merge pull request #4251 from erwincoumans/master

remove 'override' since Bullet uses C++2003

VERSION

@@ -1 +1 @@
-3.22
+3.23

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();

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")

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)]

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=

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 322
+#define BT_BULLET_VERSION 323
 
 inline int btGetVersion()
 {

src/LinearMath/btSerializer.h

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