Skip to content

Commit 6be906c

Browse files
th-skamth-skam
committed
[cmake] Propagate cmake changes from CollisionAlgorithm to this repository #18
* [src] Corrected paths in header files following changes in CollisionAlgorithm repository * [cmake] Cleanup: removed manual configurations and ease-read syntax * [cmake] Update cmake config file with required packages * [src] Changed folder structure from src/sofa to src/ConstraintGeometry following other SOFA plugins * [src] Corrected paths to repository components after changing folder structure * [src] Adapted namespace rename in CollisionAlgorithm repository * [cmake] Add config.h.in file * [src] Change namespace to lowercase for repository * [cmake] List headers and sources in CMakeLists, drop glob and load sofa/config in init*.cpp * [ci] Adjust CI workflow to updated CollisionAlgorithm workflow
1 parent 329cf49 commit 6be906c

Some content is hidden

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

43 files changed

+310
-265
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
-GNinja \
4040
-DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake" \
4141
-DCMAKE_BUILD_TYPE=Release \
42-
-DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/CollisionAlgorithm" \
42+
-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%/deps/CollisionAlgorithm/install \
4343
.. \
4444
&& ninja install"
4545
else
@@ -48,22 +48,10 @@ jobs:
4848
-GNinja \
4949
-DCMAKE_PREFIX_PATH=$SOFA_ROOT/lib/cmake \
5050
-DCMAKE_BUILD_TYPE=Release \
51-
-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/install/CollisionAlgorithm \
51+
-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/deps/CollisionAlgorithm/install \
5252
..
5353
ninja install
5454
fi
55-
# Move the CollisionAlgorithm installation to match ConstraintGeometry CMake
56-
SRC_PATH="$GITHUB_WORKSPACE/install/CollisionAlgorithm/include/include/CollisionAlgorithm/CollisionAlgorithm/src"
57-
DEST_PATH="$GITHUB_WORKSPACE/install/CollisionAlgorithm/include/CollisionAlgorithm"
58-
# If Windows, convert paths
59-
if [[ "$RUNNER_OS" == "Windows" ]]; then
60-
SRC_PATH=$(cygpath -u "$SRC_PATH")
61-
DEST_PATH=$(cygpath -u "$DEST_PATH")
62-
fi
63-
# Flatten install structure
64-
mkdir -p "$DEST_PATH"
65-
mv "$SRC_PATH"/* "$DEST_PATH"/
66-
rm -rf "$GITHUB_WORKSPACE/install/CollisionAlgorithm/include/include"
6755
6856
- name: Checkout source code
6957
uses: actions/checkout@v2
@@ -79,7 +67,7 @@ jobs:
7967
&& cd /d %GITHUB_WORKSPACE%/build \
8068
&& cmake \
8169
-GNinja \
82-
-DCMAKE_PREFIX_PATH=$SOFA_ROOT/lib/cmake;%GITHUB_WORKSPACE%/install/CollisionAlgorithm \
70+
-DCMAKE_PREFIX_PATH=$SOFA_ROOT/lib/cmake;%GITHUB_WORKSPACE%/deps/CollisionAlgorithm/install/lib/cmake \
8371
-DCMAKE_BUILD_TYPE=Release \
8472
-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%/install \
8573
../src \
@@ -91,7 +79,7 @@ jobs:
9179
-GNinja \
9280
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
9381
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
94-
-DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake;$GITHUB_WORKSPACE/install/CollisionAlgorithm" \
82+
-DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake;$GITHUB_WORKSPACE/deps/CollisionAlgorithm/install/lib/cmake" \
9583
-DCMAKE_BUILD_TYPE=Release \
9684
-DCMAKE_INSTALL_PREFIX="$WORKSPACE_INSTALL_PATH" \
9785
../src

‎CMakeLists.txt‎

Lines changed: 62 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,82 @@
11
cmake_minimum_required(VERSION 3.12)
22
project(ConstraintGeometry VERSION 0.1 LANGUAGES CXX)
33

4-
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
4+
find_package(CollisionAlgorithm REQUIRED)
5+
find_package(Sofa.Component.StateContainer REQUIRED)
6+
find_package(Sofa.Component.Constraint.Lagrangian.Solver REQUIRED)
7+
find_package(Sofa.GL REQUIRED)
58

6-
file(GLOB_RECURSE HEADER_FILES
7-
"src/*.h"
8-
"src/*.inl"
9-
)
9+
set(CONSTRAINTGEOMETRY_SRC "src/${PROJECT_NAME}")
1010

11-
file(GLOB_RECURSE SOURCE_FILES
12-
"src/*.cpp"
13-
)
11+
set(HEADER_FILES
12+
${CONSTRAINTGEOMETRY_SRC}/config.h.in
13+
${CONSTRAINTGEOMETRY_SRC}/initConstraintGeometry.h
1414

15-
file(GLOB_RECURSE SCENES_FILES
16-
"scenes/*.scn"
17-
"*.xml"
18-
)
15+
${CONSTRAINTGEOMETRY_SRC}/BaseConstraint.h
16+
${CONSTRAINTGEOMETRY_SRC}/BaseNormalHandler.h
17+
${CONSTRAINTGEOMETRY_SRC}/ConstraintDirection.h
18+
${CONSTRAINTGEOMETRY_SRC}/ConstraintNormal.h
19+
${CONSTRAINTGEOMETRY_SRC}/ConstraintProximity.h
20+
${CONSTRAINTGEOMETRY_SRC}/ConstraintResponse.h
21+
${CONSTRAINTGEOMETRY_SRC}/InternalConstraint.h
1922

20-
file(GLOB_RECURSE IGNORED_FILES
21-
"ignored/*.h"
22-
"ignored/*.inl"
23-
"ignored/*.cpp"
24-
)
23+
${CONSTRAINTGEOMETRY_SRC}/constraint/BilateralResolution.h
24+
${CONSTRAINTGEOMETRY_SRC}/constraint/ConstraintBilateral.h
25+
${CONSTRAINTGEOMETRY_SRC}/constraint/ConstraintInsertion.h
26+
${CONSTRAINTGEOMETRY_SRC}/constraint/ConstraintUnilateral.h
27+
${CONSTRAINTGEOMETRY_SRC}/constraint/InsertionResolution.h
28+
${CONSTRAINTGEOMETRY_SRC}/constraint/UnilateralResolution.h
29+
30+
${CONSTRAINTGEOMETRY_SRC}/directions/BindDirection.h
31+
${CONSTRAINTGEOMETRY_SRC}/directions/ContactDirection.h
32+
${CONSTRAINTGEOMETRY_SRC}/directions/FirstDirection.h
33+
${CONSTRAINTGEOMETRY_SRC}/directions/FixedFrameDirection.h
34+
${CONSTRAINTGEOMETRY_SRC}/directions/SecondDirection.h
2535

26-
file(GLOB_RECURSE DEPRECATED_FILES
27-
"deprecated/*.h"
28-
"deprecated/*.inl"
29-
"deprecated/*.cpp"
36+
${CONSTRAINTGEOMETRY_SRC}/normalHandler/EdgeNormalHandler.h
37+
${CONSTRAINTGEOMETRY_SRC}/normalHandler/GouraudTriangleNormalHandler.h
38+
${CONSTRAINTGEOMETRY_SRC}/normalHandler/GravityPointNormalHandler.h
39+
${CONSTRAINTGEOMETRY_SRC}/normalHandler/PhongTriangleNormalHandler.h
40+
${CONSTRAINTGEOMETRY_SRC}/normalHandler/VectorPointNormalHandler.h
41+
42+
${CONSTRAINTGEOMETRY_SRC}/operations/ConstraintProximityOperation.h
3043
)
3144

32-
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/ignored")
33-
#include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deprecated")
45+
set(SOURCE_FILES
46+
${CONSTRAINTGEOMETRY_SRC}/initConstraintGeometry.cpp
3447

35-
find_package(CollisionAlgorithm REQUIRED)
36-
find_package(Sofa.Component.StateContainer REQUIRED)
37-
find_package(Sofa.Component.Constraint.Lagrangian.Solver REQUIRED)
38-
find_package(Sofa.GL REQUIRED)
48+
${CONSTRAINTGEOMETRY_SRC}/constraint/ConstraintInsertion.cpp
49+
${CONSTRAINTGEOMETRY_SRC}/constraint/ConstraintBilateral.cpp
50+
${CONSTRAINTGEOMETRY_SRC}/constraint/ConstraintUnilateral.cpp
3951

40-
set_source_files_properties(${IGNORED_FILES} PROPERTIES HEADER_FILE_ONLY TRUE)
52+
${CONSTRAINTGEOMETRY_SRC}/directions/BindDirection.cpp
53+
${CONSTRAINTGEOMETRY_SRC}/directions/ContactDirection.cpp
54+
${CONSTRAINTGEOMETRY_SRC}/directions/FirstDirection.cpp
55+
${CONSTRAINTGEOMETRY_SRC}/directions/FixedFrameDirection.cpp
56+
${CONSTRAINTGEOMETRY_SRC}/directions/SecondDirection.cpp
57+
58+
${CONSTRAINTGEOMETRY_SRC}/normalHandler/EdgeNormalHandler.cpp
59+
${CONSTRAINTGEOMETRY_SRC}/normalHandler/GouraudTriangleNormalHandler.cpp
60+
${CONSTRAINTGEOMETRY_SRC}/normalHandler/GravityPointNormalHandler.cpp
61+
${CONSTRAINTGEOMETRY_SRC}/normalHandler/PhongTriangleNormalHandler.cpp
62+
${CONSTRAINTGEOMETRY_SRC}/normalHandler/VectorPointNormalHandler.cpp
63+
)
64+
65+
add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${HEADER_FILES} ${README_FILES})
4166

42-
add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${HEADER_FILES} ${SCENES_FILES} ${IGNORED_FILES} ${DEPRECATED_FILES} ${README_FILES} )
43-
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-DPLUGIN_DATA_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/\"")
4467
target_link_libraries(${PROJECT_NAME}
4568
CollisionAlgorithm
4669
Sofa.Component.StateContainer
4770
Sofa.Component.Constraint.Lagrangian.Solver
4871
Sofa.GL
4972
)
5073

51-
## Install rules for the library and headers; CMake package configurations files
52-
set(${PROJECT_NAME}_INCLUDE_DIRS "include/${PROJECT_NAME}")
53-
target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>")
54-
target_include_directories(${PROJECT_NAME} PUBLIC "$<INSTALL_INTERFACE:${${PROJECT_NAME}_INCLUDE_DIRS}>")
55-
sofa_create_package_with_targets(PACKAGE_NAME ${PROJECT_NAME} PACKAGE_VERSION 0.1 TARGETS ${PROJECT_NAME} INCLUDE_INSTALL_DIR ${${PROJECT_NAME}_INCLUDE_DIRS})
74+
sofa_create_package_with_targets(
75+
PACKAGE_NAME ${PROJECT_NAME}
76+
PACKAGE_VERSION ${PROJECT_VERSION}
77+
TARGETS ${PROJECT_NAME} AUTO_SET_TARGET_PROPERTIES
78+
INCLUDE_SOURCE_DIR "src"
79+
INCLUDE_INSTALL_DIR ${PROJECT_NAME}
80+
EXAMPLE_INSTALL_DIR "scenes"
81+
RELOCATABLE "plugins"
82+
)

‎ConstraintGeometryConfig.cmake.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
@PACKAGE_INIT@
55

66
find_package(CollisionAlgorithm QUIET REQUIRED)
7+
find_package(Sofa.Component.StateContainer QUIET REQUIRED)
8+
find_package(Sofa.Component.Constraint.Lagrangian.Solver QUIET REQUIRED)
9+
find_package(Sofa.GL QUIET REQUIRED)
710

811
if(NOT TARGET @PROJECT_NAME@)
912
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")

src/sofa/constraintGeometry/BaseConstraint.h renamed to src/ConstraintGeometry/BaseConstraint.h

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

3-
#include <sofa/collisionAlgorithm/BaseAlgorithm.h>
4-
#include <sofa/collisionAlgorithm/BaseGeometry.h>
3+
#include <CollisionAlgorithm/BaseAlgorithm.h>
4+
#include <CollisionAlgorithm/BaseGeometry.h>
55
#include <sofa/core/behavior/BaseLagrangianConstraint.h>
6-
#include <sofa/collisionAlgorithm/BaseProximity.h>
7-
#include <sofa/constraintGeometry/ConstraintNormal.h>
8-
#include <sofa/constraintGeometry/InternalConstraint.h>
9-
#include <sofa/constraintGeometry/ConstraintResponse.h>
10-
#include <sofa/constraintGeometry/ConstraintDirection.h>
6+
#include <CollisionAlgorithm/BaseProximity.h>
7+
#include <ConstraintGeometry/ConstraintNormal.h>
8+
#include <ConstraintGeometry/InternalConstraint.h>
9+
#include <ConstraintGeometry/ConstraintResponse.h>
10+
#include <ConstraintGeometry/ConstraintDirection.h>
1111

12-
namespace sofa::constraintGeometry {
12+
namespace sofa::constraintgeometry {
1313

1414

1515
class BaseConstraint : public sofa::core::behavior::BaseLagrangianConstraint{
@@ -35,16 +35,16 @@ class BaseConstraint : public sofa::core::behavior::BaseLagrangianConstraint{
3535
/*!
3636
* \brief The BaseConstraint abstract class is the implementation of sofa's abstract BaseLagrangianConstraint
3737
*/
38-
template<class FIRST = collisionAlgorithm::BaseProximity, class SECOND = collisionAlgorithm::BaseProximity>
38+
template<class FIRST = collisionalgorithm::BaseProximity, class SECOND = collisionalgorithm::BaseProximity>
3939
class TBaseConstraint : public BaseConstraint {
4040
public:
4141
SOFA_CLASS(BaseConstraint, sofa::core::behavior::BaseLagrangianConstraint);
4242

43-
typedef collisionAlgorithm::BaseProximity BaseProximity;
43+
typedef collisionalgorithm::BaseProximity BaseProximity;
4444

4545
Data<double> d_drawScale;
4646
Data<bool> d_draw;
47-
Data<collisionAlgorithm::DetectionOutput<FIRST,SECOND> > d_input; // THIS SHOULD BE REPLACED BY A PAIR OF CST PROXIMITY INPUT
47+
Data<collisionalgorithm::DetectionOutput<FIRST,SECOND> > d_input; // THIS SHOULD BE REPLACED BY A PAIR OF CST PROXIMITY INPUT
4848
Data<std::vector<BaseInternalConstraint::SPtr> > d_container;
4949

5050
TBaseConstraint()

src/sofa/constraintGeometry/BaseNormalHandler.h renamed to src/ConstraintGeometry/BaseNormalHandler.h

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

3-
#include <sofa/collisionAlgorithm/CollisionPipeline.h>
4-
#include <sofa/collisionAlgorithm/BaseProximity.h>
5-
#include <sofa/constraintGeometry/ConstraintProximity.h>
6-
#include <sofa/collisionAlgorithm/BaseGeometry.h>
7-
#include <sofa/constraintGeometry/operations/ConstraintProximityOperation.h>
8-
#include <sofa/collisionAlgorithm/operations/CreateCenterProximity.h>
3+
#include <CollisionAlgorithm/CollisionPipeline.h>
4+
#include <CollisionAlgorithm/BaseProximity.h>
5+
#include <ConstraintGeometry/ConstraintProximity.h>
6+
#include <CollisionAlgorithm/BaseGeometry.h>
7+
#include <ConstraintGeometry/operations/ConstraintProximityOperation.h>
8+
#include <CollisionAlgorithm/operations/CreateCenterProximity.h>
99

10-
namespace sofa ::constraintGeometry {
10+
namespace sofa ::constraintgeometry {
1111

1212
/*!
1313
* \brief The BaseConstraint abstract class is the implementation of sofa's abstract BaseConstraint
1414
*/
15-
class BaseNormalHandler : public collisionAlgorithm::CollisionComponent {
15+
class BaseNormalHandler : public collisionalgorithm::CollisionComponent {
1616
public:
17-
SOFA_ABSTRACT_CLASS(BaseNormalHandler, collisionAlgorithm::CollisionComponent);
17+
SOFA_ABSTRACT_CLASS(BaseNormalHandler, collisionalgorithm::CollisionComponent);
1818

19-
typedef collisionAlgorithm::BaseGeometry BaseGeometry;
20-
typedef collisionAlgorithm::BaseProximity BaseProximity;
19+
typedef collisionalgorithm::BaseGeometry BaseGeometry;
20+
typedef collisionalgorithm::BaseProximity BaseProximity;
2121

2222
void init() {
2323
if (getGeometry()==NULL) {
@@ -46,7 +46,7 @@ class BaseNormalHandler : public collisionAlgorithm::CollisionComponent {
4646
glDisable(GL_LIGHTING);
4747
if (color[3] == 0.0) return;
4848

49-
collisionAlgorithm::Operations::CreateCenterProximity::FUNC operation = collisionAlgorithm::Operations::CreateCenterProximity::Operation::get(getGeometry()->pointBegin());
49+
collisionalgorithm::Operations::CreateCenterProximity::FUNC operation = collisionalgorithm::Operations::CreateCenterProximity::Operation::get(getGeometry()->pointBegin());
5050

5151
for (auto it = getGeometry()->pointBegin();it != getGeometry()->end(); it++) {
5252
auto prox = operation(it->element());

src/sofa/constraintGeometry/ConstraintDirection.h renamed to src/ConstraintGeometry/ConstraintDirection.h

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

3-
#include <sofa/collisionAlgorithm/BaseAlgorithm.h>
4-
#include <sofa/collisionAlgorithm/BaseGeometry.h>
3+
#include <CollisionAlgorithm/BaseAlgorithm.h>
4+
#include <CollisionAlgorithm/BaseGeometry.h>
55
#include <sofa/core/behavior/BaseLagrangianConstraint.h>
6-
#include <sofa/constraintGeometry/ConstraintNormal.h>
7-
#include <sofa/constraintGeometry/InternalConstraint.h>
6+
#include <ConstraintGeometry/ConstraintNormal.h>
7+
#include <ConstraintGeometry/InternalConstraint.h>
88

9-
namespace sofa::constraintGeometry {
9+
namespace sofa::constraintgeometry {
1010

1111
/*!
1212
* \brief The BaseConstraint abstract class is the implementation of sofa's abstract BaseLagrangianConstraint
@@ -15,7 +15,7 @@ class ConstraintDirection : public sofa::core::objectmodel::BaseObject {
1515
public:
1616
SOFA_CLASS(ConstraintDirection, sofa::core::objectmodel::BaseObject);
1717

18-
typedef collisionAlgorithm::BaseProximity BaseProximity;
18+
typedef collisionalgorithm::BaseProximity BaseProximity;
1919

2020
virtual ConstraintNormal createConstraintsNormal(const BaseProximity::SPtr & first, const BaseProximity::SPtr & second) const = 0;
2121

src/sofa/constraintGeometry/ConstraintNormal.h renamed to src/ConstraintGeometry/ConstraintNormal.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
#include <sofa/type/vector.h>
44
#include <sofa/defaulttype/VecTypes.h>
5-
#include <sofa/collisionAlgorithm/BaseAlgorithm.h>
5+
#include <CollisionAlgorithm/BaseAlgorithm.h>
66

7-
namespace sofa::constraintGeometry {
7+
namespace sofa::constraintgeometry {
88

99
/*!
1010
* \brief The ConstraintNormal class
@@ -14,9 +14,9 @@ namespace sofa::constraintGeometry {
1414
class ConstraintNormal {
1515
public:
1616

17-
typedef collisionAlgorithm::BaseProximity BaseProximity;
18-
typedef collisionAlgorithm::BaseBaseProximity FIRST;
19-
typedef collisionAlgorithm::BaseBaseProximity SECOND;
17+
typedef collisionalgorithm::BaseProximity BaseProximity;
18+
typedef collisionalgorithm::BaseBaseProximity FIRST;
19+
typedef collisionalgorithm::BaseBaseProximity SECOND;
2020
typedef std::function<double(const typename FIRST::SPtr &, const typename SECOND::SPtr &, const type::Vec3 &)> ViolationFunction;
2121

2222
static double defaultViolationFunction(const typename FIRST::SPtr & first, const typename SECOND::SPtr & second, const type::Vec3 & normal) {

src/sofa/constraintGeometry/ConstraintProximity.h renamed to src/ConstraintGeometry/ConstraintProximity.h

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

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

6-
namespace sofa::constraintGeometry {
6+
namespace sofa::constraintgeometry {
77

8-
class ConstraintProximity : public virtual collisionAlgorithm::BaseBaseProximity {
8+
class ConstraintProximity : public virtual collisionalgorithm::BaseBaseProximity {
99
public:
1010

1111
typedef std::shared_ptr<ConstraintProximity> SPtr;
@@ -66,7 +66,7 @@ class TConstraintProximity : public ConstraintProximity {
6666
};
6767

6868
template<class PROXIMITY>
69-
class BaseProximityNormal : public PROXIMITY, public constraintGeometry::ConstraintProximity {
69+
class BaseProximityNormal : public PROXIMITY, public constraintgeometry::ConstraintProximity {
7070
public:
7171
typedef std::shared_ptr<BaseProximityNormal> SPtr;
7272

@@ -100,7 +100,7 @@ class DefaultConstraintProximity : public ConstraintProximity {
100100

101101
typedef std::shared_ptr<DefaultConstraintProximity> SPtr;
102102

103-
DefaultConstraintProximity(const collisionAlgorithm::BaseProximity::SPtr & p)
103+
DefaultConstraintProximity(const collisionalgorithm::BaseProximity::SPtr & p)
104104
: m_prox(p) {}
105105

106106
sofa::type::Vec3 getPosition(core::VecCoordId v = core::vec_id::write_access::position) const override {
@@ -123,12 +123,12 @@ class DefaultConstraintProximity : public ConstraintProximity {
123123
return type::Vec3();
124124
}
125125

126-
static ConstraintProximity::SPtr create(const collisionAlgorithm::BaseProximity::SPtr & p) {
126+
static ConstraintProximity::SPtr create(const collisionalgorithm::BaseProximity::SPtr & p) {
127127
return ConstraintProximity::SPtr(new DefaultConstraintProximity(p));
128128
}
129129

130130
protected:
131-
collisionAlgorithm::BaseProximity::SPtr m_prox;
131+
collisionalgorithm::BaseProximity::SPtr m_prox;
132132
};
133133

134134

src/sofa/constraintGeometry/ConstraintResponse.h renamed to src/ConstraintGeometry/ConstraintResponse.h

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

3-
#include <sofa/collisionAlgorithm/BaseAlgorithm.h>
4-
#include <sofa/collisionAlgorithm/BaseGeometry.h>
3+
#include <CollisionAlgorithm/BaseAlgorithm.h>
4+
#include <CollisionAlgorithm/BaseGeometry.h>
55
#include <sofa/core/behavior/BaseLagrangianConstraint.h>
6-
#include <sofa/constraintGeometry/ConstraintNormal.h>
7-
#include <sofa/constraintGeometry/InternalConstraint.h>
6+
#include <ConstraintGeometry/ConstraintNormal.h>
7+
#include <ConstraintGeometry/InternalConstraint.h>
88

99
namespace sofa {
1010

11-
namespace constraintGeometry {
11+
namespace constraintgeometry {
1212

1313
/*!
1414
* \brief The BaseConstraint abstract class is the implementation of sofa's abstract BaseLagrangianConstraint

0 commit comments

Comments
 (0)