AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2024-12-14 13:50:04 +00:00
Code Issues Releases Wiki Activity

fix some warnings

Browse Source
This commit is contained in:
Erwin Coumans 2015-08-26 15:26:53 -07:00
parent 77f78358d2
commit 2e7949bb3e
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/ExampleBrowser/GwenGUISupport/gwenUserInterface.cpp
View File

@ -589,7 +589,6 @@ bool GwenUserInterface::keyboardCallback(int bulletKey, int state)
} }
}; };
bool bDown = (state == 1);
if (gwenKey>=0) if (gwenKey>=0)
{ {

10
examples/SharedMemory/PhysicsClient.cpp
View File

@ -29,7 +29,6 @@ struct PhysicsClientSharedMemoryInternalData
btAlignedObjectArray<btVector3> m_debugLinesTo; btAlignedObjectArray<btVector3> m_debugLinesTo;
btAlignedObjectArray<btVector3> m_debugLinesColor; btAlignedObjectArray<btVector3> m_debugLinesColor;
int m_counter; int m_counter;
bool m_serverLoadUrdfOK; bool m_serverLoadUrdfOK;
bool m_isConnected; bool m_isConnected;
@ -219,9 +218,8 @@ bool PhysicsClientSharedMemory::processServerStatus(SharedMemoryStatus& serverSt
{ {
b3JointInfo info; b3JointInfo info;
info.m_flags = 0; info.m_flags = 0;
info.m_qIndex = qOffset; info.m_qIndex = (0 < mb->m_links[link].m_posVarCount) ? qOffset : -1;
info.m_uIndex = uOffset; info.m_uIndex = (0 < mb->m_links[link].m_dofCount) ? uOffset : -1;
info.m_linkIndex = link;
if (mb->m_links[link].m_linkName) if (mb->m_links[link].m_linkName)
{ {
@ -267,8 +265,8 @@ bool PhysicsClientSharedMemory::processServerStatus(SharedMemoryStatus& serverSt
{ {
b3JointInfo info; b3JointInfo info;
info.m_flags = 0; info.m_flags = 0;
info.m_qIndex = qOffset; info.m_qIndex = (0 < mb->m_links[link].m_posVarCount) ? qOffset : -1;
info.m_uIndex = uOffset; info.m_uIndex = (0 < mb->m_links[link].m_dofCount) ? uOffset : -1;
if (mb->m_links[link].m_linkName) if (mb->m_links[link].m_linkName)
{ {

5
examples/SharedMemory/PhysicsServer.cpp
View File

@ -975,6 +975,10 @@ void PhysicsServerSharedMemory::processClientCommands()
case CMD_SEND_PHYSICS_SIMULATION_PARAMETERS: case CMD_SEND_PHYSICS_SIMULATION_PARAMETERS:
{ {
if (clientCmd.m_updateFlags&SIM_PARAM_UPDATE_DELTA_TIME)
{
m_data->m_physicsDeltaTime = clientCmd.m_physSimParamArgs.m_deltaTime;
}
if (clientCmd.m_updateFlags&SIM_PARAM_UPDATE_GRAVITY) if (clientCmd.m_updateFlags&SIM_PARAM_UPDATE_GRAVITY)
{ {
btVector3 grav(clientCmd.m_physSimParamArgs.m_gravityAcceleration[0], btVector3 grav(clientCmd.m_physSimParamArgs.m_gravityAcceleration[0],
@ -1010,7 +1014,6 @@ void PhysicsServerSharedMemory::processClientCommands()
} }
case CMD_RESET_SIMULATION: case CMD_RESET_SIMULATION:
{ {
//clean up all data //clean up all data

2
examples/SharedMemory/SharedMemoryBlock.h
View File

@ -30,7 +30,7 @@ struct SharedMemoryBlock
}; };
static void InitSharedMemoryBlock(struct SharedMemoryBlock* sharedMemoryBlock) inline void InitSharedMemoryBlock(struct SharedMemoryBlock* sharedMemoryBlock)
{ {
sharedMemoryBlock->m_numClientCommands = 0; sharedMemoryBlock->m_numClientCommands = 0;
sharedMemoryBlock->m_numServerCommands = 0; sharedMemoryBlock->m_numServerCommands = 0;

1
examples/SharedMemory/SharedMemoryCommands.h
View File

@ -287,7 +287,6 @@ struct b3JointInfo
int m_jointType; int m_jointType;
int m_qIndex; int m_qIndex;
int m_uIndex; int m_uIndex;
int m_linkIndex;
/// ///
int m_flags; int m_flags;
}; };

2
examples/SimpleOpenGL3/main.cpp
View File

@ -13,7 +13,7 @@ int main(int argc, char* argv[])
b3CommandLineArgs myArgs(argc,argv); b3CommandLineArgs myArgs(argc,argv);
SimpleOpenGL3App* app = new SimpleOpenGL3App("SimpleOpenGL3App",1024,768); SimpleOpenGL3App* app = new SimpleOpenGL3App("SimpleOpenGL3App",1024,768,true);
app->m_instancingRenderer->getActiveCamera()->setCameraDistance(13); app->m_instancingRenderer->getActiveCamera()->setCameraDistance(13);
app->m_instancingRenderer->getActiveCamera()->setCameraPitch(0); app->m_instancingRenderer->getActiveCamera()->setCameraPitch(0);
app->m_instancingRenderer->getActiveCamera()->setCameraTargetPosition(0,0,0); app->m_instancingRenderer->getActiveCamera()->setCameraTargetPosition(0,0,0);