Skip to content

Commit 40c2deb

Browse files
th-skamth-skam
committed
[src] Moved .h/.cpp files to src/CollisionAlgorithm - mimic other SOFA plugins for build consistency
1 parent 54dd8a6 commit 40c2deb

Some content is hidden

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

65 files changed

+196
-196
lines changed

src/sofa/collisionAlgorithm/BaseAABBBroadPhase.h renamed to src/CollisionAlgorithm/BaseAABBBroadPhase.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

33
#include <sofa/helper/AdvancedTimer.h>
4-
#include <sofa/collisionAlgorithm/BaseGeometry.h>
5-
#include <sofa/collisionAlgorithm/BaseAlgorithm.h>
6-
#include <sofa/collisionAlgorithm/operations/Project.h>
7-
#include <sofa/collisionAlgorithm/BaseElement.h>
4+
#include <CollisionAlgorithm/BaseGeometry.h>
5+
#include <CollisionAlgorithm/BaseAlgorithm.h>
6+
#include <CollisionAlgorithm/operations/Project.h>
7+
#include <CollisionAlgorithm/BaseElement.h>
88
#include <thread>
99

1010
namespace sofa::collisionAlgorithm {

src/sofa/collisionAlgorithm/BaseAlgorithm.h renamed to src/CollisionAlgorithm/BaseAlgorithm.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include <sofa/collisionAlgorithm/BaseGeometry.h>
3+
#include <CollisionAlgorithm/BaseGeometry.h>
44
#include <sofa/core/collision/Pipeline.h>
5-
#include <sofa/collisionAlgorithm/DataDetectionOutput.h>
6-
#include <sofa/collisionAlgorithm/CollisionPipeline.h>
5+
#include <CollisionAlgorithm/DataDetectionOutput.h>
6+
#include <CollisionAlgorithm/CollisionPipeline.h>
77

88
namespace sofa::collisionAlgorithm {
99

src/sofa/collisionAlgorithm/BaseElement.h renamed to src/CollisionAlgorithm/BaseElement.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include <sofa/collisionAlgorithm/BaseProximity.h>
3+
#include <CollisionAlgorithm/BaseProximity.h>
44
#include <sofa/core/visual/VisualParams.h>
55

66
namespace sofa::collisionAlgorithm {

src/sofa/collisionAlgorithm/BaseGeometry.h renamed to src/CollisionAlgorithm/BaseGeometry.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#pragma once
22

3-
#include <sofa/collisionAlgorithm/CollisionPipeline.h>
4-
#include <sofa/collisionAlgorithm/BaseElement.h>
5-
#include <sofa/collisionAlgorithm/BaseProximity.h>
6-
#include <sofa/collisionAlgorithm/ElementIterator.h>
3+
#include <CollisionAlgorithm/CollisionPipeline.h>
4+
#include <CollisionAlgorithm/BaseElement.h>
5+
#include <CollisionAlgorithm/BaseProximity.h>
6+
#include <CollisionAlgorithm/ElementIterator.h>
77
#include <sofa/gl/gl.h>
88
#include <sofa/helper/AdvancedTimer.h>
9-
#include <sofa/collisionAlgorithm/elements/PointElement.h>
10-
#include <sofa/collisionAlgorithm/elements/EdgeElement.h>
11-
#include <sofa/collisionAlgorithm/elements/TriangleElement.h>
12-
#include <sofa/collisionAlgorithm/elements/TetrahedronElement.h>
13-
#include <sofa/collisionAlgorithm/InternalData.h>
9+
#include <CollisionAlgorithm/elements/PointElement.h>
10+
#include <CollisionAlgorithm/elements/EdgeElement.h>
11+
#include <CollisionAlgorithm/elements/TriangleElement.h>
12+
#include <CollisionAlgorithm/elements/TetrahedronElement.h>
13+
#include <CollisionAlgorithm/InternalData.h>
1414

1515

1616
namespace sofa ::collisionAlgorithm {

src/sofa/collisionAlgorithm/BaseOperation.h renamed to src/CollisionAlgorithm/BaseOperation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include <sofa/collisionAlgorithm/BaseGeometry.h>
3+
#include <CollisionAlgorithm/BaseGeometry.h>
44
#include <sofa/helper/NameDecoder.h>
55
#include <memory>
66

src/sofa/collisionAlgorithm/BaseProximity.h renamed to src/CollisionAlgorithm/BaseProximity.h

File renamed without changes.

src/sofa/collisionAlgorithm/CollisionPipeline.cpp renamed to src/CollisionAlgorithm/CollisionPipeline.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <sofa/collisionAlgorithm/CollisionPipeline.h>
1+
#include <CollisionAlgorithm/CollisionPipeline.h>
22
#include <sofa/core/ObjectFactory.h>
33

44
namespace sofa::collisionAlgorithm

src/sofa/collisionAlgorithm/CollisionPipeline.h renamed to src/CollisionAlgorithm/CollisionPipeline.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
#pragma once
22

3-
//#include <sofa/collisionAlgorithm/BaseOperation.h>
3+
//#include <CollisionAlgorithm/BaseOperation.h>
44
#include <sofa/simulation/CollisionBeginEvent.h>
5-
#include <sofa/collisionAlgorithm/BaseElement.h>
6-
#include <sofa/collisionAlgorithm/BaseProximity.h>
5+
#include <CollisionAlgorithm/BaseElement.h>
6+
#include <CollisionAlgorithm/BaseProximity.h>
77
#include <sofa/core/BehaviorModel.h>
88
#include <sofa/core/visual/VisualParams.h>
99
#include <sofa/core/objectmodel/DataCallback.h>
1010
#include <sofa/simulation/Visitor.h>
1111
#include <sofa/gl/gl.h>
1212
#include <sofa/simulation/AnimateBeginEvent.h>
1313
#include <sofa/core/topology/BaseMeshTopology.h>
14-
#include <sofa/collisionAlgorithm/BaseElement.h>
14+
#include <CollisionAlgorithm/BaseElement.h>
1515
#include <sofa/simulation/Node.h>
1616
#include <sofa/helper/AdvancedTimer.h>
1717

src/sofa/collisionAlgorithm/DataDetectionOutput.h renamed to src/CollisionAlgorithm/DataDetectionOutput.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include <sofa/collisionAlgorithm/BaseGeometry.h>
3+
#include <CollisionAlgorithm/BaseGeometry.h>
44

55
namespace sofa
66
{

src/sofa/collisionAlgorithm/ElementIterator.h renamed to src/CollisionAlgorithm/ElementIterator.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include <sofa/collisionAlgorithm/BaseProximity.h>
4-
#include <sofa/collisionAlgorithm/BaseElement.h>
3+
#include <CollisionAlgorithm/BaseProximity.h>
4+
#include <CollisionAlgorithm/BaseElement.h>
55

66
namespace sofa::collisionAlgorithm {
77

0 commit comments

Comments
 (0)