Merge inf_dev_2023 into inf_dev_2024 #13

epernod · 2024-03-14T16:14:20Z

NearestPointROI drawing
[Geometry] Update method intersectionWithEdge signature and redirect all methods to it in EdgeSetGeometryAlgorithms: [Geometry] Update method intersectionWithEdge signature and redirect all methods to it in EdgeSetGeometryAlgorithms sofa-framework/sofa#4194
Triangle subdivision new pipeline:
- PointModifiers.h
- TriangleModifiers.h
- computeSegmentTriangleIntersection
- computeIntersectedPointsList2
Some cleaning in QtGui: [GUI.Qt] Some cleaning in qt RealGui sofa-framework/sofa#4641
Add css in qtGui

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

…ectedObjectList for more clarity

…ath methods to avoid confusion

…oAdd elements

…the triangles positions and use real area as barycoef

…stored

…to make sure the incision path cross triangle edges

…ient

…ding them

…rycentric coordinates instead of 3D coord.

…2023 # Conflicts: # Sofa/Component/Engine/Select/src/sofa/component/engine/select/NearestPointROI.inl # Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h # Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.inl

epernod added pr: fix pr: new feature labels Mar 14, 2024

epernod force-pushed the inf_dev_2024 branch from eae8cd9 to aef1e50 Compare May 17, 2024 10:24

epernod added 27 commits May 17, 2024 12:34

Some cleaning

8226249

Add method computeSegmentTriangleIntersectionInPlane

5bad2fd

backup method computeIntersectedPointList2

ea49037

Some cleaning

7d2f9ba

backup work on new triangle incision process

b28cec5

[TriangleSetGeometry] Remove some logs

f988836

[TriangleSetGeometry] Fix and refactor computeIntersectedPointsList2

6414799

[TriangleSetGeometry] Reindent and rename variables in computeInters…

5d238cc

…ectedObjectList for more clarity

[TriangleSetGeometry] Rename some parameters in snap and splitAlongP…

a22c8df

…ath methods to avoid confusion

[Topology] Add PointModifier and TriangleModifier classes

41fdda4

[Topology] backup work on computeTriangleIncisionPath

f5474f6

[Topology] backup work on Incision per triangle

14ab9d8

[Topology] Fix compilation by commenting unused code

20c0b7b

[Topology] Add TriangleSubdivider_1Node subidvide method

ed68e80

[Topology] Clean TriangleSubdivider_1Node subidvide method

2e36b48

[Topology] Add TriangleSubdivider_1Edge subidvide method

b46952e

[Topology] Add TriangleSubdivider_2Edge subidvide method

0ac131c

[Topology] Add TriangleSubdivider_3Edge subidvide method

166f96e

[Topology] Add TriangleSubdivider_2Node subidvide method

64d845b

[Topology] Update subdividers constructor and code to only use PointT…

2cdfbc1

…oAdd elements

[MeshTools] Update all subdividers to use a fixed_array<3, Vec3> for …

5732045

…the triangles positions and use real area as barycoef

[Topology] Fix computeSegmentTriangleIntersectionInPlane coefficient …

4ea2a4a

…stored

[Topology] Fix computeIntersectedPointsList2 using a small threshold …

3db197d

…to make sure the incision path cross triangle edges

[Topology] Various clean in TriangleSetGeometryAlgorithms

62fd8fe

[Topology] Fix TriangleModifier TriangleSubdivider_2Edge area coeffic…

fb10a81

…ient

[Topology] Add option to store new triangle coordinates while subdivi…

d4b89d7

…ding them

[Topology] Update ComputeIntersectedPointsLists2 method signature

d6466c2

epernod added 11 commits May 17, 2024 12:35

backup work on triangleIncisionProcess

490bc6e

Fix warnings

f34a1b0

Fix compilation du to change in SOFA main

09b85a3

[Geometry] Update method signature of intersectionWithEdge to pass ba…

8a74a98

…rycentric coordinates instead of 3D coord.

Fix compilation

87249b7

[QtGui] Add first version of the dockwidget interface

1bfcb27

[QtGui] Add qss files to change GUI style

cbdc11b

[QtGui] Add option to add Dockwidget from outside the main RealGUI

aebb9d1

[qt] fix folder icon not visible in graph view

894e400

[Engine] Add draw method in NearestPointROI

9dd41f5

Fix bad merge

13de56d

epernod force-pushed the inf_dev_2023 branch from 9553212 to 13de56d Compare May 17, 2024 10:45

epernod force-pushed the inf_dev_2024 branch from 45afd0c to 164f9aa Compare May 17, 2024 12:17

epernod force-pushed the inf_dev_2024 branch from c2f56b5 to e41554c Compare June 14, 2024 00:41

epernod force-pushed the inf_dev_2024 branch from 1d9cdf3 to 1d845f2 Compare July 15, 2024 12:23

epernod force-pushed the inf_dev_2024 branch from 4ec92aa to 4aa12ba Compare August 12, 2024 16:28

epernod force-pushed the inf_dev_2024 branch from 83f7358 to 92a6f5f Compare August 28, 2024 22:47

epernod force-pushed the inf_dev_2024 branch from 92a6f5f to 48d05b5 Compare October 26, 2024 20:08

epernod force-pushed the inf_dev_2024 branch from 48d05b5 to f9273f2 Compare December 11, 2024 14:22

epernod force-pushed the inf_dev_2024 branch from 0d9f946 to 600748b Compare December 22, 2024 16:02

epernod force-pushed the inf_dev_2023 branch from a881239 to 13de56d Compare January 3, 2025 00:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge inf_dev_2023 into inf_dev_2024 #13

Merge inf_dev_2023 into inf_dev_2024 #13

epernod commented Mar 14, 2024 •

edited

Loading

Merge inf_dev_2023 into inf_dev_2024 #13

Are you sure you want to change the base?

Merge inf_dev_2023 into inf_dev_2024 #13

Conversation

epernod commented Mar 14, 2024 • edited Loading

epernod commented Mar 14, 2024 •

edited

Loading