Merge pull request #2356 from erwincoumans/master

sync graphics server at resetJointState, resetSimulation, load*
This commit is contained in:
erwincoumans
2019-08-06 15:54:43 -07:00
committed by GitHub
3 changed files with 5 additions and 0 deletions

Binary file not shown.

View File

@@ -3234,6 +3234,7 @@ bool PhysicsServerCommandProcessor::processImportedObjects(const char* fileName,
m_data->m_saveWorldBodyData.push_back(sd); m_data->m_saveWorldBodyData.push_back(sd);
syncPhysicsToGraphics2();
return loadOk; return loadOk;
} }
@@ -9228,6 +9229,8 @@ bool PhysicsServerCommandProcessor::processInitPoseCommand(const struct SharedMe
} }
} }
syncPhysicsToGraphics2();
SharedMemoryStatus& serverCmd = serverStatusOut; SharedMemoryStatus& serverCmd = serverStatusOut;
serverCmd.m_type = CMD_CLIENT_COMMAND_COMPLETED; serverCmd.m_type = CMD_CLIENT_COMMAND_COMPLETED;
@@ -13007,6 +13010,7 @@ void PhysicsServerCommandProcessor::resetSimulation()
notification.m_notificationType = SIMULATION_RESET; notification.m_notificationType = SIMULATION_RESET;
m_data->m_pluginManager.addNotification(notification); m_data->m_pluginManager.addNotification(notification);
syncPhysicsToGraphics2();
} }

View File

@@ -8,6 +8,7 @@ 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, "chrome_about_tracing.json")
while (time.time() < t): while (time.time() < t):
p.stepSimulation()
p.submitProfileTiming("pythontest") p.submitProfileTiming("pythontest")
time.sleep(1./240.) time.sleep(1./240.)
p.submitProfileTiming("nested") p.submitProfileTiming("nested")