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

Merge pull request #1793 from jslee02/fix_build_clang6

Browse Source 
Fix build errors with Clang 6 (also resolve #1510)
This commit is contained in:
erwincoumans
2018-07-19 09:20:42 +02:00
committed by GitHub
parent a8d81eb155 8b26945f8f
commit c254768d1a
8 changed files with 129 additions and 36 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];
// 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;
if (i==0)

2
examples/MultiBody/MultiBodyConstraintFeedback.cpp
View File

@@ -320,7 +320,7 @@ void MultiBodyConstraintFeedbackSetup::initPhysics()
btVector3 posr = local_origin[i+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;
if (i==0)