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

minor refactoring

Browse Source
This commit is contained in:
=
2015-07-23 11:51:25 -07:00
parent 0fe6d343bc
commit 3fe9138e8c
11 changed files with 64 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/SharedMemory/PhysicsClient.cpp
View File

@@ -6,6 +6,7 @@
#include "../Utils/b3ResourcePath.h"
#include "../../Extras/Serialize/BulletFileLoader/btBulletFile.h"
#include "../../Extras/Serialize/BulletFileLoader/autogenerated/bullet.h"
#include "SharedMemoryBlock.h"
//copied from btMultiBodyLink.h
@@ -18,7 +19,7 @@ enum JointType
struct PhysicsClientSharedMemoryInternalData
{
SharedMemoryInterface* m_sharedMemory;
SharedMemoryExampleData* m_testBlock1;
SharedMemoryBlock* m_testBlock1;
btAlignedObjectArray<bParse::btBulletFile*> m_robotMultiBodyData;
btAlignedObjectArray<PoweredJointInfo> m_poweredJointInfo;
@@ -89,7 +90,7 @@ bool PhysicsClientSharedMemory::isConnected() const
bool PhysicsClientSharedMemory::connect(bool allowSharedMemoryInitialization)
{
bool allowCreation = true;
m_data->m_testBlock1 = (SharedMemoryExampleData*)m_data->m_sharedMemory->allocateSharedMemory(SHARED_MEMORY_KEY, SHARED_MEMORY_SIZE, allowCreation);
m_data->m_testBlock1 = (SharedMemoryBlock*)m_data->m_sharedMemory->allocateSharedMemory(SHARED_MEMORY_KEY, SHARED_MEMORY_SIZE, allowCreation);
if (m_data->m_testBlock1)
{
@@ -97,7 +98,7 @@ bool PhysicsClientSharedMemory::connect(bool allowSharedMemoryInitialization)
{
if (allowSharedMemoryInitialization)
{
InitSharedMemoryExampleData(m_data->m_testBlock1);
InitSharedMemoryBlock(m_data->m_testBlock1);
b3Printf("Created and initialized shared memory block");
m_data->m_isConnected = true;
} else
@@ -123,7 +124,7 @@ bool PhysicsClientSharedMemory::connect(bool allowSharedMemoryInitialization)
bool PhysicsClientSharedMemory::processServerStatus(ServerStatus& serverStatus)
bool PhysicsClientSharedMemory::processServerStatus(SharedMemoryStatus& serverStatus)
{
btAssert(m_data->m_testBlock1);
bool hasStatus = false;