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

Fix c++11-narrowing errors in multibody examples

Browse Source
This commit is contained in:
Jeongseok Lee
2018-07-10 09:20:00 -07:00
parent deea2bb411
commit 64db9af036
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/MultiBody/InvertedPendulumPDControl.cpp
View File

@@ -268,7 +268,7 @@ btMultiBody* createInvertedPendulumMultiBody(btMultiBodyDynamicsWorld* world, GU
btVector3 posr = local_origin[i+1]; btVector3 posr = local_origin[i+1];
// float pos[4]={posr.x(),posr.y(),posr.z(),1}; // float pos[4]={posr.x(),posr.y(),posr.z(),1};
float quat[4]={-world_to_local[i+1].x(),-world_to_local[i+1].y(),-world_to_local[i+1].z(),world_to_local[i+1].w()}; const btScalar quat[4]={-world_to_local[i+1].x(),-world_to_local[i+1].y(),-world_to_local[i+1].z(),world_to_local[i+1].w()};
btCollisionShape* shape =0; btCollisionShape* shape =0;
if (i==0) if (i==0)

2
examples/MultiBody/MultiBodyConstraintFeedback.cpp
View File

@@ -320,7 +320,7 @@ void MultiBodyConstraintFeedbackSetup::initPhysics()
btVector3 posr = local_origin[i+1]; btVector3 posr = local_origin[i+1];
// float pos[4]={posr.x(),posr.y(),posr.z(),1}; // float pos[4]={posr.x(),posr.y(),posr.z(),1};
float quat[4]={-world_to_local[i+1].x(),-world_to_local[i+1].y(),-world_to_local[i+1].z(),world_to_local[i+1].w()}; const btScalar quat[4]={-world_to_local[i+1].x(),-world_to_local[i+1].y(),-world_to_local[i+1].z(),world_to_local[i+1].w()};
btCollisionShape* shape =0; btCollisionShape* shape =0;
if (i==0) if (i==0)