Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace large timeout (1024*1024*1024) using real-time clock timeout (10 seconds default)

Browse Source 
Change SHARED_MEMORY_MAGIC_NUMBER to make sure server/client are using the same version (shared memory)
add --realtimesimulation to physics server (GUI, VR)
remove --G Xcode from build_cmake_pybullet_double.sh
This commit is contained in:
Erwin Coumans
2017-02-22 09:33:30 -08:00
parent 35b92c43d3
commit bd30ba30ce
13 changed files with 172 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/SharedMemory/PhysicsClientC_API.cpp
View File

@@ -1033,9 +1033,15 @@ int b3SubmitClientCommand(b3PhysicsClientHandle physClient, const b3SharedMemory
}
#include "../Utils/b3Clock.h"
b3SharedMemoryStatusHandle b3SubmitClientCommandAndWaitStatus(b3PhysicsClientHandle physClient, const b3SharedMemoryCommandHandle commandHandle)
{
int timeout = 1024 * 1024 * 1024;
b3Clock clock;
double startTime = clock.getTimeInSeconds();
double timeOutInSeconds = 10;
b3SharedMemoryStatusHandle statusHandle = 0;
b3Assert(commandHandle);
b3Assert(physClient);
@@ -1043,7 +1049,7 @@ b3SharedMemoryStatusHandle b3SubmitClientCommandAndWaitStatus(b3PhysicsClientHan
{
b3SubmitClientCommand(physClient, commandHandle);
while ((statusHandle == 0) && (timeout-- > 0))
while ((statusHandle == 0) && (clock.getTimeInSeconds()-startTime < timeOutInSeconds))
{
statusHandle = b3ProcessServerStatus(physClient);
}