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

Change the API names for loading softbody.

Browse Source
This commit is contained in:
yunfeibai
2018-01-07 19:24:37 -08:00
parent e3e9546960
commit d077bdec07
9 changed files with 47 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/SharedMemory/SharedMemoryCommands.h
View File

@@ -428,11 +428,11 @@ enum EnumSimParamUpdateFlags
SIM_PARAM_UPDATE_DEFAULT_FRICTION_ERP = 32768,
};
enum EnumLoadBunnyUpdateFlags
enum EnumLoadSoftBodyUpdateFlags
{
LOAD_BUNNY_UPDATE_SCALE=1,
LOAD_BUNNY_UPDATE_MASS=2,
LOAD_BUNNY_UPDATE_COLLISION_MARGIN=4
LOAD_SOFT_BODY_UPDATE_SCALE=1,
LOAD_SOFT_BODY_UPDATE_MASS=2,
LOAD_SOFT_BODY_UPDATE_COLLISION_MARGIN=4
};
enum EnumSimParamInternalSimFlags
@@ -444,14 +444,14 @@ enum EnumSimParamInternalSimFlags
///Controlling a robot involves sending the desired state to its joint motor controllers.
///The control mode determines the state variables used for motor control.
struct LoadBunnyArgs
struct LoadSoftBodyArgs
{
double m_scale;
double m_mass;
double m_collisionMargin;
};
struct b3LoadBunnyResultArgs
struct b3LoadSoftBodyResultArgs
{
int m_objectUniqueId;
};
@@ -985,7 +985,7 @@ struct SharedMemoryCommand
struct CalculateInverseKinematicsArgs m_calculateInverseKinematicsArguments;
struct UserDebugDrawArgs m_userDebugDrawArgs;
struct RequestRaycastIntersections m_requestRaycastIntersections;
struct LoadBunnyArgs m_loadBunnyArguments;
struct LoadSoftBodyArgs m_loadSoftBodyArguments;
struct VRCameraState m_vrCameraStateArguments;
struct StateLoggingRequest m_stateLoggingArguments;
struct ConfigureOpenGLVisualizerRequest m_configureOpenGLVisualizerArguments;
@@ -1073,7 +1073,7 @@ struct SharedMemoryStatus
struct b3CustomCommandResultArgs m_customCommandResultArgs;
struct b3PhysicsSimulationParameters m_simulationParameterResultArgs;
struct b3StateSerializationArguments m_saveStateResultArgs;
struct b3LoadBunnyResultArgs m_loadBunnyResultArguments;
struct b3LoadSoftBodyResultArgs m_loadSoftBodyResultArguments;
};
};