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

make OSX/Unix version of PosixSharedMemory work

Browse Source 
pass on useFixedBase to URDF loader in PhysicsServer
This commit is contained in:
=
2015-07-14 16:23:01 -07:00
parent 54a76f6e0c
commit 48f6484b3d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/SharedMemory/PhysicsServer.cpp
View File

@@ -202,7 +202,7 @@ bool PhysicsServerSharedMemory::loadUrdf(const char* fileName, const btVector3&
BulletURDFImporter u2b(m_data->m_guiHelper); BulletURDFImporter u2b(m_data->m_guiHelper);
bool loadOk = u2b.loadURDF(fileName); bool loadOk = u2b.loadURDF(fileName, useFixedBase);
if (loadOk) if (loadOk)
{ {
b3Printf("loaded %s OK!", fileName); b3Printf("loaded %s OK!", fileName);

2
examples/SharedMemory/PosixSharedMemory.cpp
View File

@@ -40,7 +40,7 @@ struct btPointerCaster
}; };
}; };
void* PosixSharedMemory::allocateSharedMemory(int key, int size) void* PosixSharedMemory::allocateSharedMemory(int key, int size, bool /*allowCreation*/)
{ {
#ifdef TEST_SHARED_MEMORY #ifdef TEST_SHARED_MEMORY
int flags = IPC_CREAT | 0666; int flags = IPC_CREAT | 0666;

2
examples/SharedMemory/PosixSharedMemory.h
View File

@@ -14,7 +14,7 @@ public:
PosixSharedMemory(); PosixSharedMemory();
virtual ~PosixSharedMemory(); virtual ~PosixSharedMemory();
virtual void* allocateSharedMemory(int key, int size); virtual void* allocateSharedMemory(int key, int size, bool allowCreation);
virtual void releaseSharedMemory(int key, int size); virtual void releaseSharedMemory(int key, int size);
}; };