-
Notifications
You must be signed in to change notification settings - Fork 285
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix World::clone() doesn't clone the collision detector #658
Conversation
There seems to be a bit of a conflict where this PR has introduced the function I think I prefer |
To clarify, we use |
Yes, that has been our convention so far. I'm also spotting some conflicts in naming conventions for the strings of the different collision detectors. We'll need to choose between:
I don't really have any personal preference for any of these, but a decision must be made 😆 |
Yeah, I would slightly prefer lower letter versions though since it's been used in |
Sounds good. |
…ion_detector Conflicts: dart/collision/CollisionDetector.h dart/collision/bullet/BulletCollisionDetector.cpp dart/collision/bullet/BulletCollisionDetector.h dart/collision/dart/DARTCollisionDetector.cpp dart/collision/dart/DARTCollisionDetector.h dart/collision/dart/DARTCollisionObject.h dart/collision/fcl/FCLCollisionDetector.cpp dart/collision/fcl/FCLCollisionDetector.h dart/collision/fcl_mesh/FCLMeshCollisionDetector.cpp
Merged master branch into this. I think this is ready to merge. |
I was also working on merging this, but I came across something fishy, and I'm seeing it in your merge as well.
|
Oh, sorry for the confliction on work. Good catch by the way. I think Hm, I'm not sure how it was accepted the code. I'm trying to figure it out googling.. |
I'm happy with this PR. I'll merge it once the CI tests pass 👍 |
No description provided.