Skip to content
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

[SofaBaseCollision] Remove dependencies on BaseIntTool #2081

Merged
merged 14 commits into from
May 21, 2021

Conversation

fredroy
Copy link
Contributor

@fredroy fredroy commented May 13, 2021

This follows #2073

BaseIntTool/MeshIntTool (and their friends IntrUtility stuff) was mostly created to handle OBB/Capsule.
Their design is quite weird (at least to me) and it is based on a code copied from GeometricTools (so the copyright/licensing is nebulous in the best case).

This PR makes SofaBaseCollision to not rely at all on those code, mainly to revert back the code from a long time ago.
It fixes also the fact that DiscreteIntersection was using proximities for the various computeIntersection() [1st error], but not using proximities in the various testIntersection in the proximities-based Intersections [2nd error]


By submitting this pull request, I acknowledge that
I have read, understand, and agree SOFA Developer Certificate of Origin (DCO).


Reviewers will merge this pull-request only if

  • it builds with SUCCESS for all platforms on the CI.
  • it does not generate new warnings.
  • it does not generate new unit test failures.
  • it does not generate new scene test failures.
  • it does not break API compatibility.
  • it is more than 1 week old (or has fast-merge label).

@fredroy fredroy added pr: status to review To notify reviewers to review this pull-request pr: clean Cleaning the code NG3: new-archi See https://github.com/sofa-framework/sofa/issues/1527 labels May 13, 2021
@fredroy
Copy link
Contributor Author

fredroy commented May 14, 2021

[ci-build][with-all-tests]

@hugtalbot hugtalbot added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels May 19, 2021
@guparan guparan merged commit b03a5c7 into sofa-framework:master May 21, 2021

int MinProximityIntersection::computeIntersection(Cube& cube1, Cube& cube2, OutputVector* contacts)
{
return BaseProximityIntersection::testIntersection(cube1, cube2);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fredroy do you confirm the typo here? Shouldn't it be BaseProximityIntersection::computeIntersection?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do confirm it should be computeIntersection...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'm on it

@guparan guparan added this to the v21.06 milestone Jun 28, 2021
@fredroy fredroy deleted the refactor_intr2 branch October 14, 2021 09:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
NG3: new-archi See https://github.com/sofa-framework/sofa/issues/1527 pr: clean Cleaning the code pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants