Scarfski/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3.git synced 2026-06-08 08:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bulletphysics/bullet3

Browse Source
This commit is contained in:
root
2020-07-18 07:41:14 -07:00
parent 6af885aa12 b67bf28f93
commit 1685aae597
3 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
View File

@@ -2038,6 +2038,12 @@ PhysicsServerCommandProcessor::~PhysicsServerCommandProcessor()
if (m_data->m_threadPool)
delete m_data->m_threadPool;
for (int i = 0; i < m_data->m_savedStates.size(); i++)
{
delete m_data->m_savedStates[i].m_bulletFile;
delete m_data->m_savedStates[i].m_serializer;
}
delete m_data;
}

21
examples/SharedMemory/b3RobotSimulatorClientAPI_NoDirect.cpp
View File

@@ -2546,6 +2546,27 @@ void b3RobotSimulatorClientAPI_NoDirect::restoreStateFromMemory(int stateId)
statusType = b3GetStatusType(statusHandle);
}
void b3RobotSimulatorClientAPI_NoDirect::removeState(int stateUniqueId)
{
b3PhysicsClientHandle sm = m_data->m_physicsClientHandle;
if (sm == 0)
{
b3Warning("Not connected");
return;
}
if (stateUniqueId >= 0)
{
b3SharedMemoryStatusHandle statusHandle;
int statusType;
if (b3CanSubmitCommand(sm))
{
statusHandle = b3SubmitClientCommandAndWaitStatus(sm, b3InitRemoveStateCommand(sm, stateUniqueId));
statusType = b3GetStatusType(statusHandle);
}
}
}
bool b3RobotSimulatorClientAPI_NoDirect::getVisualShapeData(int bodyUniqueId, b3VisualShapeInformation& visualShapeInfo)
{
b3PhysicsClientHandle sm = m_data->m_physicsClientHandle;

1
examples/SharedMemory/b3RobotSimulatorClientAPI_NoDirect.h
View File

@@ -889,6 +889,7 @@ public:
int saveStateToMemory();
void restoreStateFromMemory(int stateId);
void removeState(int stateUniqueId);
int getAPIVersion() const
{