Skip to content

[modules] Fix some warnings and OglAttribute handleTopologyChange#1159

Merged
fredroy merged 6 commits intosofa-framework:masterfrom
epernod:inf_bug_fix2
Oct 9, 2019
Merged

[modules] Fix some warnings and OglAttribute handleTopologyChange#1159
fredroy merged 6 commits intosofa-framework:masterfrom
epernod:inf_bug_fix2

Conversation

@epernod
Copy link
Copy Markdown
Contributor

@epernod epernod commented Sep 26, 2019

Various fix from my working branch:

  • FIX: wrong msg_error instead of msg_info in PrecomputedConstraintCorrection
  • FIX: warnings when drawing collision interaction using UnilateralInteractionConstraint
  • FIX: OglAttribute handleTopologyChange method by using a PointData for value array.
  • CLEAN: some logs in PointModel
  • FIX: NearestPointROI to use rest_position instead of position

This PR:

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

Reviewers will merge only if all these checks are true.

@epernod epernod added pr: fix Fix a bug pr: status wip Development in the pull-request is still in progress labels Sep 26, 2019
@epernod epernod self-assigned this Sep 26, 2019
Comment thread modules/SofaConstraint/PrecomputedConstraintCorrection.inl Outdated
otherVertices.push_back(c.P);
otherVertices.push_back(c.P + c.norm);
otherColors.push_back(sofa::defaulttype::RGBAColor(0,0.5,0.5,1));
otherColors.push_back(sofa::defaulttype::RGBAColor::white());
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

+1

@epernod epernod added pr: status to review To notify reviewers to review this pull-request and removed pr: status wip Development in the pull-request is still in progress labels Oct 8, 2019
@epernod
Copy link
Copy Markdown
Contributor Author

epernod commented Oct 8, 2019

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

@guparan guparan 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 Oct 9, 2019
Comment on lines +105 to +106
const VecCoord& x1 = this->mstate1->read(core::ConstVecCoordId::restPosition())->getValue();
const VecCoord& x2 = this->mstate2->read(core::ConstVecCoordId::restPosition())->getValue();
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Sorry to ask late about htis but why do you change this ?
Shouldn't it be selectable by the user ?

@damienmarchal
Copy link
Copy Markdown
Contributor

I have added just one small question i forgot to ask during the meeting;

@fredroy fredroy merged commit 0bea5cd into sofa-framework:master Oct 9, 2019
@epernod epernod deleted the inf_bug_fix2 branch October 16, 2019 16:48
@guparan guparan added this to the v19.12 milestone Jan 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr: fix Fix a bug 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