From 9523df2519b9a3850b6511715234b1adb6425dc6 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Thu, 4 Jan 2018 15:48:59 -0800 Subject: [PATCH] warning fix (param name different in header/cpp) --- examples/SharedMemory/PhysicsClientC_API.cpp | 4 ++-- examples/SharedMemory/PhysicsServerCommandProcessor.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/SharedMemory/PhysicsClientC_API.cpp b/examples/SharedMemory/PhysicsClientC_API.cpp index b1dff2e6c..6ead0a125 100644 --- a/examples/SharedMemory/PhysicsClientC_API.cpp +++ b/examples/SharedMemory/PhysicsClientC_API.cpp @@ -3417,7 +3417,7 @@ B3_SHARED_API void b3GetClosestPointInformation(b3PhysicsClientHandle physClient } -B3_SHARED_API b3SharedMemoryCommandHandle b3InitRequestCollisionShapeInformation(b3PhysicsClientHandle physClient, int bodyUniqueIdA, int linkIndex) +B3_SHARED_API b3SharedMemoryCommandHandle b3InitRequestCollisionShapeInformation(b3PhysicsClientHandle physClient, int bodyUniqueId, int linkIndex) { PhysicsClient* cl = (PhysicsClient*)physClient; b3Assert(cl); @@ -3425,7 +3425,7 @@ B3_SHARED_API b3SharedMemoryCommandHandle b3InitRequestCollisionShapeInformation struct SharedMemoryCommand* command = cl->getAvailableSharedMemoryCommand(); b3Assert(command); command->m_type = CMD_REQUEST_COLLISION_SHAPE_INFO; - command->m_requestCollisionShapeDataArguments.m_bodyUniqueId = bodyUniqueIdA; + command->m_requestCollisionShapeDataArguments.m_bodyUniqueId = bodyUniqueId; command->m_requestCollisionShapeDataArguments.m_linkIndex = linkIndex; command->m_updateFlags = 0; diff --git a/examples/SharedMemory/PhysicsServerCommandProcessor.h b/examples/SharedMemory/PhysicsServerCommandProcessor.h index 948e0e991..8beb59acd 100644 --- a/examples/SharedMemory/PhysicsServerCommandProcessor.h +++ b/examples/SharedMemory/PhysicsServerCommandProcessor.h @@ -84,7 +84,7 @@ protected: bool processRestoreStateCommand(const struct SharedMemoryCommand& clientCmd, struct SharedMemoryStatus& serverStatusOut, char* bufferServerToClient, int bufferSizeInBytes); bool processSaveStateCommand(const struct SharedMemoryCommand& clientCmd, struct SharedMemoryStatus& serverStatusOut, char* bufferServerToClient, int bufferSizeInBytes); - int extractCollisionShapes(const class btCollisionShape* colShape, const class btTransform& childTransform, struct b3CollisionShapeData* collisionShapeBuffer, int maxCollisionShapes); + int extractCollisionShapes(const class btCollisionShape* colShape, const class btTransform& transform, struct b3CollisionShapeData* collisionShapeBuffer, int maxCollisionShapes); bool loadSdf(const char* fileName, char* bufferServerToClient, int bufferSizeInBytes, bool useMultiBody, int flags, btScalar globalScaling);