Scarfski/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3.git synced 2026-09-14 14:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2524 from erwincoumans/master

Browse Source 
fix clang warning
This commit is contained in:
erwincoumans
2019-12-05 09:04:03 -08:00
committed by GitHub
parent c74b88b436 146a751eb4
commit d57546b645
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/pybullet/gym/pybullet_data/args/train_humanoid3d_walk_args.txt
View File

@@ -29,5 +29,5 @@
#--train_agents false
--output_path output
#--int_output_path output/intermediate
#--model_files data/policies/humanoid3d/agent0_model.ckpt
--int_output_path output/intermediate
#--model_files data/policies/humanoid3d/agent0_model.ckpt

2
src/BulletSoftBody/btSoftBody.h
View File

@@ -1122,7 +1122,7 @@ public:
void initializeFaceTree();
btVector3 evaluateCom() const;
bool checkDeformableContact(const btCollisionObjectWrapper* colObjWrap, const btVector3& x, btScalar margin, btSoftBody::sCti& cti, bool predict = false) const;
bool checkDeformableFaceContact(const btCollisionObjectWrapper* colObjWrap, Face& x, btVector3& contact_point, btVector3& bary, btScalar margin, btSoftBody::sCti& cti, bool predict = false) const;
bool checkDeformableFaceContact(const btCollisionObjectWrapper* colObjWrap, Face& f, btVector3& contact_point, btVector3& bary, btScalar margin, btSoftBody::sCti& cti, bool predict = false) const;
bool checkContact(const btCollisionObjectWrapper* colObjWrap, const btVector3& x, btScalar margin, btSoftBody::sCti& cti) const;
void updateNormals();
void updateBounds();