Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix OSX build, fix some warnings

Browse Source
This commit is contained in:
Erwin Coumans
2017-01-22 21:06:51 -08:00
parent cad45b9c20
commit 73e83d6e84
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/OpenGLWindow/MacOpenGLWindow.mm
View File

@@ -51,8 +51,8 @@
#define MyNSEventModifierFlagOption NSAlternateKeyMask #define MyNSEventModifierFlagOption NSAlternateKeyMask
#define MyNSKeyUp NSKeyUp #define MyNSKeyUp NSKeyUp
#define MyNSKeyDown NSKeyDown #define MyNSKeyDown NSKeyDown
#define NSRightMouseDown NSRightMouseDown #define MyNSRightMouseDown NSRightMouseDown
#define MyNSLeftMouseDown LeftMouseDown #define MyNSLeftMouseDown NSLeftMouseDown
#define MyNSOtherMouseDown NSOtherMouseDown #define MyNSOtherMouseDown NSOtherMouseDown
#define MyNSLeftMouseUp NSLeftMouseUp #define MyNSLeftMouseUp NSLeftMouseUp
#define MyNSRightMouseUp NSRightMouseUp #define MyNSRightMouseUp NSRightMouseUp

1
examples/SharedMemory/PhysicsDirect.cpp
View File

@@ -729,6 +729,7 @@ void PhysicsDirect::postProcessStatus(const struct SharedMemoryStatus& serverCmd
SharedMemoryCommand infoRequestCommand; SharedMemoryCommand infoRequestCommand;
infoRequestCommand.m_type = CMD_USER_CONSTRAINT; infoRequestCommand.m_type = CMD_USER_CONSTRAINT;
infoRequestCommand.m_updateFlags = USER_CONSTRAINT_REQUEST_INFO; infoRequestCommand.m_updateFlags = USER_CONSTRAINT_REQUEST_INFO;
infoRequestCommand.m_userConstraintArguments.m_userConstraintUniqueId = constraintUid;
SharedMemoryStatus infoStatus; SharedMemoryStatus infoStatus;
bool hasStatus = m_data->m_commandProcessor->processCommand(infoRequestCommand, infoStatus, &m_data->m_bulletStreamDataServerToClient[0], SHARED_MEMORY_MAX_STREAM_CHUNK_SIZE); bool hasStatus = m_data->m_commandProcessor->processCommand(infoRequestCommand, infoStatus, &m_data->m_bulletStreamDataServerToClient[0], SHARED_MEMORY_MAX_STREAM_CHUNK_SIZE);

2
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
View File

@@ -1773,7 +1773,7 @@ bool PhysicsServerCommandProcessor::processCommand(const struct SharedMemoryComm
{ {
int key = m_data->m_userConstraints.getKeyAtIndex(i).getUid1(); 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; serverStatusOut.m_sdfLoadedArgs.m_userConstraintUniqueIds[i] = key;
} }