diff options
| author | Chuyuan Kelly Fu <fuchuyuan@google.com> | 2022-03-08 22:00:14 -0800 |
|---|---|---|
| committer | Chuyuan Kelly Fu <fuchuyuan@google.com> | 2022-03-08 22:00:14 -0800 |
| commit | 158eb6d63b4fedcdd375958103fe23eabd55f976 (patch) | |
| tree | 038523aea573d667363754fc17f38ba94bc53b57 | |
| parent | e576dbe92cdb73158dabff6ec9074d784619702e (diff) | |
| download | bullet3-158eb6d63b4fedcdd375958103fe23eabd55f976.tar.gz | |
fix
| -rw-r--r-- | examples/SharedMemory/PhysicsServerCommandProcessor.cpp | 2 | ||||
| -rw-r--r-- | examples/SharedMemory/RemoteGUIHelperTCP.cpp | 2 | ||||
| -rw-r--r-- | examples/SharedMemory/RemoteGUIHelperTCP.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp index a7cf6d560..871afd285 100644 --- a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp +++ b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp @@ -5662,7 +5662,7 @@ bool PhysicsServerCommandProcessor::processRequestMeshDataCommand(const struct S } bool separateRenderMesh = false; - if ((clientCmd.m_updateFlags & B3_MESH_DATA_SIMULATION_MESH) == 0) + if ((clientCmd.m_updateFlags & B3_MESH_DATA_SIMULATION_MESH) == 0 && (flags & B3_MESH_DATA_SIMULATION_MESH) == 0) { separateRenderMesh = (psb->m_renderNodes.size() != 0); } diff --git a/examples/SharedMemory/RemoteGUIHelperTCP.cpp b/examples/SharedMemory/RemoteGUIHelperTCP.cpp index d4c463338..8b10af908 100644 --- a/examples/SharedMemory/RemoteGUIHelperTCP.cpp +++ b/examples/SharedMemory/RemoteGUIHelperTCP.cpp @@ -635,7 +635,7 @@ void RemoteGUIHelperTCP::drawText3D(const char* txt, float position[3], float or { } -int RemoteGUIHelperTCP::addUserDebugLine(const double debugLineFromXYZ[3], const double debugLineToXYZ[3], const double debugLineColorRGB[3], double lineWidth, double lifeTime, int trackingVisualShapeIndex, int replaceItemUid) +int RemoteGUIHelperTCP::addUserDebugLine(const double debugLineFromXYZ[3], const double debugLineToXYZ[3], const double debugLineColorRGB[3], double lineWidth, double lifeTime, int trackingVisualShapeIndex, int replaceItemUid,int debugPointNum) { return -1; } diff --git a/examples/SharedMemory/RemoteGUIHelperTCP.h b/examples/SharedMemory/RemoteGUIHelperTCP.h index 19e3a5957..56b3a98c1 100644 --- a/examples/SharedMemory/RemoteGUIHelperTCP.h +++ b/examples/SharedMemory/RemoteGUIHelperTCP.h @@ -66,7 +66,7 @@ struct RemoteGUIHelperTCP : public GUIHelperInterface virtual void drawText3D(const char* txt, float position[3], float orientation[4], float color[4], float size, int optionFlag); virtual int addUserDebugLine(const double debugLineFromXYZ[3], const double debugLineToXYZ[3], const double debugLineColorRGB[3], double lineWidth, double lifeTime, int trackingVisualShapeIndex, int replaceItemUid); - virtual int addUserDebugPoints(const double debugPointPositionXYZ[3], const double debugPointColorRGB[3], double pointSize, double lifeTime, int trackingVisualShapeIndex, int replaceItemUid); + virtual int addUserDebugPoints(const double debugPointPositionXYZ[3], const double debugPointColorRGB[3], double pointSize, double lifeTime, int trackingVisualShapeIndex, int replaceItemUid, int debugPointNum); virtual void removeUserDebugItem(int debugItemUniqueId); virtual void removeAllUserDebugItems(); |