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

fix space

Browse Source 
fix space
This commit is contained in:
Chuyuan Fu
2019-05-02 14:09:26 -07:00
parent 3fb0a7c19b
commit ee10d47b17
5 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/SharedMemory/PhysicsClientC_API.h
View File

@@ -617,7 +617,6 @@ extern "C"
B3_SHARED_API int b3LoadSoftBodySetStartPosition(b3SharedMemoryCommandHandle commandHandle, double startPosX, double startPosY, double startPosZ); B3_SHARED_API int b3LoadSoftBodySetStartPosition(b3SharedMemoryCommandHandle commandHandle, double startPosX, double startPosY, double startPosZ);
B3_SHARED_API int b3LoadSoftBodySetStartOrientation(b3SharedMemoryCommandHandle commandHandle, double startOrnX, double startOrnY, double startOrnZ, double startOrnW); B3_SHARED_API int b3LoadSoftBodySetStartOrientation(b3SharedMemoryCommandHandle commandHandle, double startOrnX, double startOrnY, double startOrnZ, double startOrnW);
B3_SHARED_API b3SharedMemoryCommandHandle b3RequestVREventsCommandInit(b3PhysicsClientHandle physClient); B3_SHARED_API b3SharedMemoryCommandHandle b3RequestVREventsCommandInit(b3PhysicsClientHandle physClient);
B3_SHARED_API void b3VREventsSetDeviceTypeFilter(b3SharedMemoryCommandHandle commandHandle, int deviceTypeFilter); B3_SHARED_API void b3VREventsSetDeviceTypeFilter(b3SharedMemoryCommandHandle commandHandle, int deviceTypeFilter);

8
examples/SharedMemory/b3RobotSimulatorClientAPI_NoDirect.h
View File

@@ -60,7 +60,7 @@ struct b3RobotSimulatorLoadSoftBodyArgs
double m_mass; double m_mass;
double m_collisionMargin; double m_collisionMargin;
b3RobotSimulatorLoadSoftBodyArgs(const btVector3 &startPos, const btQuaternion &startOrn, const double& scale, const double& mass, const double& collisionMargin ) b3RobotSimulatorLoadSoftBodyArgs(const btVector3 &startPos, const btQuaternion &startOrn, const double &scale, const double &mass, const double &collisionMargin)
: m_startPosition(startPos), : m_startPosition(startPos),
m_startOrientation(startOrn), m_startOrientation(startOrn),
m_scale(scale), m_scale(scale),
@@ -69,19 +69,16 @@ struct b3RobotSimulatorLoadSoftBodyArgs
{ {
} }
b3RobotSimulatorLoadSoftBodyArgs(const btVector3 &startPos, const btQuaternion &startOrn) b3RobotSimulatorLoadSoftBodyArgs(const btVector3 &startPos, const btQuaternion &startOrn)
{ {
b3RobotSimulatorLoadSoftBodyArgs(startPos, startOrn, 1.0, 1.0, 0.02); b3RobotSimulatorLoadSoftBodyArgs(startPos, startOrn, 1.0, 1.0, 0.02);
} }
b3RobotSimulatorLoadSoftBodyArgs() b3RobotSimulatorLoadSoftBodyArgs()
{ {
b3RobotSimulatorLoadSoftBodyArgs(btVector3(0, 0, 0), btQuaternion(0, 0, 0, 1)); b3RobotSimulatorLoadSoftBodyArgs(btVector3(0, 0, 0), btQuaternion(0, 0, 0, 1));
} }
b3RobotSimulatorLoadSoftBodyArgs(double scale, double mass, double collisionMargin) b3RobotSimulatorLoadSoftBodyArgs(double scale, double mass, double collisionMargin)
: m_startPosition(btVector3(0, 0, 0)), : m_startPosition(btVector3(0, 0, 0)),
m_startOrientation(btQuaternion(0, 0, 0, 1)), m_startOrientation(btQuaternion(0, 0, 0, 1)),
@@ -92,7 +89,6 @@ struct b3RobotSimulatorLoadSoftBodyArgs
} }
}; };
struct b3RobotSimulatorLoadFileResults struct b3RobotSimulatorLoadFileResults
{ {
btAlignedObjectArray<int> m_uniqueObjectIds; btAlignedObjectArray<int> m_uniqueObjectIds;
@@ -688,7 +684,7 @@ public:
int getConstraintUniqueId(int serialIndex); int getConstraintUniqueId(int serialIndex);
void loadSoftBody(const std::string &fileName, const struct b3RobotSimulatorLoadSoftBodyArgs& args); void loadSoftBody(const std::string &fileName, const struct b3RobotSimulatorLoadSoftBodyArgs &args);
virtual void setGuiHelper(struct GUIHelperInterface *guiHelper); virtual void setGuiHelper(struct GUIHelperInterface *guiHelper);
virtual struct GUIHelperInterface *getGuiHelper(); virtual struct GUIHelperInterface *getGuiHelper();