Skip to content

Commit 260aa32

Browse files
fredroybakpaulepernod
authored
[Collision.Geometry] Rename *Model header files to *CollisionModel (#5789)
* rename *Model files to *CollisionModel * apply in SOFA codebase * move deprecated header into a separate dir * Update Sofa/Component/Collision/Geometry/CMakeLists.txt Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com> --------- Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com> Co-authored-by: erik pernod <erik.pernod@gmail.com>
1 parent 145f8c3 commit 260aa32

File tree

79 files changed

+547
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+547
-156
lines changed

‎Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceBroadPhase.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <sofa/component/collision/detection/algorithm/config.h>
2525
#include <sofa/core/collision/BroadPhaseDetection.h>
26-
#include <sofa/component/collision/geometry/CubeModel.h>
26+
#include <sofa/component/collision/geometry/CubeCollisionModel.h>
2727

2828
namespace sofa::component::collision::detection::algorithm
2929
{

‎Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DSAPBox.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <sofa/component/collision/detection/algorithm/config.h>
2525

26-
#include <sofa/component/collision/geometry/CubeModel.h>
26+
#include <sofa/component/collision/geometry/CubeCollisionModel.h>
2727

2828
namespace sofa::component::collision::detection::algorithm
2929
{
@@ -59,4 +59,4 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API DSAPBox
5959
EndPoint *max{nullptr};
6060
};
6161

62-
}
62+
}

‎Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
#include <sofa/core/CollisionModel.h>
3232
#include <sofa/component/collision/detection/algorithm/EndPoint.h>
3333
#include <sofa/component/collision/detection/algorithm/CollisionPM.h>
34-
#include <sofa/component/collision/geometry/CubeModel.h>
35-
#include <sofa/component/collision/geometry/TriangleModel.h>
36-
#include <sofa/component/collision/geometry/LineModel.h>
37-
#include <sofa/component/collision/geometry/PointModel.h>
38-
#include <sofa/component/collision/geometry/SphereModel.h>
34+
#include <sofa/component/collision/geometry/CubeCollisionModel.h>
35+
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>
36+
#include <sofa/component/collision/geometry/LineCollisionModel.h>
37+
#include <sofa/component/collision/geometry/PointCollisionModel.h>
38+
#include <sofa/component/collision/geometry/SphereCollisionModel.h>
3939

4040
#include <vector>
4141
#include <set>

‎Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceNarrowPhase.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
#include <sofa/core/ObjectFactory.h>
2525
#include <sofa/core/visual/VisualParams.h>
26-
#include <sofa/component/collision/geometry/CubeModel.h>
27-
#include <sofa/component/collision/geometry/TriangleOctreeModel.h>
28-
#include <sofa/component/collision/geometry/TriangleModel.h>
26+
#include <sofa/component/collision/geometry/CubeCollisionModel.h>
27+
#include <sofa/component/collision/geometry/TriangleOctreeCollisionModel.h>
28+
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>
2929

3030
namespace sofa::component::collision::detection::algorithm
3131
{

‎Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <sofa/component/collision/detection/intersection/config.h>
2424

2525
#include <sofa/component/collision/detection/intersection/DiscreteIntersection.h>
26-
#include <sofa/component/collision/geometry/CubeModel.h>
26+
#include <sofa/component/collision/geometry/CubeCollisionModel.h>
2727

2828
namespace sofa::component::collision::detection::intersection
2929
{

‎Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/DiscreteIntersection.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
#include <sofa/core/collision/Intersection.h>
2626
#include <sofa/core/collision/IntersectorFactory.h>
27-
#include <sofa/component/collision/geometry/SphereModel.h>
28-
#include <sofa/component/collision/geometry/CubeModel.h>
27+
#include <sofa/component/collision/geometry/SphereCollisionModel.h>
28+
#include <sofa/component/collision/geometry/CubeCollisionModel.h>
2929

3030
namespace sofa::component::collision::detection::intersection
3131
{

‎Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424

2525
#include <sofa/component/collision/detection/intersection/BaseProximityIntersection.h>
2626

27-
#include <sofa/component/collision/geometry/SphereModel.h>
28-
#include <sofa/component/collision/geometry/TriangleModel.h>
29-
#include <sofa/component/collision/geometry/LineModel.h>
30-
#include <sofa/component/collision/geometry/PointModel.h>
31-
#include <sofa/component/collision/geometry/CubeModel.h>
32-
#include <sofa/component/collision/geometry/RayModel.h>
27+
#include <sofa/component/collision/geometry/SphereCollisionModel.h>
28+
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>
29+
#include <sofa/component/collision/geometry/LineCollisionModel.h>
30+
#include <sofa/component/collision/geometry/PointCollisionModel.h>
31+
#include <sofa/component/collision/geometry/CubeCollisionModel.h>
32+
#include <sofa/component/collision/geometry/RayCollisionModel.h>
3333

3434
namespace sofa::component::collision::detection::intersection
3535
{

‎Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MeshDiscreteIntersection.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525

2626
#include <sofa/core/collision/Intersection.h>
2727

28-
#include <sofa/component/collision/geometry/LineModel.h>
29-
#include <sofa/component/collision/geometry/TriangleModel.h>
30-
#include <sofa/component/collision/geometry/SphereModel.h>
28+
#include <sofa/component/collision/geometry/LineCollisionModel.h>
29+
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>
30+
#include <sofa/component/collision/geometry/SphereCollisionModel.h>
3131

3232
namespace sofa::component::collision::detection::intersection
3333
{

‎Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MeshMinProximityIntersection.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
#include <sofa/component/collision/detection/intersection/config.h>
2525

2626
#include <sofa/component/collision/detection/intersection/MinProximityIntersection.h>
27-
#include <sofa/component/collision/geometry/SphereModel.h>
28-
#include <sofa/component/collision/geometry/TriangleModel.h>
29-
#include <sofa/component/collision/geometry/LineModel.h>
30-
#include <sofa/component/collision/geometry/PointModel.h>
31-
#include <sofa/component/collision/geometry/CubeModel.h>
27+
#include <sofa/component/collision/geometry/SphereCollisionModel.h>
28+
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>
29+
#include <sofa/component/collision/geometry/LineCollisionModel.h>
30+
#include <sofa/component/collision/geometry/PointCollisionModel.h>
31+
#include <sofa/component/collision/geometry/CubeCollisionModel.h>
3232

3333
namespace sofa::component::collision::detection::intersection
3434
{

‎Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MeshNewProximityIntersection.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#include <sofa/component/collision/detection/intersection/config.h>
2424

2525
#include <sofa/component/collision/detection/intersection/NewProximityIntersection.h>
26-
#include <sofa/component/collision/geometry/TriangleModel.h>
27-
#include <sofa/component/collision/geometry/LineModel.h>
28-
#include <sofa/component/collision/geometry/PointModel.h>
26+
#include <sofa/component/collision/geometry/TriangleCollisionModel.h>
27+
#include <sofa/component/collision/geometry/LineCollisionModel.h>
28+
#include <sofa/component/collision/geometry/PointCollisionModel.h>
2929

3030
namespace sofa::component::collision::detection::intersection
3131
{

0 commit comments

Comments
 (0)