From 73e83d6e84c2a7b3950cec5c149dc1a692f5d222 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sun, 22 Jan 2017 21:06:51 -0800 Subject: [PATCH] fix OSX build, fix some warnings --- examples/OpenGLWindow/MacOpenGLWindow.mm | 4 ++-- examples/SharedMemory/PhysicsDirect.cpp | 1 + examples/SharedMemory/PhysicsServerCommandProcessor.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/OpenGLWindow/MacOpenGLWindow.mm b/examples/OpenGLWindow/MacOpenGLWindow.mm index 80a11fc1b..47d5beaad 100644 --- a/examples/OpenGLWindow/MacOpenGLWindow.mm +++ b/examples/OpenGLWindow/MacOpenGLWindow.mm @@ -51,8 +51,8 @@ #define MyNSEventModifierFlagOption NSAlternateKeyMask #define MyNSKeyUp NSKeyUp #define MyNSKeyDown NSKeyDown - #define NSRightMouseDown NSRightMouseDown - #define MyNSLeftMouseDown LeftMouseDown + #define MyNSRightMouseDown NSRightMouseDown + #define MyNSLeftMouseDown NSLeftMouseDown #define MyNSOtherMouseDown NSOtherMouseDown #define MyNSLeftMouseUp NSLeftMouseUp #define MyNSRightMouseUp NSRightMouseUp diff --git a/examples/SharedMemory/PhysicsDirect.cpp b/examples/SharedMemory/PhysicsDirect.cpp index 240cad4d1..414fb349a 100644 --- a/examples/SharedMemory/PhysicsDirect.cpp +++ b/examples/SharedMemory/PhysicsDirect.cpp @@ -729,6 +729,7 @@ void PhysicsDirect::postProcessStatus(const struct SharedMemoryStatus& serverCmd SharedMemoryCommand infoRequestCommand; infoRequestCommand.m_type = CMD_USER_CONSTRAINT; infoRequestCommand.m_updateFlags = USER_CONSTRAINT_REQUEST_INFO; + infoRequestCommand.m_userConstraintArguments.m_userConstraintUniqueId = constraintUid; SharedMemoryStatus infoStatus; bool hasStatus = m_data->m_commandProcessor->processCommand(infoRequestCommand, infoStatus, &m_data->m_bulletStreamDataServerToClient[0], SHARED_MEMORY_MAX_STREAM_CHUNK_SIZE); diff --git a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp index 5d000f6dc..1ab731551 100644 --- a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp +++ b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp @@ -1773,7 +1773,7 @@ bool PhysicsServerCommandProcessor::processCommand(const struct SharedMemoryComm { int key = m_data->m_userConstraints.getKeyAtIndex(i).getUid1(); - int uid = m_data->m_userConstraints.getAtIndex(i)->m_userConstraintData.m_userConstraintUniqueId; +// int uid = m_data->m_userConstraints.getAtIndex(i)->m_userConstraintData.m_userConstraintUniqueId; serverStatusOut.m_sdfLoadedArgs.m_userConstraintUniqueIds[i] = key; }