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

move m_updateFlags to command, and make it 64bit

Browse Source
This commit is contained in:
erwin coumans
2015-07-23 10:51:09 -07:00
parent 812c67e221
commit 0fe6d343bc
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/SharedMemory/PhysicsServer.cpp
View File

@@ -563,7 +563,7 @@ void PhysicsServerSharedMemory::processClientCommands()
case CMD_SEND_PHYSICS_SIMULATION_PARAMETERS: case CMD_SEND_PHYSICS_SIMULATION_PARAMETERS:
{ {
if (clientCmd.m_physSimParamArgs.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],
clientCmd.m_physSimParamArgs.m_gravityAcceleration[1], clientCmd.m_physSimParamArgs.m_gravityAcceleration[1],

2
examples/SharedMemory/RobotControlExample.cpp
View File

@@ -104,7 +104,7 @@ void MyCallback2(int buttonId, bool buttonState, void* userPtr)
command.m_physSimParamArgs.m_gravityAcceleration[0] = 0; command.m_physSimParamArgs.m_gravityAcceleration[0] = 0;
command.m_physSimParamArgs.m_gravityAcceleration[1] = 0; command.m_physSimParamArgs.m_gravityAcceleration[1] = 0;
command.m_physSimParamArgs.m_gravityAcceleration[2] = -10; command.m_physSimParamArgs.m_gravityAcceleration[2] = -10;
command.m_physSimParamArgs.m_updateFlags = SIM_PARAM_UPDATE_GRAVITY; command.m_updateFlags = SIM_PARAM_UPDATE_GRAVITY;
cl->enqueueCommand(command); cl->enqueueCommand(command);
break; break;

9
examples/SharedMemory/SharedMemoryCommands.h
View File

@@ -132,9 +132,6 @@ enum EnumUpdateFlags
///The control mode determines the state variables used for motor control. ///The control mode determines the state variables used for motor control.
struct SendPhysicsSimulationParameters struct SendPhysicsSimulationParameters
{ {
//a bit fields to tell which parameters need updating, see SIM_PARAM_UPDATE_DELTA_TIME etc.
//for example m_updateFlags = SIM_PARAM_UPDATE_DELTA_TIME | SIM_PARAM_UPDATE_NUM_SOLVER_ITERATIONS;
int m_updateFlags;
double m_deltaTime; double m_deltaTime;
double m_gravityAcceleration[3]; double m_gravityAcceleration[3];
@@ -169,9 +166,11 @@ struct SendActualStateArgs
struct SharedMemoryCommand struct SharedMemoryCommand
{ {
int m_type; int m_type;
smUint64_t m_timeStamp;
int m_sequenceNumber; int m_sequenceNumber;
smUint64_t m_timeStamp;
//a bit fields to tell which parameters need updating
//for example m_updateFlags = SIM_PARAM_UPDATE_DELTA_TIME | SIM_PARAM_UPDATE_NUM_SOLVER_ITERATIONS;
smUint64_t m_updateFlags;
union union
{ {