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

[all] Several bug fixes #985

Merged
merged 9 commits into from Apr 11, 2019

Conversation

3 participants
@epernod
Copy link
Contributor

commented Apr 8, 2019

Some bug fix from my working branch. List of fix:

  • [FixedConstraint] fix bug when several invalid indices need to be removed. Need to parse all first and remove in a second stage.
  • [SphereModel] FIX: display of collision sphere in wireframe mode.
  • [TetrahedronSetTopologyContainer] FIX: triangle created with bad orientation in addTetrahedronProcess method.
  • [TriangleModel] FIX: need to check if topology has changed and update the triangles if needed before computing triangleModel BBox
  • [PointModel] Fix pointModel crash when removing points. need to be well resized in computeboundingtree method.
  • [SofaBaseTopology] Add a single static trianglesOrientationInTetrahedronArray in baseMeshTopology.h and remove all the different occurences (with different values) in the cpp files.

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 added some commits Mar 18, 2019

[FixedConstraint] fix bug when several invalid indices need to be rem…
…oved. Need to parse all first and remove in a second stage.
[SofaMeshCollision] FIX: need to check if topology has changed and up…
…date the triangles if needed before computing triangleModel BBox
[SofaMeshCollision] Fix pointModel crash when removing points. need t…
…o be well resized in computeboundingtree method.
Revert "[SofaTopologyMapping] FIX: too complicated and wrong algo to …
…get triangle inbetween tetrahedron created."

This reverts commit c1cf977.
[SofaKernel] Add a single static trianglesOrientationInTetrahedronArr…
…ay in baseMeshTopology and remove all the different occurences in the cpp files.
@epernod

This comment has been minimized.

Copy link
Contributor Author

commented Apr 8, 2019

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

@@ -326,6 +326,9 @@ class SOFA_CORE_API BaseMeshTopology : public core::topology::Topology

};

// map of triangles orientation inside a tetrahedron.
static const unsigned int trianglesOrientationInTetrahedronArray[4][3]= {{1,2,3}, {0,3,2}, {1,3,0},{0,2,1}};

This comment has been minimized.

Copy link
@hugtalbot

hugtalbot Apr 9, 2019

Contributor

So now the only ordering is the following: {1,2,3}, {0,3,2}, {1,3,0},{0,2,1} ?

This comment has been minimized.

Copy link
@epernod

epernod Apr 9, 2019

Author Contributor

yes it is the original one.
The one I changed last month: const unsigned int trianglesInTetrahedronArray[4][3]= {{0,2,1}, {0,1,3}, {1,2,3}, {0,3,2}};
should have the same behavior but it isn't the case. I don't have time to dig into it. This one works well.

This comment has been minimized.

Copy link
@epernod

epernod Apr 9, 2019

Author Contributor

yes it is the original one.
The one I changed last month: const unsigned int trianglesInTetrahedronArray[4][3]= {{0,2,1}, {0,1,3}, {1,2,3}, {0,3,2}};
should have the same behavior but it isn't the case. I don't have time to dig into it. This one works well.

@hugtalbot

This comment has been minimized.

Copy link
Contributor

commented Apr 9, 2019

Some new test in TetrahedronSetTopology_test is failing. Was it expected due to your change Erik ?
The regression tests are also crying on topo.

@epernod

This comment has been minimized.

Copy link
Contributor Author

commented Apr 9, 2019

yes the change of trianglesInTetrahedron need to be propagated in the tests. I will check that.

@hugtalbot

This comment has been minimized.

Copy link
Contributor

commented Apr 10, 2019

👍 Good to me !

@guparan guparan merged commit 801cda5 into sofa-framework:master Apr 11, 2019

7 checks passed

Dashboard Builds triggered.
Details
[with-regression-tests] Triggered in latest build.
Details
[with-scene-tests] Triggered in latest build.
Details
centos_clang-5_options Build OK. FIXME: 0 unit, 0 scene, 4 regressions
Details
mac_clang-3.5_options Build OK. FIXME: 1 unit, 2 scenes, 4 regressions
Details
ubuntu_gcc-5.4_options Build OK. FIXME: 0 unit, 0 scene, 3 regressions
Details
windows7_VS-2015_options_amd64 Build OK. FIXME: 1 unit, 1 scene, 3 regressions
Details

@guparan guparan added this to the v19.06 milestone Jun 20, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.