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

[SofaUserInteraction] Minor cleaning of RayTraceDetection #2009

Merged
merged 1 commit into from
Apr 19, 2021

Conversation

alxbilger
Copy link
Contributor

Initially, I wanted to differentiate the functions from the broad phase, from the functions from the narrow phase, in the header file.
void selfCollision (TriangleOctreeModel * cm1); has been removed since it is not implemented. Other modifications are minor.


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).

@alxbilger alxbilger added pr: clean Cleaning the code pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: status to review To notify reviewers to review this pull-request labels Apr 15, 2021
@@ -240,10 +245,8 @@ void RayTraceDetection::addCollisionModel (core::CollisionModel * cm)
{
if (cm->empty ())
return;
for (sofa::helper::vector < core::CollisionModel * >::iterator it =
collisionModels.begin (); it != collisionModels.end (); ++it)
for (auto* cm2 : collisionModels)
Copy link
Contributor

Choose a reason for hiding this comment

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

auto* will not be deduced as core::CollisionModel** ? (as collisionModels is a vector of CollisionModel*)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, I don't think so. See https://stackoverflow.com/a/34560387

Copy link
Contributor

Choose a reason for hiding this comment

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

👍

@fredroy fredroy 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 Apr 19, 2021
@guparan guparan merged commit 8d801e4 into sofa-framework:master Apr 19, 2021
@guparan guparan added this to the v21.06 milestone Jun 28, 2021
@alxbilger alxbilger deleted the ray_trace_clean branch June 28, 2022 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: clean Cleaning the code pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants