From a15568e6d71f56c8831a00fcd504f94f146da090 Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Wed, 10 Sep 2025 11:00:54 +0200 Subject: [PATCH 01/15] [cmake] Syntax for easy-read in CMakeLists.txt --- CMakeLists.txt | 56 ++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e430f2b2..a4ae1f6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,45 +3,29 @@ project(CollisionAlgorithm VERSION 0.1 LANGUAGES CXX) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) -file(GLOB_RECURSE HEADER_FILES - "src/*.h" - "src/*.inl" -) - -file(GLOB_RECURSE SOURCE_FILES - "src/*.cpp" -) - -file(GLOB_RECURSE SCENES_FILES - "scenes/*.scn" - "*.xml" -) - -file(GLOB_RECURSE IGNORED_FILES - "ignored/*.h" - "ignored/*.inl" - "ignored/*.cpp" -) - -file(GLOB_RECURSE DEPRECATED_FILES - "deprecated/*.h" - "deprecated/*.inl" - "deprecated/*.cpp" -) +file(GLOB_RECURSE HEADER_FILES "src/*.h" "src/*.inl") +file(GLOB_RECURSE SOURCE_FILES "src/*.cpp") +file(GLOB_RECURSE SCENES_FILES "scenes/*.scn" "*.xml") +file(GLOB_RECURSE IGNORED_FILES "ignored/*.h" "ignored/*.inl" "ignored/*.cpp") +file(GLOB_RECURSE DEPRECATED_FILES "deprecated/*.h" "deprecated/*.inl" "deprecated/*.cpp") find_package(Sofa.Simulation.Core REQUIRED) find_package(Sofa.Component.StateContainer REQUIRED) find_package(Sofa.Component.Constraint.Lagrangian.Solver REQUIRED) find_package(Sofa.GL REQUIRED) - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/ignored") #include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deprecated") set_source_files_properties(${IGNORED_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) -add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${HEADER_FILES} ${SCENES_FILES} ${IGNORED_FILES} ${DEPRECATED_FILES} ${README_FILES}) -set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-DPLUGIN_DATA_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/\"") +add_library(${PROJECT_NAME} SHARED + ${SOURCE_FILES} ${HEADER_FILES} ${SCENES_FILES} + ${IGNORED_FILES} ${DEPRECATED_FILES} ${README_FILES}) + +set_target_properties(${PROJECT_NAME} PROPERTIES + COMPILE_FLAGS "-DPLUGIN_DATA_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/\"") + target_link_libraries(${PROJECT_NAME} Sofa.Simulation.Core Sofa.Component.StateContainer @@ -51,6 +35,16 @@ target_link_libraries(${PROJECT_NAME} ## Install rules for the library and headers; CMake package configurations files set(${PROJECT_NAME}_INCLUDE_DIRS "include/${PROJECT_NAME}") -target_include_directories(${PROJECT_NAME} PUBLIC "$") -target_include_directories(${PROJECT_NAME} PUBLIC "$") -sofa_create_package_with_targets(PACKAGE_NAME ${PROJECT_NAME} PACKAGE_VERSION 0.1 TARGETS ${PROJECT_NAME} INCLUDE_INSTALL_DIR ${${PROJECT_NAME}_INCLUDE_DIRS}) + +target_include_directories(${PROJECT_NAME} PUBLIC + "$") + +target_include_directories(${PROJECT_NAME} PUBLIC + "$") + +sofa_create_package_with_targets( + PACKAGE_NAME ${PROJECT_NAME} + PACKAGE_VERSION 0.1 + TARGETS ${PROJECT_NAME} + INCLUDE_INSTALL_DIR ${${PROJECT_NAME}_INCLUDE_DIRS} +) From 7509b75126da1c5f335505cb62c6f51bafe21f2f Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Wed, 10 Sep 2025 11:55:35 +0200 Subject: [PATCH 02/15] [cmake] Comment out ignored and deprecated headers/sources --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4ae1f6f..8c5973f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ find_package(Sofa.Component.StateContainer REQUIRED) find_package(Sofa.Component.Constraint.Lagrangian.Solver REQUIRED) find_package(Sofa.GL REQUIRED) -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/ignored") +#include_directories("${CMAKE_CURRENT_SOURCE_DIR}/ignored") #include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deprecated") set_source_files_properties(${IGNORED_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) From 942cfb0ca89b17d299e45fa5a32287ab6829ab63 Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Wed, 10 Sep 2025 11:03:29 +0200 Subject: [PATCH 03/15] [cmake] Sync dependencies between CMakeLists and Config.cmake.in files --- CollisionAlgorithmConfig.cmake.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CollisionAlgorithmConfig.cmake.in b/CollisionAlgorithmConfig.cmake.in index 68a93934..0e15df71 100644 --- a/CollisionAlgorithmConfig.cmake.in +++ b/CollisionAlgorithmConfig.cmake.in @@ -4,6 +4,8 @@ @PACKAGE_INIT@ find_package(Sofa.Simulation.Core QUIET REQUIRED) +find_package(Sofa.Component.StateContainer QUIET REQUIRED) +find_package(Sofa.Component.Constraint.Lagrangian.Solver QUIET REQUIRED) find_package(Sofa.GL QUIET REQUIRED) if(NOT TARGET @PROJECT_NAME@) From cef93a77e797834ad17e40e961cb531ae75f7d8a Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Wed, 10 Sep 2025 11:17:38 +0200 Subject: [PATCH 04/15] [cmake] Group target include directories commands --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c5973f3..917c6b51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,10 +37,9 @@ target_link_libraries(${PROJECT_NAME} set(${PROJECT_NAME}_INCLUDE_DIRS "include/${PROJECT_NAME}") target_include_directories(${PROJECT_NAME} PUBLIC - "$") - -target_include_directories(${PROJECT_NAME} PUBLIC - "$") + "$" + "$" +) sofa_create_package_with_targets( PACKAGE_NAME ${PROJECT_NAME} From 9225bd413fd0941abf19b84a11fa405ed9533920 Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Wed, 10 Sep 2025 11:19:40 +0200 Subject: [PATCH 05/15] [cmake] Set project version in CMake using an env var --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 917c6b51..fc65549c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC sofa_create_package_with_targets( PACKAGE_NAME ${PROJECT_NAME} - PACKAGE_VERSION 0.1 + PACKAGE_VERSION ${PROJECT_VERSION} TARGETS ${PROJECT_NAME} INCLUDE_INSTALL_DIR ${${PROJECT_NAME}_INCLUDE_DIRS} ) From dd542956d18c0e505edc68f449d930f0a46b827e Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Wed, 10 Sep 2025 11:23:48 +0200 Subject: [PATCH 06/15] [cmake] Correct installation folders for headers and source files in sofa.create.target --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc65549c..bd666dac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,5 +45,7 @@ sofa_create_package_with_targets( PACKAGE_NAME ${PROJECT_NAME} PACKAGE_VERSION ${PROJECT_VERSION} TARGETS ${PROJECT_NAME} - INCLUDE_INSTALL_DIR ${${PROJECT_NAME}_INCLUDE_DIRS} + INCLUDE_SOURCE_DIR "src" + INCLUDE_INSTALL_DIR ${PROJECT_NAME} + EXAMPLE_INSTALL_DIR "scenes" ) From 033e7e5aae88df60171a628e75bbfc3968c4267d Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Wed, 10 Sep 2025 11:31:58 +0200 Subject: [PATCH 07/15] [cmake] Remove scene, ingored and deprecated files from the library --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd666dac..b585b998 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,9 +19,7 @@ find_package(Sofa.GL REQUIRED) set_source_files_properties(${IGNORED_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) -add_library(${PROJECT_NAME} SHARED - ${SOURCE_FILES} ${HEADER_FILES} ${SCENES_FILES} - ${IGNORED_FILES} ${DEPRECATED_FILES} ${README_FILES}) +add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${HEADER_FILES} ${README_FILES}) set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-DPLUGIN_DATA_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/\"") From 54dd8a64c6b3ff6be914d689040af619c16a3c12 Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Wed, 10 Sep 2025 11:39:13 +0200 Subject: [PATCH 08/15] [cmake] Set AUTO_SET_TARGET_PROPERTIES in CMakeLists --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b585b998..e413198b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ target_link_libraries(${PROJECT_NAME} ) ## Install rules for the library and headers; CMake package configurations files -set(${PROJECT_NAME}_INCLUDE_DIRS "include/${PROJECT_NAME}") +#set(${PROJECT_NAME}_INCLUDE_DIRS "include/${PROJECT_NAME}") target_include_directories(${PROJECT_NAME} PUBLIC "$" @@ -42,7 +42,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC sofa_create_package_with_targets( PACKAGE_NAME ${PROJECT_NAME} PACKAGE_VERSION ${PROJECT_VERSION} - TARGETS ${PROJECT_NAME} + TARGETS ${PROJECT_NAME} AUTO_SET_TARGET_PROPERTIES INCLUDE_SOURCE_DIR "src" INCLUDE_INSTALL_DIR ${PROJECT_NAME} EXAMPLE_INSTALL_DIR "scenes" From 40c2debe20aeab579661e2ca71354499a94b4a02 Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Wed, 10 Sep 2025 11:42:13 +0200 Subject: [PATCH 09/15] [src] Moved .h/.cpp files to src/CollisionAlgorithm - mimic other SOFA plugins for build consistency --- .../BaseAABBBroadPhase.h | 8 ++++---- .../BaseAlgorithm.h | 6 +++--- .../BaseElement.h | 2 +- .../BaseGeometry.h | 18 +++++++++--------- .../BaseOperation.h | 2 +- .../BaseProximity.h | 0 .../CollisionPipeline.cpp | 2 +- .../CollisionPipeline.h | 8 ++++---- .../DataDetectionOutput.h | 2 +- .../ElementIterator.h | 4 ++-- .../InternalData.h | 16 ++++++++-------- .../Find2DClosestProximityAlgorithm.cpp | 2 +- .../Find2DClosestProximityAlgorithm.h | 12 ++++++------ .../FindClosestProximityAlgorithm.cpp | 2 +- .../algorithm/FindClosestProximityAlgorithm.h | 12 ++++++------ .../algorithm/InsertionAlgorithm.cpp | 2 +- .../algorithm/InsertionAlgorithm.h | 16 ++++++++-------- .../broadphase/AABBBroadPhase.cpp | 2 +- .../broadphase/AABBBroadPhase.h | 6 +++--- .../broadphase/FullAABBBroadPhase.cpp | 2 +- .../broadphase/FullAABBBroadPhase.h | 6 +++--- .../elements/EdgeElement.cpp | 10 +++++----- .../elements/EdgeElement.h | 4 ++-- .../elements/PointElement.cpp | 13 +++++++++++++ .../elements/PointElement.h | 2 +- .../elements/TetrahedronElement.cpp | 10 +++++----- .../elements/TetrahedronElement.h | 4 ++-- .../elements/TriangleElement.cpp | 10 +++++----- .../elements/TriangleElement.h | 4 ++-- .../filters/DistanceFilter.cpp | 2 +- .../filters/DistanceFilter.h | 2 +- .../geometry/EdgeGeometry.cpp | 2 +- .../geometry/EdgeGeometry.h | 6 +++--- .../geometry/PointGeometry.cpp | 2 +- .../geometry/PointGeometry.h | 10 +++++----- .../geometry/SubsetGeometry.cpp | 2 +- .../geometry/SubsetGeometry.h | 6 +++--- .../geometry/TetrahedronGeometry.cpp | 2 +- .../geometry/TetrahedronGeometry.h | 6 +++--- .../geometry/TriangleGeometry.cpp | 2 +- .../geometry/TriangleGeometry.h | 8 ++++---- .../initPlugin.cpp | 0 .../operations/CreateCenterProximity.cpp | 10 +++++----- .../operations/CreateCenterProximity.h | 8 ++++---- .../operations/FindClosestProximity.cpp | 10 ++++++++++ .../operations/FindClosestProximity.h | 6 +++--- .../operations/Project.cpp | 10 +++++----- .../operations/Project.h | 6 +++--- .../proximity/EdgeProximity.h | 4 ++-- .../proximity/FixedProximity.h | 2 +- .../proximity/MechanicalProximity.h | 4 ++-- .../proximity/MultiProximity.h | 2 +- .../proximity/PointProximity.h | 2 +- .../proximity/TetrahedronProximity.h | 6 +++--- .../proximity/TriangleProximity.h | 6 +++--- .../toolbox/EdgeToolBox.cpp | 4 ++-- .../toolbox/EdgeToolBox.h | 8 ++++---- .../toolbox/PointToolBox.cpp | 4 ++-- .../toolbox/PointToolBox.h | 8 ++++---- .../toolbox/TetrahedronToolBox.cpp | 10 +++++----- .../toolbox/TetrahedronToolBox.h | 8 ++++---- .../toolbox/TriangleToolBox.cpp | 6 +++--- .../toolbox/TriangleToolBox.h | 8 ++++---- .../elements/PointElement.cpp | 13 ------------- .../operations/FindClosestProximity.cpp | 10 ---------- 65 files changed, 196 insertions(+), 196 deletions(-) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/BaseAABBBroadPhase.h (99%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/BaseAlgorithm.h (94%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/BaseElement.h (97%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/BaseGeometry.h (94%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/BaseOperation.h (99%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/BaseProximity.h (100%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/CollisionPipeline.cpp (87%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/CollisionPipeline.h (94%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/DataDetectionOutput.h (98%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/ElementIterator.h (96%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/InternalData.h (80%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/algorithm/Find2DClosestProximityAlgorithm.cpp (84%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/algorithm/Find2DClosestProximityAlgorithm.h (93%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/algorithm/FindClosestProximityAlgorithm.cpp (84%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/algorithm/FindClosestProximityAlgorithm.h (89%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/algorithm/InsertionAlgorithm.cpp (86%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/algorithm/InsertionAlgorithm.h (96%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/broadphase/AABBBroadPhase.cpp (92%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/broadphase/AABBBroadPhase.h (97%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/broadphase/FullAABBBroadPhase.cpp (80%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/broadphase/FullAABBBroadPhase.h (89%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/elements/EdgeElement.cpp (65%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/elements/EdgeElement.h (93%) create mode 100644 src/CollisionAlgorithm/elements/PointElement.cpp rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/elements/PointElement.h (97%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/elements/TetrahedronElement.cpp (88%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/elements/TetrahedronElement.h (97%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/elements/TriangleElement.cpp (80%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/elements/TriangleElement.h (97%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/filters/DistanceFilter.cpp (86%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/filters/DistanceFilter.h (92%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/geometry/EdgeGeometry.cpp (87%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/geometry/EdgeGeometry.h (88%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/geometry/PointGeometry.cpp (87%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/geometry/PointGeometry.h (78%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/geometry/SubsetGeometry.cpp (84%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/geometry/SubsetGeometry.h (91%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/geometry/TetrahedronGeometry.cpp (88%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/geometry/TetrahedronGeometry.h (90%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/geometry/TriangleGeometry.cpp (88%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/geometry/TriangleGeometry.h (86%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/initPlugin.cpp (100%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/operations/CreateCenterProximity.cpp (65%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/operations/CreateCenterProximity.h (78%) create mode 100644 src/CollisionAlgorithm/operations/FindClosestProximity.cpp rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/operations/FindClosestProximity.h (98%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/operations/Project.cpp (62%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/operations/Project.h (85%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/proximity/EdgeProximity.h (96%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/proximity/FixedProximity.h (96%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/proximity/MechanicalProximity.h (97%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/proximity/MultiProximity.h (97%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/proximity/PointProximity.h (96%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/proximity/TetrahedronProximity.h (95%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/proximity/TriangleProximity.h (95%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/toolbox/EdgeToolBox.cpp (92%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/toolbox/EdgeToolBox.h (70%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/toolbox/PointToolBox.cpp (79%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/toolbox/PointToolBox.h (57%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/toolbox/TetrahedronToolBox.cpp (91%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/toolbox/TetrahedronToolBox.h (80%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/toolbox/TriangleToolBox.cpp (94%) rename src/{sofa/collisionAlgorithm => CollisionAlgorithm}/toolbox/TriangleToolBox.h (79%) delete mode 100644 src/sofa/collisionAlgorithm/elements/PointElement.cpp delete mode 100644 src/sofa/collisionAlgorithm/operations/FindClosestProximity.cpp diff --git a/src/sofa/collisionAlgorithm/BaseAABBBroadPhase.h b/src/CollisionAlgorithm/BaseAABBBroadPhase.h similarity index 99% rename from src/sofa/collisionAlgorithm/BaseAABBBroadPhase.h rename to src/CollisionAlgorithm/BaseAABBBroadPhase.h index cee5c088..9633d63c 100644 --- a/src/sofa/collisionAlgorithm/BaseAABBBroadPhase.h +++ b/src/CollisionAlgorithm/BaseAABBBroadPhase.h @@ -1,10 +1,10 @@ #pragma once #include -#include -#include -#include -#include +#include +#include +#include +#include #include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/BaseAlgorithm.h b/src/CollisionAlgorithm/BaseAlgorithm.h similarity index 94% rename from src/sofa/collisionAlgorithm/BaseAlgorithm.h rename to src/CollisionAlgorithm/BaseAlgorithm.h index 7cb256c3..d6199723 100644 --- a/src/sofa/collisionAlgorithm/BaseAlgorithm.h +++ b/src/CollisionAlgorithm/BaseAlgorithm.h @@ -1,9 +1,9 @@ #pragma once -#include +#include #include -#include -#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/BaseElement.h b/src/CollisionAlgorithm/BaseElement.h similarity index 97% rename from src/sofa/collisionAlgorithm/BaseElement.h rename to src/CollisionAlgorithm/BaseElement.h index 065a1b9d..f86d164e 100644 --- a/src/sofa/collisionAlgorithm/BaseElement.h +++ b/src/CollisionAlgorithm/BaseElement.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/BaseGeometry.h b/src/CollisionAlgorithm/BaseGeometry.h similarity index 94% rename from src/sofa/collisionAlgorithm/BaseGeometry.h rename to src/CollisionAlgorithm/BaseGeometry.h index 842042ab..9f275dc0 100644 --- a/src/sofa/collisionAlgorithm/BaseGeometry.h +++ b/src/CollisionAlgorithm/BaseGeometry.h @@ -1,16 +1,16 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace sofa ::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/BaseOperation.h b/src/CollisionAlgorithm/BaseOperation.h similarity index 99% rename from src/sofa/collisionAlgorithm/BaseOperation.h rename to src/CollisionAlgorithm/BaseOperation.h index e4d83401..41c8cce0 100644 --- a/src/sofa/collisionAlgorithm/BaseOperation.h +++ b/src/CollisionAlgorithm/BaseOperation.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/src/sofa/collisionAlgorithm/BaseProximity.h b/src/CollisionAlgorithm/BaseProximity.h similarity index 100% rename from src/sofa/collisionAlgorithm/BaseProximity.h rename to src/CollisionAlgorithm/BaseProximity.h diff --git a/src/sofa/collisionAlgorithm/CollisionPipeline.cpp b/src/CollisionAlgorithm/CollisionPipeline.cpp similarity index 87% rename from src/sofa/collisionAlgorithm/CollisionPipeline.cpp rename to src/CollisionAlgorithm/CollisionPipeline.cpp index a7f0603d..d4dba2a1 100644 --- a/src/sofa/collisionAlgorithm/CollisionPipeline.cpp +++ b/src/CollisionAlgorithm/CollisionPipeline.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace sofa::collisionAlgorithm diff --git a/src/sofa/collisionAlgorithm/CollisionPipeline.h b/src/CollisionAlgorithm/CollisionPipeline.h similarity index 94% rename from src/sofa/collisionAlgorithm/CollisionPipeline.h rename to src/CollisionAlgorithm/CollisionPipeline.h index 8ccf04a7..1bd8b2d4 100644 --- a/src/sofa/collisionAlgorithm/CollisionPipeline.h +++ b/src/CollisionAlgorithm/CollisionPipeline.h @@ -1,9 +1,9 @@ #pragma once -//#include +//#include #include -#include -#include +#include +#include #include #include #include @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/sofa/collisionAlgorithm/DataDetectionOutput.h b/src/CollisionAlgorithm/DataDetectionOutput.h similarity index 98% rename from src/sofa/collisionAlgorithm/DataDetectionOutput.h rename to src/CollisionAlgorithm/DataDetectionOutput.h index 57080b6d..8e9082ed 100644 --- a/src/sofa/collisionAlgorithm/DataDetectionOutput.h +++ b/src/CollisionAlgorithm/DataDetectionOutput.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace sofa { diff --git a/src/sofa/collisionAlgorithm/ElementIterator.h b/src/CollisionAlgorithm/ElementIterator.h similarity index 96% rename from src/sofa/collisionAlgorithm/ElementIterator.h rename to src/CollisionAlgorithm/ElementIterator.h index effdb70d..69e55572 100644 --- a/src/sofa/collisionAlgorithm/ElementIterator.h +++ b/src/CollisionAlgorithm/ElementIterator.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/InternalData.h b/src/CollisionAlgorithm/InternalData.h similarity index 80% rename from src/sofa/collisionAlgorithm/InternalData.h rename to src/CollisionAlgorithm/InternalData.h index f493fa7c..25a45246 100644 --- a/src/sofa/collisionAlgorithm/InternalData.h +++ b/src/CollisionAlgorithm/InternalData.h @@ -1,15 +1,15 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace sofa ::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.cpp b/src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.cpp similarity index 84% rename from src/sofa/collisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.cpp rename to src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.cpp index 7d56c241..657fe0ab 100644 --- a/src/sofa/collisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.cpp +++ b/src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace sofa::collisionAlgorithm diff --git a/src/sofa/collisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.h b/src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.h similarity index 93% rename from src/sofa/collisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.h rename to src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.h index faf3b791..67244e2e 100644 --- a/src/sofa/collisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.h +++ b/src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/algorithm/FindClosestProximityAlgorithm.cpp b/src/CollisionAlgorithm/algorithm/FindClosestProximityAlgorithm.cpp similarity index 84% rename from src/sofa/collisionAlgorithm/algorithm/FindClosestProximityAlgorithm.cpp rename to src/CollisionAlgorithm/algorithm/FindClosestProximityAlgorithm.cpp index 397d6aee..242f9687 100644 --- a/src/sofa/collisionAlgorithm/algorithm/FindClosestProximityAlgorithm.cpp +++ b/src/CollisionAlgorithm/algorithm/FindClosestProximityAlgorithm.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace sofa::collisionAlgorithm diff --git a/src/sofa/collisionAlgorithm/algorithm/FindClosestProximityAlgorithm.h b/src/CollisionAlgorithm/algorithm/FindClosestProximityAlgorithm.h similarity index 89% rename from src/sofa/collisionAlgorithm/algorithm/FindClosestProximityAlgorithm.h rename to src/CollisionAlgorithm/algorithm/FindClosestProximityAlgorithm.h index 2a3888f7..426943ff 100644 --- a/src/sofa/collisionAlgorithm/algorithm/FindClosestProximityAlgorithm.h +++ b/src/CollisionAlgorithm/algorithm/FindClosestProximityAlgorithm.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/algorithm/InsertionAlgorithm.cpp b/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.cpp similarity index 86% rename from src/sofa/collisionAlgorithm/algorithm/InsertionAlgorithm.cpp rename to src/CollisionAlgorithm/algorithm/InsertionAlgorithm.cpp index 6bce8091..4d4c5de2 100644 --- a/src/sofa/collisionAlgorithm/algorithm/InsertionAlgorithm.cpp +++ b/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace sofa::collisionAlgorithm diff --git a/src/sofa/collisionAlgorithm/algorithm/InsertionAlgorithm.h b/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.h similarity index 96% rename from src/sofa/collisionAlgorithm/algorithm/InsertionAlgorithm.h rename to src/CollisionAlgorithm/algorithm/InsertionAlgorithm.h index 2ab650fb..de8d0d60 100644 --- a/src/sofa/collisionAlgorithm/algorithm/InsertionAlgorithm.h +++ b/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/sofa/collisionAlgorithm/broadphase/AABBBroadPhase.cpp b/src/CollisionAlgorithm/broadphase/AABBBroadPhase.cpp similarity index 92% rename from src/sofa/collisionAlgorithm/broadphase/AABBBroadPhase.cpp rename to src/CollisionAlgorithm/broadphase/AABBBroadPhase.cpp index 5eb097bf..b9f26b7b 100644 --- a/src/sofa/collisionAlgorithm/broadphase/AABBBroadPhase.cpp +++ b/src/CollisionAlgorithm/broadphase/AABBBroadPhase.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace sofa::collisionAlgorithm diff --git a/src/sofa/collisionAlgorithm/broadphase/AABBBroadPhase.h b/src/CollisionAlgorithm/broadphase/AABBBroadPhase.h similarity index 97% rename from src/sofa/collisionAlgorithm/broadphase/AABBBroadPhase.h rename to src/CollisionAlgorithm/broadphase/AABBBroadPhase.h index 92943aad..a174a560 100644 --- a/src/sofa/collisionAlgorithm/broadphase/AABBBroadPhase.h +++ b/src/CollisionAlgorithm/broadphase/AABBBroadPhase.h @@ -1,9 +1,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/broadphase/FullAABBBroadPhase.cpp b/src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.cpp similarity index 80% rename from src/sofa/collisionAlgorithm/broadphase/FullAABBBroadPhase.cpp rename to src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.cpp index e19aef85..fe4e4bfa 100644 --- a/src/sofa/collisionAlgorithm/broadphase/FullAABBBroadPhase.cpp +++ b/src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace sofa::collisionAlgorithm diff --git a/src/sofa/collisionAlgorithm/broadphase/FullAABBBroadPhase.h b/src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.h similarity index 89% rename from src/sofa/collisionAlgorithm/broadphase/FullAABBBroadPhase.h rename to src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.h index 87e5ddab..8e290e45 100644 --- a/src/sofa/collisionAlgorithm/broadphase/FullAABBBroadPhase.h +++ b/src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.h @@ -1,9 +1,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/elements/EdgeElement.cpp b/src/CollisionAlgorithm/elements/EdgeElement.cpp similarity index 65% rename from src/sofa/collisionAlgorithm/elements/EdgeElement.cpp rename to src/CollisionAlgorithm/elements/EdgeElement.cpp index 0b093004..d58e44aa 100644 --- a/src/sofa/collisionAlgorithm/elements/EdgeElement.cpp +++ b/src/CollisionAlgorithm/elements/EdgeElement.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/elements/EdgeElement.h b/src/CollisionAlgorithm/elements/EdgeElement.h similarity index 93% rename from src/sofa/collisionAlgorithm/elements/EdgeElement.h rename to src/CollisionAlgorithm/elements/EdgeElement.h index 682074c4..f1e92acb 100644 --- a/src/sofa/collisionAlgorithm/elements/EdgeElement.h +++ b/src/CollisionAlgorithm/elements/EdgeElement.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/CollisionAlgorithm/elements/PointElement.cpp b/src/CollisionAlgorithm/elements/PointElement.cpp new file mode 100644 index 00000000..bf472401 --- /dev/null +++ b/src/CollisionAlgorithm/elements/PointElement.cpp @@ -0,0 +1,13 @@ +#include +#include +#include +#include +#include + +namespace sofa::collisionAlgorithm { + +PointElement::SPtr PointElement::create(const BaseProximity::SPtr &prox) { + return PointElement::SPtr(new PointElement(prox)); +} + +} diff --git a/src/sofa/collisionAlgorithm/elements/PointElement.h b/src/CollisionAlgorithm/elements/PointElement.h similarity index 97% rename from src/sofa/collisionAlgorithm/elements/PointElement.h rename to src/CollisionAlgorithm/elements/PointElement.h index b90d8776..55a48455 100644 --- a/src/sofa/collisionAlgorithm/elements/PointElement.h +++ b/src/CollisionAlgorithm/elements/PointElement.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/elements/TetrahedronElement.cpp b/src/CollisionAlgorithm/elements/TetrahedronElement.cpp similarity index 88% rename from src/sofa/collisionAlgorithm/elements/TetrahedronElement.cpp rename to src/CollisionAlgorithm/elements/TetrahedronElement.cpp index d3eddf4c..b7aa0f82 100644 --- a/src/sofa/collisionAlgorithm/elements/TetrahedronElement.cpp +++ b/src/CollisionAlgorithm/elements/TetrahedronElement.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/elements/TetrahedronElement.h b/src/CollisionAlgorithm/elements/TetrahedronElement.h similarity index 97% rename from src/sofa/collisionAlgorithm/elements/TetrahedronElement.h rename to src/CollisionAlgorithm/elements/TetrahedronElement.h index ccc6697f..608aea78 100644 --- a/src/sofa/collisionAlgorithm/elements/TetrahedronElement.h +++ b/src/CollisionAlgorithm/elements/TetrahedronElement.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/elements/TriangleElement.cpp b/src/CollisionAlgorithm/elements/TriangleElement.cpp similarity index 80% rename from src/sofa/collisionAlgorithm/elements/TriangleElement.cpp rename to src/CollisionAlgorithm/elements/TriangleElement.cpp index dcc3a44f..287cfbc4 100644 --- a/src/sofa/collisionAlgorithm/elements/TriangleElement.cpp +++ b/src/CollisionAlgorithm/elements/TriangleElement.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/elements/TriangleElement.h b/src/CollisionAlgorithm/elements/TriangleElement.h similarity index 97% rename from src/sofa/collisionAlgorithm/elements/TriangleElement.h rename to src/CollisionAlgorithm/elements/TriangleElement.h index 5271f5df..48441a53 100644 --- a/src/sofa/collisionAlgorithm/elements/TriangleElement.h +++ b/src/CollisionAlgorithm/elements/TriangleElement.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/filters/DistanceFilter.cpp b/src/CollisionAlgorithm/filters/DistanceFilter.cpp similarity index 86% rename from src/sofa/collisionAlgorithm/filters/DistanceFilter.cpp rename to src/CollisionAlgorithm/filters/DistanceFilter.cpp index 57043729..0a6f1983 100644 --- a/src/sofa/collisionAlgorithm/filters/DistanceFilter.cpp +++ b/src/CollisionAlgorithm/filters/DistanceFilter.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace sofa::collisionAlgorithm diff --git a/src/sofa/collisionAlgorithm/filters/DistanceFilter.h b/src/CollisionAlgorithm/filters/DistanceFilter.h similarity index 92% rename from src/sofa/collisionAlgorithm/filters/DistanceFilter.h rename to src/CollisionAlgorithm/filters/DistanceFilter.h index 2432e6af..f6f2cbd5 100644 --- a/src/sofa/collisionAlgorithm/filters/DistanceFilter.h +++ b/src/CollisionAlgorithm/filters/DistanceFilter.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/geometry/EdgeGeometry.cpp b/src/CollisionAlgorithm/geometry/EdgeGeometry.cpp similarity index 87% rename from src/sofa/collisionAlgorithm/geometry/EdgeGeometry.cpp rename to src/CollisionAlgorithm/geometry/EdgeGeometry.cpp index a4ec0755..ede1d1ad 100644 --- a/src/sofa/collisionAlgorithm/geometry/EdgeGeometry.cpp +++ b/src/CollisionAlgorithm/geometry/EdgeGeometry.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace sofa::collisionAlgorithm diff --git a/src/sofa/collisionAlgorithm/geometry/EdgeGeometry.h b/src/CollisionAlgorithm/geometry/EdgeGeometry.h similarity index 88% rename from src/sofa/collisionAlgorithm/geometry/EdgeGeometry.h rename to src/CollisionAlgorithm/geometry/EdgeGeometry.h index e66d0c1b..84bf290b 100644 --- a/src/sofa/collisionAlgorithm/geometry/EdgeGeometry.h +++ b/src/CollisionAlgorithm/geometry/EdgeGeometry.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/geometry/PointGeometry.cpp b/src/CollisionAlgorithm/geometry/PointGeometry.cpp similarity index 87% rename from src/sofa/collisionAlgorithm/geometry/PointGeometry.cpp rename to src/CollisionAlgorithm/geometry/PointGeometry.cpp index 24b54f66..9c0fa7cf 100644 --- a/src/sofa/collisionAlgorithm/geometry/PointGeometry.cpp +++ b/src/CollisionAlgorithm/geometry/PointGeometry.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace sofa::collisionAlgorithm diff --git a/src/sofa/collisionAlgorithm/geometry/PointGeometry.h b/src/CollisionAlgorithm/geometry/PointGeometry.h similarity index 78% rename from src/sofa/collisionAlgorithm/geometry/PointGeometry.h rename to src/CollisionAlgorithm/geometry/PointGeometry.h index db94e7bb..3710cf71 100644 --- a/src/sofa/collisionAlgorithm/geometry/PointGeometry.h +++ b/src/CollisionAlgorithm/geometry/PointGeometry.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace sofa { diff --git a/src/sofa/collisionAlgorithm/geometry/SubsetGeometry.cpp b/src/CollisionAlgorithm/geometry/SubsetGeometry.cpp similarity index 84% rename from src/sofa/collisionAlgorithm/geometry/SubsetGeometry.cpp rename to src/CollisionAlgorithm/geometry/SubsetGeometry.cpp index 90143a4f..9e643228 100644 --- a/src/sofa/collisionAlgorithm/geometry/SubsetGeometry.cpp +++ b/src/CollisionAlgorithm/geometry/SubsetGeometry.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace sofa::collisionAlgorithm diff --git a/src/sofa/collisionAlgorithm/geometry/SubsetGeometry.h b/src/CollisionAlgorithm/geometry/SubsetGeometry.h similarity index 91% rename from src/sofa/collisionAlgorithm/geometry/SubsetGeometry.h rename to src/CollisionAlgorithm/geometry/SubsetGeometry.h index 26b56bbe..dc7e2786 100644 --- a/src/sofa/collisionAlgorithm/geometry/SubsetGeometry.h +++ b/src/CollisionAlgorithm/geometry/SubsetGeometry.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/geometry/TetrahedronGeometry.cpp b/src/CollisionAlgorithm/geometry/TetrahedronGeometry.cpp similarity index 88% rename from src/sofa/collisionAlgorithm/geometry/TetrahedronGeometry.cpp rename to src/CollisionAlgorithm/geometry/TetrahedronGeometry.cpp index aac4b8d5..65e62891 100644 --- a/src/sofa/collisionAlgorithm/geometry/TetrahedronGeometry.cpp +++ b/src/CollisionAlgorithm/geometry/TetrahedronGeometry.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace sofa::collisionAlgorithm diff --git a/src/sofa/collisionAlgorithm/geometry/TetrahedronGeometry.h b/src/CollisionAlgorithm/geometry/TetrahedronGeometry.h similarity index 90% rename from src/sofa/collisionAlgorithm/geometry/TetrahedronGeometry.h rename to src/CollisionAlgorithm/geometry/TetrahedronGeometry.h index 4be0fae6..31288f88 100644 --- a/src/sofa/collisionAlgorithm/geometry/TetrahedronGeometry.h +++ b/src/CollisionAlgorithm/geometry/TetrahedronGeometry.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/geometry/TriangleGeometry.cpp b/src/CollisionAlgorithm/geometry/TriangleGeometry.cpp similarity index 88% rename from src/sofa/collisionAlgorithm/geometry/TriangleGeometry.cpp rename to src/CollisionAlgorithm/geometry/TriangleGeometry.cpp index 7790b145..79ba2f95 100644 --- a/src/sofa/collisionAlgorithm/geometry/TriangleGeometry.cpp +++ b/src/CollisionAlgorithm/geometry/TriangleGeometry.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace sofa::collisionAlgorithm diff --git a/src/sofa/collisionAlgorithm/geometry/TriangleGeometry.h b/src/CollisionAlgorithm/geometry/TriangleGeometry.h similarity index 86% rename from src/sofa/collisionAlgorithm/geometry/TriangleGeometry.h rename to src/CollisionAlgorithm/geometry/TriangleGeometry.h index 6bab6515..d7665c77 100644 --- a/src/sofa/collisionAlgorithm/geometry/TriangleGeometry.h +++ b/src/CollisionAlgorithm/geometry/TriangleGeometry.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/initPlugin.cpp b/src/CollisionAlgorithm/initPlugin.cpp similarity index 100% rename from src/sofa/collisionAlgorithm/initPlugin.cpp rename to src/CollisionAlgorithm/initPlugin.cpp diff --git a/src/sofa/collisionAlgorithm/operations/CreateCenterProximity.cpp b/src/CollisionAlgorithm/operations/CreateCenterProximity.cpp similarity index 65% rename from src/sofa/collisionAlgorithm/operations/CreateCenterProximity.cpp rename to src/CollisionAlgorithm/operations/CreateCenterProximity.cpp index 4456712d..9970f2d4 100644 --- a/src/sofa/collisionAlgorithm/operations/CreateCenterProximity.cpp +++ b/src/CollisionAlgorithm/operations/CreateCenterProximity.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace sofa::collisionAlgorithm::Operations::CreateCenterProximity { diff --git a/src/sofa/collisionAlgorithm/operations/CreateCenterProximity.h b/src/CollisionAlgorithm/operations/CreateCenterProximity.h similarity index 78% rename from src/sofa/collisionAlgorithm/operations/CreateCenterProximity.h rename to src/CollisionAlgorithm/operations/CreateCenterProximity.h index e567b76a..03f1d8b0 100644 --- a/src/sofa/collisionAlgorithm/operations/CreateCenterProximity.h +++ b/src/CollisionAlgorithm/operations/CreateCenterProximity.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace sofa::collisionAlgorithm::Operations::CreateCenterProximity { diff --git a/src/CollisionAlgorithm/operations/FindClosestProximity.cpp b/src/CollisionAlgorithm/operations/FindClosestProximity.cpp new file mode 100644 index 00000000..aaeb05c3 --- /dev/null +++ b/src/CollisionAlgorithm/operations/FindClosestProximity.cpp @@ -0,0 +1,10 @@ +#include +#include +#include +#include +#include + +namespace sofa::collisionAlgorithm::Operations { + +} + diff --git a/src/sofa/collisionAlgorithm/operations/FindClosestProximity.h b/src/CollisionAlgorithm/operations/FindClosestProximity.h similarity index 98% rename from src/sofa/collisionAlgorithm/operations/FindClosestProximity.h rename to src/CollisionAlgorithm/operations/FindClosestProximity.h index 4e76c272..ca80defb 100644 --- a/src/sofa/collisionAlgorithm/operations/FindClosestProximity.h +++ b/src/CollisionAlgorithm/operations/FindClosestProximity.h @@ -1,9 +1,9 @@ #pragma once -#include -#include +#include +#include #include -#include +#include namespace sofa::collisionAlgorithm::Operations::FindClosestProximity { diff --git a/src/sofa/collisionAlgorithm/operations/Project.cpp b/src/CollisionAlgorithm/operations/Project.cpp similarity index 62% rename from src/sofa/collisionAlgorithm/operations/Project.cpp rename to src/CollisionAlgorithm/operations/Project.cpp index 9bae6a46..ffb63827 100644 --- a/src/sofa/collisionAlgorithm/operations/Project.cpp +++ b/src/CollisionAlgorithm/operations/Project.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace sofa::collisionAlgorithm::Operations::Project { diff --git a/src/sofa/collisionAlgorithm/operations/Project.h b/src/CollisionAlgorithm/operations/Project.h similarity index 85% rename from src/sofa/collisionAlgorithm/operations/Project.h rename to src/CollisionAlgorithm/operations/Project.h index 8010eeb1..5033ff01 100644 --- a/src/sofa/collisionAlgorithm/operations/Project.h +++ b/src/CollisionAlgorithm/operations/Project.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #include namespace sofa::collisionAlgorithm::Operations::Project { diff --git a/src/sofa/collisionAlgorithm/proximity/EdgeProximity.h b/src/CollisionAlgorithm/proximity/EdgeProximity.h similarity index 96% rename from src/sofa/collisionAlgorithm/proximity/EdgeProximity.h rename to src/CollisionAlgorithm/proximity/EdgeProximity.h index 0c0f87f8..89b026d3 100644 --- a/src/sofa/collisionAlgorithm/proximity/EdgeProximity.h +++ b/src/CollisionAlgorithm/proximity/EdgeProximity.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/proximity/FixedProximity.h b/src/CollisionAlgorithm/proximity/FixedProximity.h similarity index 96% rename from src/sofa/collisionAlgorithm/proximity/FixedProximity.h rename to src/CollisionAlgorithm/proximity/FixedProximity.h index 6681112b..b1f5a8f6 100644 --- a/src/sofa/collisionAlgorithm/proximity/FixedProximity.h +++ b/src/CollisionAlgorithm/proximity/FixedProximity.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/proximity/MechanicalProximity.h b/src/CollisionAlgorithm/proximity/MechanicalProximity.h similarity index 97% rename from src/sofa/collisionAlgorithm/proximity/MechanicalProximity.h rename to src/CollisionAlgorithm/proximity/MechanicalProximity.h index 010a9368..760e0e85 100644 --- a/src/sofa/collisionAlgorithm/proximity/MechanicalProximity.h +++ b/src/CollisionAlgorithm/proximity/MechanicalProximity.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/proximity/MultiProximity.h b/src/CollisionAlgorithm/proximity/MultiProximity.h similarity index 97% rename from src/sofa/collisionAlgorithm/proximity/MultiProximity.h rename to src/CollisionAlgorithm/proximity/MultiProximity.h index 0f902933..e50a73a0 100644 --- a/src/sofa/collisionAlgorithm/proximity/MultiProximity.h +++ b/src/CollisionAlgorithm/proximity/MultiProximity.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/proximity/PointProximity.h b/src/CollisionAlgorithm/proximity/PointProximity.h similarity index 96% rename from src/sofa/collisionAlgorithm/proximity/PointProximity.h rename to src/CollisionAlgorithm/proximity/PointProximity.h index dbf93aca..e9dcb420 100644 --- a/src/sofa/collisionAlgorithm/proximity/PointProximity.h +++ b/src/CollisionAlgorithm/proximity/PointProximity.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/proximity/TetrahedronProximity.h b/src/CollisionAlgorithm/proximity/TetrahedronProximity.h similarity index 95% rename from src/sofa/collisionAlgorithm/proximity/TetrahedronProximity.h rename to src/CollisionAlgorithm/proximity/TetrahedronProximity.h index 8b869361..1d5022ea 100644 --- a/src/sofa/collisionAlgorithm/proximity/TetrahedronProximity.h +++ b/src/CollisionAlgorithm/proximity/TetrahedronProximity.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/proximity/TriangleProximity.h b/src/CollisionAlgorithm/proximity/TriangleProximity.h similarity index 95% rename from src/sofa/collisionAlgorithm/proximity/TriangleProximity.h rename to src/CollisionAlgorithm/proximity/TriangleProximity.h index 8198f270..c02ad992 100644 --- a/src/sofa/collisionAlgorithm/proximity/TriangleProximity.h +++ b/src/CollisionAlgorithm/proximity/TriangleProximity.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace sofa::collisionAlgorithm { diff --git a/src/sofa/collisionAlgorithm/toolbox/EdgeToolBox.cpp b/src/CollisionAlgorithm/toolbox/EdgeToolBox.cpp similarity index 92% rename from src/sofa/collisionAlgorithm/toolbox/EdgeToolBox.cpp rename to src/CollisionAlgorithm/toolbox/EdgeToolBox.cpp index 5702c971..83c4f466 100644 --- a/src/sofa/collisionAlgorithm/toolbox/EdgeToolBox.cpp +++ b/src/CollisionAlgorithm/toolbox/EdgeToolBox.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include namespace sofa::collisionAlgorithm::toolbox { diff --git a/src/sofa/collisionAlgorithm/toolbox/EdgeToolBox.h b/src/CollisionAlgorithm/toolbox/EdgeToolBox.h similarity index 70% rename from src/sofa/collisionAlgorithm/toolbox/EdgeToolBox.h rename to src/CollisionAlgorithm/toolbox/EdgeToolBox.h index 829c7da0..62414a07 100644 --- a/src/sofa/collisionAlgorithm/toolbox/EdgeToolBox.h +++ b/src/CollisionAlgorithm/toolbox/EdgeToolBox.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace sofa::collisionAlgorithm::toolbox { diff --git a/src/sofa/collisionAlgorithm/toolbox/PointToolBox.cpp b/src/CollisionAlgorithm/toolbox/PointToolBox.cpp similarity index 79% rename from src/sofa/collisionAlgorithm/toolbox/PointToolBox.cpp rename to src/CollisionAlgorithm/toolbox/PointToolBox.cpp index d9f4fb29..73f4737e 100644 --- a/src/sofa/collisionAlgorithm/toolbox/PointToolBox.cpp +++ b/src/CollisionAlgorithm/toolbox/PointToolBox.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include namespace sofa::collisionAlgorithm::toolbox { diff --git a/src/sofa/collisionAlgorithm/toolbox/PointToolBox.h b/src/CollisionAlgorithm/toolbox/PointToolBox.h similarity index 57% rename from src/sofa/collisionAlgorithm/toolbox/PointToolBox.h rename to src/CollisionAlgorithm/toolbox/PointToolBox.h index 8f9d3386..2d9e1b1a 100644 --- a/src/sofa/collisionAlgorithm/toolbox/PointToolBox.h +++ b/src/CollisionAlgorithm/toolbox/PointToolBox.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace sofa::collisionAlgorithm::toolbox { diff --git a/src/sofa/collisionAlgorithm/toolbox/TetrahedronToolBox.cpp b/src/CollisionAlgorithm/toolbox/TetrahedronToolBox.cpp similarity index 91% rename from src/sofa/collisionAlgorithm/toolbox/TetrahedronToolBox.cpp rename to src/CollisionAlgorithm/toolbox/TetrahedronToolBox.cpp index ca1cb2e6..aaccac8d 100644 --- a/src/sofa/collisionAlgorithm/toolbox/TetrahedronToolBox.cpp +++ b/src/CollisionAlgorithm/toolbox/TetrahedronToolBox.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace sofa::collisionAlgorithm::toolbox { diff --git a/src/sofa/collisionAlgorithm/toolbox/TetrahedronToolBox.h b/src/CollisionAlgorithm/toolbox/TetrahedronToolBox.h similarity index 80% rename from src/sofa/collisionAlgorithm/toolbox/TetrahedronToolBox.h rename to src/CollisionAlgorithm/toolbox/TetrahedronToolBox.h index cceea96d..33a8864e 100644 --- a/src/sofa/collisionAlgorithm/toolbox/TetrahedronToolBox.h +++ b/src/CollisionAlgorithm/toolbox/TetrahedronToolBox.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace sofa::collisionAlgorithm::toolbox { diff --git a/src/sofa/collisionAlgorithm/toolbox/TriangleToolBox.cpp b/src/CollisionAlgorithm/toolbox/TriangleToolBox.cpp similarity index 94% rename from src/sofa/collisionAlgorithm/toolbox/TriangleToolBox.cpp rename to src/CollisionAlgorithm/toolbox/TriangleToolBox.cpp index da22a492..fa540a54 100644 --- a/src/sofa/collisionAlgorithm/toolbox/TriangleToolBox.cpp +++ b/src/CollisionAlgorithm/toolbox/TriangleToolBox.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include namespace sofa::collisionAlgorithm::toolbox { diff --git a/src/sofa/collisionAlgorithm/toolbox/TriangleToolBox.h b/src/CollisionAlgorithm/toolbox/TriangleToolBox.h similarity index 79% rename from src/sofa/collisionAlgorithm/toolbox/TriangleToolBox.h rename to src/CollisionAlgorithm/toolbox/TriangleToolBox.h index ccf162fd..7f0b79de 100644 --- a/src/sofa/collisionAlgorithm/toolbox/TriangleToolBox.h +++ b/src/CollisionAlgorithm/toolbox/TriangleToolBox.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace sofa::collisionAlgorithm::toolbox { diff --git a/src/sofa/collisionAlgorithm/elements/PointElement.cpp b/src/sofa/collisionAlgorithm/elements/PointElement.cpp deleted file mode 100644 index 3dffa86d..00000000 --- a/src/sofa/collisionAlgorithm/elements/PointElement.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include -#include -#include -#include -#include - -namespace sofa::collisionAlgorithm { - -PointElement::SPtr PointElement::create(const BaseProximity::SPtr &prox) { - return PointElement::SPtr(new PointElement(prox)); -} - -} diff --git a/src/sofa/collisionAlgorithm/operations/FindClosestProximity.cpp b/src/sofa/collisionAlgorithm/operations/FindClosestProximity.cpp deleted file mode 100644 index 5dd545bb..00000000 --- a/src/sofa/collisionAlgorithm/operations/FindClosestProximity.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include -#include -#include -#include - -namespace sofa::collisionAlgorithm::Operations { - -} - From 6214846494fad9820c227d6df66151fb8e91ee0e Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Wed, 10 Sep 2025 11:57:21 +0200 Subject: [PATCH 10/15] [cmake] Clean up unnecessary manual configurations --- CMakeLists.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e413198b..7c7b844d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,9 +21,6 @@ set_source_files_properties(${IGNORED_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${HEADER_FILES} ${README_FILES}) -set_target_properties(${PROJECT_NAME} PROPERTIES - COMPILE_FLAGS "-DPLUGIN_DATA_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/\"") - target_link_libraries(${PROJECT_NAME} Sofa.Simulation.Core Sofa.Component.StateContainer @@ -31,14 +28,6 @@ target_link_libraries(${PROJECT_NAME} Sofa.GL ) -## Install rules for the library and headers; CMake package configurations files -#set(${PROJECT_NAME}_INCLUDE_DIRS "include/${PROJECT_NAME}") - -target_include_directories(${PROJECT_NAME} PUBLIC - "$" - "$" -) - sofa_create_package_with_targets( PACKAGE_NAME ${PROJECT_NAME} PACKAGE_VERSION ${PROJECT_VERSION} From 87c0737678154c411c9126ecf45b16206f599164 Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Mon, 15 Sep 2025 10:51:46 +0200 Subject: [PATCH 11/15] [src] Adopt SOFA namespace convention; all lowercase --- src/CollisionAlgorithm/BaseAABBBroadPhase.h | 2 +- src/CollisionAlgorithm/BaseAlgorithm.h | 2 +- src/CollisionAlgorithm/BaseElement.h | 2 +- src/CollisionAlgorithm/BaseGeometry.h | 2 +- src/CollisionAlgorithm/BaseOperation.h | 2 +- src/CollisionAlgorithm/BaseProximity.h | 2 +- src/CollisionAlgorithm/CollisionPipeline.cpp | 4 ++-- src/CollisionAlgorithm/CollisionPipeline.h | 2 +- src/CollisionAlgorithm/DataDetectionOutput.h | 4 ++-- src/CollisionAlgorithm/ElementIterator.h | 2 +- src/CollisionAlgorithm/InternalData.h | 2 +- .../algorithm/Find2DClosestProximityAlgorithm.cpp | 4 ++-- .../algorithm/Find2DClosestProximityAlgorithm.h | 2 +- .../algorithm/FindClosestProximityAlgorithm.cpp | 4 ++-- .../algorithm/FindClosestProximityAlgorithm.h | 2 +- src/CollisionAlgorithm/algorithm/InsertionAlgorithm.cpp | 4 ++-- src/CollisionAlgorithm/algorithm/InsertionAlgorithm.h | 4 ++-- src/CollisionAlgorithm/broadphase/AABBBroadPhase.cpp | 4 ++-- src/CollisionAlgorithm/broadphase/AABBBroadPhase.h | 4 ++-- src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.cpp | 4 ++-- src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.h | 2 +- src/CollisionAlgorithm/elements/EdgeElement.cpp | 2 +- src/CollisionAlgorithm/elements/EdgeElement.h | 2 +- src/CollisionAlgorithm/elements/PointElement.cpp | 2 +- src/CollisionAlgorithm/elements/PointElement.h | 2 +- src/CollisionAlgorithm/elements/TetrahedronElement.cpp | 2 +- src/CollisionAlgorithm/elements/TetrahedronElement.h | 2 +- src/CollisionAlgorithm/elements/TriangleElement.cpp | 2 +- src/CollisionAlgorithm/elements/TriangleElement.h | 2 +- src/CollisionAlgorithm/filters/DistanceFilter.cpp | 4 ++-- src/CollisionAlgorithm/filters/DistanceFilter.h | 2 +- src/CollisionAlgorithm/geometry/EdgeGeometry.cpp | 4 ++-- src/CollisionAlgorithm/geometry/EdgeGeometry.h | 2 +- src/CollisionAlgorithm/geometry/PointGeometry.cpp | 4 ++-- src/CollisionAlgorithm/geometry/PointGeometry.h | 2 +- src/CollisionAlgorithm/geometry/SubsetGeometry.cpp | 4 ++-- src/CollisionAlgorithm/geometry/SubsetGeometry.h | 2 +- src/CollisionAlgorithm/geometry/TetrahedronGeometry.cpp | 4 ++-- src/CollisionAlgorithm/geometry/TetrahedronGeometry.h | 2 +- src/CollisionAlgorithm/geometry/TriangleGeometry.cpp | 4 ++-- src/CollisionAlgorithm/geometry/TriangleGeometry.h | 2 +- src/CollisionAlgorithm/initPlugin.cpp | 6 +++--- src/CollisionAlgorithm/operations/CreateCenterProximity.cpp | 2 +- src/CollisionAlgorithm/operations/CreateCenterProximity.h | 2 +- src/CollisionAlgorithm/operations/FindClosestProximity.cpp | 2 +- src/CollisionAlgorithm/operations/FindClosestProximity.h | 2 +- src/CollisionAlgorithm/operations/Project.cpp | 2 +- src/CollisionAlgorithm/operations/Project.h | 2 +- src/CollisionAlgorithm/proximity/EdgeProximity.h | 2 +- src/CollisionAlgorithm/proximity/FixedProximity.h | 4 ++-- src/CollisionAlgorithm/proximity/MechanicalProximity.h | 2 +- src/CollisionAlgorithm/proximity/MultiProximity.h | 2 +- src/CollisionAlgorithm/proximity/PointProximity.h | 2 +- src/CollisionAlgorithm/proximity/TetrahedronProximity.h | 2 +- src/CollisionAlgorithm/proximity/TriangleProximity.h | 2 +- src/CollisionAlgorithm/toolbox/EdgeToolBox.cpp | 2 +- src/CollisionAlgorithm/toolbox/EdgeToolBox.h | 2 +- src/CollisionAlgorithm/toolbox/PointToolBox.cpp | 2 +- src/CollisionAlgorithm/toolbox/PointToolBox.h | 2 +- src/CollisionAlgorithm/toolbox/TetrahedronToolBox.cpp | 2 +- src/CollisionAlgorithm/toolbox/TetrahedronToolBox.h | 2 +- src/CollisionAlgorithm/toolbox/TriangleToolBox.cpp | 2 +- src/CollisionAlgorithm/toolbox/TriangleToolBox.h | 2 +- 63 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/CollisionAlgorithm/BaseAABBBroadPhase.h b/src/CollisionAlgorithm/BaseAABBBroadPhase.h index 9633d63c..b801da9a 100644 --- a/src/CollisionAlgorithm/BaseAABBBroadPhase.h +++ b/src/CollisionAlgorithm/BaseAABBBroadPhase.h @@ -7,7 +7,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class BaseAABBBroadPhase : public BaseGeometry::BroadPhase { public: diff --git a/src/CollisionAlgorithm/BaseAlgorithm.h b/src/CollisionAlgorithm/BaseAlgorithm.h index d6199723..f4fc0838 100644 --- a/src/CollisionAlgorithm/BaseAlgorithm.h +++ b/src/CollisionAlgorithm/BaseAlgorithm.h @@ -5,7 +5,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { /*! * \class BaseAlgorithm diff --git a/src/CollisionAlgorithm/BaseElement.h b/src/CollisionAlgorithm/BaseElement.h index f86d164e..b3d5196f 100644 --- a/src/CollisionAlgorithm/BaseElement.h +++ b/src/CollisionAlgorithm/BaseElement.h @@ -3,7 +3,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class PointElement; class EdgeElement; diff --git a/src/CollisionAlgorithm/BaseGeometry.h b/src/CollisionAlgorithm/BaseGeometry.h index 9f275dc0..a051435e 100644 --- a/src/CollisionAlgorithm/BaseGeometry.h +++ b/src/CollisionAlgorithm/BaseGeometry.h @@ -13,7 +13,7 @@ #include -namespace sofa ::collisionAlgorithm { +namespace sofa ::collisionalgorithm { /*! diff --git a/src/CollisionAlgorithm/BaseOperation.h b/src/CollisionAlgorithm/BaseOperation.h index 41c8cce0..1b0e9fcf 100644 --- a/src/CollisionAlgorithm/BaseOperation.h +++ b/src/CollisionAlgorithm/BaseOperation.h @@ -4,7 +4,7 @@ #include #include -namespace sofa::collisionAlgorithm::Operations { +namespace sofa::collisionalgorithm::Operations { template class REAL_TYPE_CHECK { diff --git a/src/CollisionAlgorithm/BaseProximity.h b/src/CollisionAlgorithm/BaseProximity.h index 1e6d280f..e40a532d 100644 --- a/src/CollisionAlgorithm/BaseProximity.h +++ b/src/CollisionAlgorithm/BaseProximity.h @@ -8,7 +8,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { /*! * \brief The BaseProximity class is the basic abstract proximity class diff --git a/src/CollisionAlgorithm/CollisionPipeline.cpp b/src/CollisionAlgorithm/CollisionPipeline.cpp index d4dba2a1..0c35145a 100644 --- a/src/CollisionAlgorithm/CollisionPipeline.cpp +++ b/src/CollisionAlgorithm/CollisionPipeline.cpp @@ -1,7 +1,7 @@ #include #include -namespace sofa::collisionAlgorithm +namespace sofa::collisionalgorithm { void registerCollisionLoop(sofa::core::ObjectFactory* factory) { @@ -10,4 +10,4 @@ void registerCollisionLoop(sofa::core::ObjectFactory* factory) "A collision pipeline customized for proximity detection during needle insertion") .add()); } -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm diff --git a/src/CollisionAlgorithm/CollisionPipeline.h b/src/CollisionAlgorithm/CollisionPipeline.h index 1bd8b2d4..d86aa9c7 100644 --- a/src/CollisionAlgorithm/CollisionPipeline.h +++ b/src/CollisionAlgorithm/CollisionPipeline.h @@ -15,7 +15,7 @@ #include #include -namespace sofa ::collisionAlgorithm { +namespace sofa ::collisionalgorithm { class CollisionComponent : public core::objectmodel::BaseObject { public: diff --git a/src/CollisionAlgorithm/DataDetectionOutput.h b/src/CollisionAlgorithm/DataDetectionOutput.h index 8e9082ed..5201fbcd 100644 --- a/src/CollisionAlgorithm/DataDetectionOutput.h +++ b/src/CollisionAlgorithm/DataDetectionOutput.h @@ -5,7 +5,7 @@ namespace sofa { -namespace collisionAlgorithm +namespace collisionalgorithm { template @@ -130,7 +130,7 @@ struct DetectionOutputTypeInfo }; template<> -struct DataTypeInfo< collisionAlgorithm::DetectionOutput > : public DetectionOutputTypeInfo< collisionAlgorithm::DetectionOutput > +struct DataTypeInfo< collisionalgorithm::DetectionOutput > : public DetectionOutputTypeInfo< collisionalgorithm::DetectionOutput > { static std::string name() { std::ostringstream o; o << "DetectionOutput"; return o.str(); } }; diff --git a/src/CollisionAlgorithm/ElementIterator.h b/src/CollisionAlgorithm/ElementIterator.h index 69e55572..2e1418c4 100644 --- a/src/CollisionAlgorithm/ElementIterator.h +++ b/src/CollisionAlgorithm/ElementIterator.h @@ -3,7 +3,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class BaseGeometry; diff --git a/src/CollisionAlgorithm/InternalData.h b/src/CollisionAlgorithm/InternalData.h index 25a45246..51563d9a 100644 --- a/src/CollisionAlgorithm/InternalData.h +++ b/src/CollisionAlgorithm/InternalData.h @@ -11,7 +11,7 @@ #include #include -namespace sofa ::collisionAlgorithm { +namespace sofa ::collisionalgorithm { class InternalDataContainer { diff --git a/src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.cpp b/src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.cpp index 657fe0ab..33c286f5 100644 --- a/src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.cpp +++ b/src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.cpp @@ -1,7 +1,7 @@ #include #include -namespace sofa::collisionAlgorithm +namespace sofa::collisionalgorithm { void registerFind2DClosestProximityAlgorithm(sofa::core::ObjectFactory* factory) { @@ -10,4 +10,4 @@ void registerFind2DClosestProximityAlgorithm(sofa::core::ObjectFactory* factory) "An algorithm to find the closest proximity between two BaseGeometry types in 2D") .add()); } -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm diff --git a/src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.h b/src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.h index 67244e2e..4af1aa54 100644 --- a/src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.h +++ b/src/CollisionAlgorithm/algorithm/Find2DClosestProximityAlgorithm.h @@ -7,7 +7,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class Find2DClosestProximityAlgorithm : public BaseAlgorithm { public: diff --git a/src/CollisionAlgorithm/algorithm/FindClosestProximityAlgorithm.cpp b/src/CollisionAlgorithm/algorithm/FindClosestProximityAlgorithm.cpp index 242f9687..1761699b 100644 --- a/src/CollisionAlgorithm/algorithm/FindClosestProximityAlgorithm.cpp +++ b/src/CollisionAlgorithm/algorithm/FindClosestProximityAlgorithm.cpp @@ -1,7 +1,7 @@ #include #include -namespace sofa::collisionAlgorithm +namespace sofa::collisionalgorithm { void registerFindClosestProximityAlgorithm(sofa::core::ObjectFactory* factory) { @@ -10,4 +10,4 @@ void registerFindClosestProximityAlgorithm(sofa::core::ObjectFactory* factory) "An algorithm to find the closest proximity between two BaseGeometry types") .add()); } -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm diff --git a/src/CollisionAlgorithm/algorithm/FindClosestProximityAlgorithm.h b/src/CollisionAlgorithm/algorithm/FindClosestProximityAlgorithm.h index 426943ff..c776cf7b 100644 --- a/src/CollisionAlgorithm/algorithm/FindClosestProximityAlgorithm.h +++ b/src/CollisionAlgorithm/algorithm/FindClosestProximityAlgorithm.h @@ -7,7 +7,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class FindClosestProximityAlgorithm : public BaseAlgorithm { public: diff --git a/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.cpp b/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.cpp index 4d4c5de2..8b1736f1 100644 --- a/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.cpp +++ b/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.cpp @@ -1,7 +1,7 @@ #include #include -namespace sofa::collisionAlgorithm +namespace sofa::collisionalgorithm { void registerInsertionAlgorithm(sofa::core::ObjectFactory* factory) { @@ -9,4 +9,4 @@ void registerInsertionAlgorithm(sofa::core::ObjectFactory* factory) "A class implementing a customized needle insertion algorithm") .add()); } -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm diff --git a/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.h b/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.h index de8d0d60..a6048e63 100644 --- a/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.h +++ b/src/CollisionAlgorithm/algorithm/InsertionAlgorithm.h @@ -11,7 +11,7 @@ #include #include -namespace sofa::collisionAlgorithm +namespace sofa::collisionalgorithm { class InsertionAlgorithm : public BaseAlgorithm @@ -308,4 +308,4 @@ class InsertionAlgorithm : public BaseAlgorithm } }; -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm diff --git a/src/CollisionAlgorithm/broadphase/AABBBroadPhase.cpp b/src/CollisionAlgorithm/broadphase/AABBBroadPhase.cpp index b9f26b7b..3d2011ff 100644 --- a/src/CollisionAlgorithm/broadphase/AABBBroadPhase.cpp +++ b/src/CollisionAlgorithm/broadphase/AABBBroadPhase.cpp @@ -1,7 +1,7 @@ #include #include -namespace sofa::collisionAlgorithm +namespace sofa::collisionalgorithm { void registerAABBBroadPhase(sofa::core::ObjectFactory* factory) { @@ -15,4 +15,4 @@ void registerAABBBroadPhase(sofa::core::ObjectFactory* factory) )") .add()); } -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm diff --git a/src/CollisionAlgorithm/broadphase/AABBBroadPhase.h b/src/CollisionAlgorithm/broadphase/AABBBroadPhase.h index a174a560..686bc702 100644 --- a/src/CollisionAlgorithm/broadphase/AABBBroadPhase.h +++ b/src/CollisionAlgorithm/broadphase/AABBBroadPhase.h @@ -5,7 +5,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { /** * @brief A class for broad-phase collision detection using Axis-Aligned Bounding Boxes (AABB). @@ -170,4 +170,4 @@ class AABBBroadPhase : public BaseAABBBroadPhase { type::Vec<2, size_t> m_offset; }; -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm diff --git a/src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.cpp b/src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.cpp index fe4e4bfa..5e5399c0 100644 --- a/src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.cpp +++ b/src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.cpp @@ -1,10 +1,10 @@ #include #include -namespace sofa::collisionAlgorithm +namespace sofa::collisionalgorithm { void registerFullAABBBroadPhase(sofa::core::ObjectFactory* factory) { factory->registerObjects(sofa::core::ObjectRegistrationData("").add()); } -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm diff --git a/src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.h b/src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.h index 8e290e45..11081202 100644 --- a/src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.h +++ b/src/CollisionAlgorithm/broadphase/FullAABBBroadPhase.h @@ -5,7 +5,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class FullAABBBroadPhase : public BaseAABBBroadPhase { public: diff --git a/src/CollisionAlgorithm/elements/EdgeElement.cpp b/src/CollisionAlgorithm/elements/EdgeElement.cpp index d58e44aa..748840d1 100644 --- a/src/CollisionAlgorithm/elements/EdgeElement.cpp +++ b/src/CollisionAlgorithm/elements/EdgeElement.cpp @@ -4,7 +4,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { EdgeElement::SPtr EdgeElement::create(const PointElement::SPtr & p0, const PointElement::SPtr & p1) { EdgeElement::SPtr res = EdgeElement::SPtr(new EdgeElement()); diff --git a/src/CollisionAlgorithm/elements/EdgeElement.h b/src/CollisionAlgorithm/elements/EdgeElement.h index f1e92acb..b095003a 100644 --- a/src/CollisionAlgorithm/elements/EdgeElement.h +++ b/src/CollisionAlgorithm/elements/EdgeElement.h @@ -3,7 +3,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class EdgeElement : public BaseElement { public: diff --git a/src/CollisionAlgorithm/elements/PointElement.cpp b/src/CollisionAlgorithm/elements/PointElement.cpp index bf472401..eca1d6e6 100644 --- a/src/CollisionAlgorithm/elements/PointElement.cpp +++ b/src/CollisionAlgorithm/elements/PointElement.cpp @@ -4,7 +4,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { PointElement::SPtr PointElement::create(const BaseProximity::SPtr &prox) { return PointElement::SPtr(new PointElement(prox)); diff --git a/src/CollisionAlgorithm/elements/PointElement.h b/src/CollisionAlgorithm/elements/PointElement.h index 55a48455..4b2bf2be 100644 --- a/src/CollisionAlgorithm/elements/PointElement.h +++ b/src/CollisionAlgorithm/elements/PointElement.h @@ -3,7 +3,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class PointElement : public BaseElement { public: diff --git a/src/CollisionAlgorithm/elements/TetrahedronElement.cpp b/src/CollisionAlgorithm/elements/TetrahedronElement.cpp index b7aa0f82..1a0e7fee 100644 --- a/src/CollisionAlgorithm/elements/TetrahedronElement.cpp +++ b/src/CollisionAlgorithm/elements/TetrahedronElement.cpp @@ -4,7 +4,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { TetrahedronElement::SPtr TetrahedronElement::create(PointElement::SPtr p0,PointElement::SPtr p1,PointElement::SPtr p2,PointElement::SPtr p3, EdgeElement::SPtr e0, EdgeElement::SPtr e1, EdgeElement::SPtr e2, EdgeElement::SPtr e3,EdgeElement::SPtr e4,EdgeElement::SPtr e5, diff --git a/src/CollisionAlgorithm/elements/TetrahedronElement.h b/src/CollisionAlgorithm/elements/TetrahedronElement.h index 608aea78..a7c74bbf 100644 --- a/src/CollisionAlgorithm/elements/TetrahedronElement.h +++ b/src/CollisionAlgorithm/elements/TetrahedronElement.h @@ -3,7 +3,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class TetrahedronElement : public BaseElement { public: diff --git a/src/CollisionAlgorithm/elements/TriangleElement.cpp b/src/CollisionAlgorithm/elements/TriangleElement.cpp index 287cfbc4..7356fbb2 100644 --- a/src/CollisionAlgorithm/elements/TriangleElement.cpp +++ b/src/CollisionAlgorithm/elements/TriangleElement.cpp @@ -4,7 +4,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { TriangleElement::SPtr TriangleElement::create(BaseProximity::SPtr prox0, BaseProximity::SPtr prox1,BaseProximity::SPtr prox2) { PointElement::SPtr p0 = PointElement::create(prox0); diff --git a/src/CollisionAlgorithm/elements/TriangleElement.h b/src/CollisionAlgorithm/elements/TriangleElement.h index 48441a53..65010b69 100644 --- a/src/CollisionAlgorithm/elements/TriangleElement.h +++ b/src/CollisionAlgorithm/elements/TriangleElement.h @@ -3,7 +3,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class TriangleElement : public BaseElement { public: diff --git a/src/CollisionAlgorithm/filters/DistanceFilter.cpp b/src/CollisionAlgorithm/filters/DistanceFilter.cpp index 0a6f1983..6fbeca89 100644 --- a/src/CollisionAlgorithm/filters/DistanceFilter.cpp +++ b/src/CollisionAlgorithm/filters/DistanceFilter.cpp @@ -1,7 +1,7 @@ #include #include -namespace sofa::collisionAlgorithm +namespace sofa::collisionalgorithm { void registerDistanceFilter(sofa::core::ObjectFactory* factory) { @@ -10,4 +10,4 @@ void registerDistanceFilter(sofa::core::ObjectFactory* factory) "This class filters detected proximities based on their distance from source") .add()); } -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm diff --git a/src/CollisionAlgorithm/filters/DistanceFilter.h b/src/CollisionAlgorithm/filters/DistanceFilter.h index f6f2cbd5..abcaa917 100644 --- a/src/CollisionAlgorithm/filters/DistanceFilter.h +++ b/src/CollisionAlgorithm/filters/DistanceFilter.h @@ -2,7 +2,7 @@ #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { /*! * \brief The DistanceFilter class diff --git a/src/CollisionAlgorithm/geometry/EdgeGeometry.cpp b/src/CollisionAlgorithm/geometry/EdgeGeometry.cpp index ede1d1ad..e62e758d 100644 --- a/src/CollisionAlgorithm/geometry/EdgeGeometry.cpp +++ b/src/CollisionAlgorithm/geometry/EdgeGeometry.cpp @@ -1,7 +1,7 @@ #include #include -namespace sofa::collisionAlgorithm +namespace sofa::collisionalgorithm { void registerEdgeGeometry(sofa::core::ObjectFactory* factory) { @@ -10,4 +10,4 @@ void registerEdgeGeometry(sofa::core::ObjectFactory* factory) "A class bridging edge topological information with the proximity detection algorithm") .add >()); } -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm diff --git a/src/CollisionAlgorithm/geometry/EdgeGeometry.h b/src/CollisionAlgorithm/geometry/EdgeGeometry.h index 84bf290b..8391cc14 100644 --- a/src/CollisionAlgorithm/geometry/EdgeGeometry.h +++ b/src/CollisionAlgorithm/geometry/EdgeGeometry.h @@ -4,7 +4,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { template class EdgeGeometry : public PointGeometry { diff --git a/src/CollisionAlgorithm/geometry/PointGeometry.cpp b/src/CollisionAlgorithm/geometry/PointGeometry.cpp index 9c0fa7cf..eb17719a 100644 --- a/src/CollisionAlgorithm/geometry/PointGeometry.cpp +++ b/src/CollisionAlgorithm/geometry/PointGeometry.cpp @@ -1,7 +1,7 @@ #include #include -namespace sofa::collisionAlgorithm +namespace sofa::collisionalgorithm { void registerPointGeometry(sofa::core::ObjectFactory* factory) { @@ -10,4 +10,4 @@ void registerPointGeometry(sofa::core::ObjectFactory* factory) "A class bridging point topological information with the proximity detection algorithm") .add >()); } -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm diff --git a/src/CollisionAlgorithm/geometry/PointGeometry.h b/src/CollisionAlgorithm/geometry/PointGeometry.h index 3710cf71..59de30ab 100644 --- a/src/CollisionAlgorithm/geometry/PointGeometry.h +++ b/src/CollisionAlgorithm/geometry/PointGeometry.h @@ -8,7 +8,7 @@ namespace sofa { -namespace collisionAlgorithm { +namespace collisionalgorithm { template class PointGeometry : public TBaseGeometry { diff --git a/src/CollisionAlgorithm/geometry/SubsetGeometry.cpp b/src/CollisionAlgorithm/geometry/SubsetGeometry.cpp index 9e643228..2a30ca15 100644 --- a/src/CollisionAlgorithm/geometry/SubsetGeometry.cpp +++ b/src/CollisionAlgorithm/geometry/SubsetGeometry.cpp @@ -1,7 +1,7 @@ #include #include -namespace sofa::collisionAlgorithm +namespace sofa::collisionalgorithm { void registerSubsetGeometry(sofa::core::ObjectFactory* factory) { @@ -9,4 +9,4 @@ void registerSubsetGeometry(sofa::core::ObjectFactory* factory) sofa::core::ObjectRegistrationData("") .add >()); } -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm diff --git a/src/CollisionAlgorithm/geometry/SubsetGeometry.h b/src/CollisionAlgorithm/geometry/SubsetGeometry.h index dc7e2786..3f08cf73 100644 --- a/src/CollisionAlgorithm/geometry/SubsetGeometry.h +++ b/src/CollisionAlgorithm/geometry/SubsetGeometry.h @@ -4,7 +4,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { template class SubsetGeometry : public TBaseGeometry { diff --git a/src/CollisionAlgorithm/geometry/TetrahedronGeometry.cpp b/src/CollisionAlgorithm/geometry/TetrahedronGeometry.cpp index 65e62891..156c2b16 100644 --- a/src/CollisionAlgorithm/geometry/TetrahedronGeometry.cpp +++ b/src/CollisionAlgorithm/geometry/TetrahedronGeometry.cpp @@ -1,7 +1,7 @@ #include #include -namespace sofa::collisionAlgorithm +namespace sofa::collisionalgorithm { void registerTetrahedronGeometry(sofa::core::ObjectFactory* factory) { @@ -10,4 +10,4 @@ void registerTetrahedronGeometry(sofa::core::ObjectFactory* factory) "the proximity detection algorithm") .add >()); } -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm diff --git a/src/CollisionAlgorithm/geometry/TetrahedronGeometry.h b/src/CollisionAlgorithm/geometry/TetrahedronGeometry.h index 31288f88..dad4e4a3 100644 --- a/src/CollisionAlgorithm/geometry/TetrahedronGeometry.h +++ b/src/CollisionAlgorithm/geometry/TetrahedronGeometry.h @@ -5,7 +5,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { template class TetrahedronGeometry : public TriangleGeometry { diff --git a/src/CollisionAlgorithm/geometry/TriangleGeometry.cpp b/src/CollisionAlgorithm/geometry/TriangleGeometry.cpp index 79ba2f95..b6fadbf1 100644 --- a/src/CollisionAlgorithm/geometry/TriangleGeometry.cpp +++ b/src/CollisionAlgorithm/geometry/TriangleGeometry.cpp @@ -1,7 +1,7 @@ #include #include -namespace sofa::collisionAlgorithm +namespace sofa::collisionalgorithm { void registerTriangleGeometry(sofa::core::ObjectFactory* factory) { @@ -10,4 +10,4 @@ void registerTriangleGeometry(sofa::core::ObjectFactory* factory) "the proximity detection algorithm") .add >()); } -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm diff --git a/src/CollisionAlgorithm/geometry/TriangleGeometry.h b/src/CollisionAlgorithm/geometry/TriangleGeometry.h index d7665c77..dc20bcce 100644 --- a/src/CollisionAlgorithm/geometry/TriangleGeometry.h +++ b/src/CollisionAlgorithm/geometry/TriangleGeometry.h @@ -5,7 +5,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { template class TriangleGeometry : public EdgeGeometry { diff --git a/src/CollisionAlgorithm/initPlugin.cpp b/src/CollisionAlgorithm/initPlugin.cpp index 94288219..7b4c56b1 100644 --- a/src/CollisionAlgorithm/initPlugin.cpp +++ b/src/CollisionAlgorithm/initPlugin.cpp @@ -10,7 +10,7 @@ #define Q(x) #x #define QUOTE(x) Q(x) -namespace sofa::collisionAlgorithm +namespace sofa::collisionalgorithm { // CollisionPipeline @@ -34,7 +34,7 @@ extern void registerPointGeometry(sofa::core::ObjectFactory* factory); extern void registerEdgeGeometry(sofa::core::ObjectFactory* factory); extern void registerTriangleGeometry(sofa::core::ObjectFactory* factory); extern void registerTetrahedronGeometry(sofa::core::ObjectFactory* factory); -} // namespace sofa::collisionAlgorithm +} // namespace sofa::collisionalgorithm namespace sofa::component { @@ -87,7 +87,7 @@ const char* getModuleDescription() { return "Plugin for collision detection"; } void registerObjects(sofa::core::ObjectFactory* factory) { - using namespace sofa::collisionAlgorithm; + using namespace sofa::collisionalgorithm; // Register CollisionPipeline registerCollisionLoop(factory); // Register Algorithms diff --git a/src/CollisionAlgorithm/operations/CreateCenterProximity.cpp b/src/CollisionAlgorithm/operations/CreateCenterProximity.cpp index 9970f2d4..0ea11073 100644 --- a/src/CollisionAlgorithm/operations/CreateCenterProximity.cpp +++ b/src/CollisionAlgorithm/operations/CreateCenterProximity.cpp @@ -4,7 +4,7 @@ #include #include -namespace sofa::collisionAlgorithm::Operations::CreateCenterProximity { +namespace sofa::collisionalgorithm::Operations::CreateCenterProximity { int register_CenterProximity_Point = Operation::register_func(&toolbox::PointToolBox::createCenterProximity); diff --git a/src/CollisionAlgorithm/operations/CreateCenterProximity.h b/src/CollisionAlgorithm/operations/CreateCenterProximity.h index 03f1d8b0..bcaf53b4 100644 --- a/src/CollisionAlgorithm/operations/CreateCenterProximity.h +++ b/src/CollisionAlgorithm/operations/CreateCenterProximity.h @@ -5,7 +5,7 @@ #include #include -namespace sofa::collisionAlgorithm::Operations::CreateCenterProximity { +namespace sofa::collisionalgorithm::Operations::CreateCenterProximity { typedef BaseProximity::SPtr Result; diff --git a/src/CollisionAlgorithm/operations/FindClosestProximity.cpp b/src/CollisionAlgorithm/operations/FindClosestProximity.cpp index aaeb05c3..cd7d38a9 100644 --- a/src/CollisionAlgorithm/operations/FindClosestProximity.cpp +++ b/src/CollisionAlgorithm/operations/FindClosestProximity.cpp @@ -4,7 +4,7 @@ #include #include -namespace sofa::collisionAlgorithm::Operations { +namespace sofa::collisionalgorithm::Operations { } diff --git a/src/CollisionAlgorithm/operations/FindClosestProximity.h b/src/CollisionAlgorithm/operations/FindClosestProximity.h index ca80defb..e446ba6a 100644 --- a/src/CollisionAlgorithm/operations/FindClosestProximity.h +++ b/src/CollisionAlgorithm/operations/FindClosestProximity.h @@ -5,7 +5,7 @@ #include #include -namespace sofa::collisionAlgorithm::Operations::FindClosestProximity { +namespace sofa::collisionalgorithm::Operations::FindClosestProximity { typedef BaseProximity::SPtr Result; typedef std::function FilterFUNC; diff --git a/src/CollisionAlgorithm/operations/Project.cpp b/src/CollisionAlgorithm/operations/Project.cpp index ffb63827..8c9762bd 100644 --- a/src/CollisionAlgorithm/operations/Project.cpp +++ b/src/CollisionAlgorithm/operations/Project.cpp @@ -4,7 +4,7 @@ #include #include -namespace sofa::collisionAlgorithm::Operations::Project { +namespace sofa::collisionalgorithm::Operations::Project { int register_Project_Point = Operation::register_func(&toolbox::PointToolBox::project); diff --git a/src/CollisionAlgorithm/operations/Project.h b/src/CollisionAlgorithm/operations/Project.h index 5033ff01..e5e82cd1 100644 --- a/src/CollisionAlgorithm/operations/Project.h +++ b/src/CollisionAlgorithm/operations/Project.h @@ -5,7 +5,7 @@ #include #include -namespace sofa::collisionAlgorithm::Operations::Project { +namespace sofa::collisionalgorithm::Operations::Project { struct Result { Result() {} diff --git a/src/CollisionAlgorithm/proximity/EdgeProximity.h b/src/CollisionAlgorithm/proximity/EdgeProximity.h index 89b026d3..45d33281 100644 --- a/src/CollisionAlgorithm/proximity/EdgeProximity.h +++ b/src/CollisionAlgorithm/proximity/EdgeProximity.h @@ -3,7 +3,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class EdgeProximity : public BaseProximity { public: diff --git a/src/CollisionAlgorithm/proximity/FixedProximity.h b/src/CollisionAlgorithm/proximity/FixedProximity.h index b1f5a8f6..3c27fca4 100644 --- a/src/CollisionAlgorithm/proximity/FixedProximity.h +++ b/src/CollisionAlgorithm/proximity/FixedProximity.h @@ -2,12 +2,12 @@ #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class FixedProximity : public BaseProximity{ public: typedef std::shared_ptr SPtr; - typedef typename collisionAlgorithm::BaseProximity Inherits; + typedef typename collisionalgorithm::BaseProximity Inherits; typedef type::Vec3d Vec3d; FixedProximity(Vec3d P ) : m_position(P) { m_normal = Vec3d(); } diff --git a/src/CollisionAlgorithm/proximity/MechanicalProximity.h b/src/CollisionAlgorithm/proximity/MechanicalProximity.h index 760e0e85..915430d9 100644 --- a/src/CollisionAlgorithm/proximity/MechanicalProximity.h +++ b/src/CollisionAlgorithm/proximity/MechanicalProximity.h @@ -3,7 +3,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { template class MechanicalProximity : public BaseProximity { diff --git a/src/CollisionAlgorithm/proximity/MultiProximity.h b/src/CollisionAlgorithm/proximity/MultiProximity.h index e50a73a0..3a2433ed 100644 --- a/src/CollisionAlgorithm/proximity/MultiProximity.h +++ b/src/CollisionAlgorithm/proximity/MultiProximity.h @@ -2,7 +2,7 @@ #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class MultiProximity : public BaseProximity { public: diff --git a/src/CollisionAlgorithm/proximity/PointProximity.h b/src/CollisionAlgorithm/proximity/PointProximity.h index e9dcb420..d0d3d198 100644 --- a/src/CollisionAlgorithm/proximity/PointProximity.h +++ b/src/CollisionAlgorithm/proximity/PointProximity.h @@ -2,7 +2,7 @@ #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class PointProximity : public BaseProximity { public: diff --git a/src/CollisionAlgorithm/proximity/TetrahedronProximity.h b/src/CollisionAlgorithm/proximity/TetrahedronProximity.h index 1d5022ea..fbe3a7fb 100644 --- a/src/CollisionAlgorithm/proximity/TetrahedronProximity.h +++ b/src/CollisionAlgorithm/proximity/TetrahedronProximity.h @@ -4,7 +4,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class TetrahedronProximity : public BaseProximity { public: diff --git a/src/CollisionAlgorithm/proximity/TriangleProximity.h b/src/CollisionAlgorithm/proximity/TriangleProximity.h index c02ad992..b5ba63de 100644 --- a/src/CollisionAlgorithm/proximity/TriangleProximity.h +++ b/src/CollisionAlgorithm/proximity/TriangleProximity.h @@ -4,7 +4,7 @@ #include #include -namespace sofa::collisionAlgorithm { +namespace sofa::collisionalgorithm { class TriangleProximity : public BaseProximity { public: diff --git a/src/CollisionAlgorithm/toolbox/EdgeToolBox.cpp b/src/CollisionAlgorithm/toolbox/EdgeToolBox.cpp index 83c4f466..0972f3e4 100644 --- a/src/CollisionAlgorithm/toolbox/EdgeToolBox.cpp +++ b/src/CollisionAlgorithm/toolbox/EdgeToolBox.cpp @@ -1,7 +1,7 @@ #include #include -namespace sofa::collisionAlgorithm::toolbox { +namespace sofa::collisionalgorithm::toolbox { Operations::CreateCenterProximity::Result EdgeToolBox::createCenterProximity(const EdgeElement::SPtr & edge) { return EdgeProximity::create(edge,0.5,0.5); diff --git a/src/CollisionAlgorithm/toolbox/EdgeToolBox.h b/src/CollisionAlgorithm/toolbox/EdgeToolBox.h index 62414a07..520d9158 100644 --- a/src/CollisionAlgorithm/toolbox/EdgeToolBox.h +++ b/src/CollisionAlgorithm/toolbox/EdgeToolBox.h @@ -5,7 +5,7 @@ #include #include -namespace sofa::collisionAlgorithm::toolbox { +namespace sofa::collisionalgorithm::toolbox { class EdgeToolBox { public: diff --git a/src/CollisionAlgorithm/toolbox/PointToolBox.cpp b/src/CollisionAlgorithm/toolbox/PointToolBox.cpp index 73f4737e..d8534b60 100644 --- a/src/CollisionAlgorithm/toolbox/PointToolBox.cpp +++ b/src/CollisionAlgorithm/toolbox/PointToolBox.cpp @@ -1,7 +1,7 @@ #include #include -namespace sofa::collisionAlgorithm::toolbox { +namespace sofa::collisionalgorithm::toolbox { Operations::CreateCenterProximity::Result PointToolBox::createCenterProximity(const PointElement::SPtr & point) { return point->getP0(); diff --git a/src/CollisionAlgorithm/toolbox/PointToolBox.h b/src/CollisionAlgorithm/toolbox/PointToolBox.h index 2d9e1b1a..6b3a03c3 100644 --- a/src/CollisionAlgorithm/toolbox/PointToolBox.h +++ b/src/CollisionAlgorithm/toolbox/PointToolBox.h @@ -5,7 +5,7 @@ #include #include -namespace sofa::collisionAlgorithm::toolbox { +namespace sofa::collisionalgorithm::toolbox { class PointToolBox { public: diff --git a/src/CollisionAlgorithm/toolbox/TetrahedronToolBox.cpp b/src/CollisionAlgorithm/toolbox/TetrahedronToolBox.cpp index aaccac8d..084193a4 100644 --- a/src/CollisionAlgorithm/toolbox/TetrahedronToolBox.cpp +++ b/src/CollisionAlgorithm/toolbox/TetrahedronToolBox.cpp @@ -4,7 +4,7 @@ #include #include -namespace sofa::collisionAlgorithm::toolbox { +namespace sofa::collisionalgorithm::toolbox { Operations::CreateCenterProximity::Result TetrahedronToolBox::createCenterProximity(const TetrahedronElement::SPtr & tetra) { return TetrahedronProximity::create(tetra, 1.0/4.0,1.0/4.0,1.0/4.0,1.0/4.0); diff --git a/src/CollisionAlgorithm/toolbox/TetrahedronToolBox.h b/src/CollisionAlgorithm/toolbox/TetrahedronToolBox.h index 33a8864e..51d1f853 100644 --- a/src/CollisionAlgorithm/toolbox/TetrahedronToolBox.h +++ b/src/CollisionAlgorithm/toolbox/TetrahedronToolBox.h @@ -5,7 +5,7 @@ #include #include -namespace sofa::collisionAlgorithm::toolbox { +namespace sofa::collisionalgorithm::toolbox { class TetrahedronToolBox { public: diff --git a/src/CollisionAlgorithm/toolbox/TriangleToolBox.cpp b/src/CollisionAlgorithm/toolbox/TriangleToolBox.cpp index fa540a54..a1fca90f 100644 --- a/src/CollisionAlgorithm/toolbox/TriangleToolBox.cpp +++ b/src/CollisionAlgorithm/toolbox/TriangleToolBox.cpp @@ -2,7 +2,7 @@ #include #include -namespace sofa::collisionAlgorithm::toolbox { +namespace sofa::collisionalgorithm::toolbox { Operations::CreateCenterProximity::Result TriangleToolBox::createCenterProximity(const TriangleElement::SPtr & tri) { return TriangleProximity::create(tri, 1.0/3.0,1.0/3.0,1.0/3.0); diff --git a/src/CollisionAlgorithm/toolbox/TriangleToolBox.h b/src/CollisionAlgorithm/toolbox/TriangleToolBox.h index 7f0b79de..bdea0db8 100644 --- a/src/CollisionAlgorithm/toolbox/TriangleToolBox.h +++ b/src/CollisionAlgorithm/toolbox/TriangleToolBox.h @@ -5,7 +5,7 @@ #include #include -namespace sofa::collisionAlgorithm::toolbox { +namespace sofa::collisionalgorithm::toolbox { class TriangleToolBox { public: From 19504bec4c47dd99c4bdace2d9eecf471e38a528 Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Mon, 15 Sep 2025 10:54:40 +0200 Subject: [PATCH 12/15] [cmake] Use RELOCATABLE macro for plugins --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c7b844d..96ce8e9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,4 +35,5 @@ sofa_create_package_with_targets( INCLUDE_SOURCE_DIR "src" INCLUDE_INSTALL_DIR ${PROJECT_NAME} EXAMPLE_INSTALL_DIR "scenes" -) + RELOCATABLE "plugins" + ) From ec312a334514aad39d9d226c9644d37c0ecc671d Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Mon, 15 Sep 2025 11:30:21 +0200 Subject: [PATCH 13/15] [cmake] Drop glob for src files, add them manually - remove some unnecessary directives --- CMakeLists.txt | 94 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 85 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96ce8e9a..ec310ed2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,21 +3,97 @@ project(CollisionAlgorithm VERSION 0.1 LANGUAGES CXX) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) -file(GLOB_RECURSE HEADER_FILES "src/*.h" "src/*.inl") -file(GLOB_RECURSE SOURCE_FILES "src/*.cpp") -file(GLOB_RECURSE SCENES_FILES "scenes/*.scn" "*.xml") -file(GLOB_RECURSE IGNORED_FILES "ignored/*.h" "ignored/*.inl" "ignored/*.cpp") -file(GLOB_RECURSE DEPRECATED_FILES "deprecated/*.h" "deprecated/*.inl" "deprecated/*.cpp") - find_package(Sofa.Simulation.Core REQUIRED) find_package(Sofa.Component.StateContainer REQUIRED) find_package(Sofa.Component.Constraint.Lagrangian.Solver REQUIRED) find_package(Sofa.GL REQUIRED) -#include_directories("${CMAKE_CURRENT_SOURCE_DIR}/ignored") -#include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deprecated") +set(COLLISIONALGORITHM_SRC "src/${PROJECT_NAME}") + +set(HEADER_FILES + ${COLLISIONALGORITHM_SRC}/BaseAABBBroadPhase.h + ${COLLISIONALGORITHM_SRC}/BaseAlgorithm.h + ${COLLISIONALGORITHM_SRC}/BaseElement.h + ${COLLISIONALGORITHM_SRC}/BaseGeometry.h + ${COLLISIONALGORITHM_SRC}/BaseOperation.h + ${COLLISIONALGORITHM_SRC}/BaseProximity.h + ${COLLISIONALGORITHM_SRC}/CollisionPipeline.h + ${COLLISIONALGORITHM_SRC}/DataDetectionOutput.h + ${COLLISIONALGORITHM_SRC}/ElementIterator.h + ${COLLISIONALGORITHM_SRC}/InternalData.h + + ${COLLISIONALGORITHM_SRC}/algorithm/Find2DClosestProximityAlgorithm.h + ${COLLISIONALGORITHM_SRC}/algorithm/FindClosestProximityAlgorithm.h + ${COLLISIONALGORITHM_SRC}/algorithm/InsertionAlgorithm.h + + ${COLLISIONALGORITHM_SRC}/broadphase/AABBBroadPhase.h + ${COLLISIONALGORITHM_SRC}/broadphase/FullAABBBroadPhase.h + + ${COLLISIONALGORITHM_SRC}/elements/EdgeElement.h + ${COLLISIONALGORITHM_SRC}/elements/PointElement.h + ${COLLISIONALGORITHM_SRC}/elements/TetrahedronElement.h + ${COLLISIONALGORITHM_SRC}/elements/TriangleElement.h + + ${COLLISIONALGORITHM_SRC}/filters/DistanceFilter.h + + ${COLLISIONALGORITHM_SRC}/geometry/EdgeGeometry.h + ${COLLISIONALGORITHM_SRC}/geometry/PointGeometry.h + ${COLLISIONALGORITHM_SRC}/geometry/SubsetGeometry.h + ${COLLISIONALGORITHM_SRC}/geometry/TetrahedronGeometry.h + ${COLLISIONALGORITHM_SRC}/geometry/TriangleGeometry.h + + ${COLLISIONALGORITHM_SRC}/operations/CreateCenterProximity.h + ${COLLISIONALGORITHM_SRC}/operations/FindClosestProximity.h + ${COLLISIONALGORITHM_SRC}/operations/Project.h + + ${COLLISIONALGORITHM_SRC}/proximity/EdgeProximity.h + ${COLLISIONALGORITHM_SRC}/proximity/FixedProximity.h + ${COLLISIONALGORITHM_SRC}/proximity/MechanicalProximity.h + ${COLLISIONALGORITHM_SRC}/proximity/MultiProximity.h + ${COLLISIONALGORITHM_SRC}/proximity/PointProximity.h + ${COLLISIONALGORITHM_SRC}/proximity/TetrahedronProximity.h + ${COLLISIONALGORITHM_SRC}/proximity/TriangleProximity.h + + ${COLLISIONALGORITHM_SRC}/toolbox/EdgeToolBox.h + ${COLLISIONALGORITHM_SRC}/toolbox/PointToolBox.h + ${COLLISIONALGORITHM_SRC}/toolbox/TetrahedronToolBox.h + ${COLLISIONALGORITHM_SRC}/toolbox/TriangleToolBox.h +) + +set(SOURCE_FILES + ${COLLISIONALGORITHM_SRC}/initPlugin.cpp + + ${COLLISIONALGORITHM_SRC}/CollisionPipeline.cpp + + ${COLLISIONALGORITHM_SRC}/algorithm/Find2DClosestProximityAlgorithm.cpp + ${COLLISIONALGORITHM_SRC}/algorithm/FindClosestProximityAlgorithm.cpp + ${COLLISIONALGORITHM_SRC}/algorithm/InsertionAlgorithm.cpp + + ${COLLISIONALGORITHM_SRC}/broadphase/AABBBroadPhase.cpp + ${COLLISIONALGORITHM_SRC}/broadphase/FullAABBBroadPhase.cpp + + ${COLLISIONALGORITHM_SRC}/elements/EdgeElement.cpp + ${COLLISIONALGORITHM_SRC}/elements/PointElement.cpp + ${COLLISIONALGORITHM_SRC}/elements/TetrahedronElement.cpp + ${COLLISIONALGORITHM_SRC}/elements/TriangleElement.cpp -set_source_files_properties(${IGNORED_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) + ${COLLISIONALGORITHM_SRC}/filters/DistanceFilter.cpp + + ${COLLISIONALGORITHM_SRC}/geometry/EdgeGeometry.cpp + ${COLLISIONALGORITHM_SRC}/geometry/PointGeometry.cpp + ${COLLISIONALGORITHM_SRC}/geometry/SubsetGeometry.cpp + ${COLLISIONALGORITHM_SRC}/geometry/TetrahedronGeometry.cpp + ${COLLISIONALGORITHM_SRC}/geometry/TriangleGeometry.cpp + + ${COLLISIONALGORITHM_SRC}/operations/CreateCenterProximity.cpp + ${COLLISIONALGORITHM_SRC}/operations/FindClosestProximity.cpp + ${COLLISIONALGORITHM_SRC}/operations/Project.cpp + + ${COLLISIONALGORITHM_SRC}/toolbox/EdgeToolBox.cpp + ${COLLISIONALGORITHM_SRC}/toolbox/PointToolBox.cpp + ${COLLISIONALGORITHM_SRC}/toolbox/TetrahedronToolBox.cpp + ${COLLISIONALGORITHM_SRC}/toolbox/TriangleToolBox.cpp +) add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${HEADER_FILES} ${README_FILES}) From cd45f8a57e098fd86cce170f5207aa647b7a2661 Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Mon, 15 Sep 2025 13:44:01 +0200 Subject: [PATCH 14/15] [src] Add config.h - use init plugin mechanism - register symbols using *_API macro --- CMakeLists.txt | 7 +++-- src/CollisionAlgorithm/config.h.in | 19 +++++++++++++ ...tPlugin.cpp => initCollisionAlgorithm.cpp} | 28 +++++++++---------- .../initCollisionAlgorithm.h | 7 +++++ 4 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 src/CollisionAlgorithm/config.h.in rename src/CollisionAlgorithm/{initPlugin.cpp => initCollisionAlgorithm.cpp} (79%) create mode 100644 src/CollisionAlgorithm/initCollisionAlgorithm.h diff --git a/CMakeLists.txt b/CMakeLists.txt index ec310ed2..82d9c8ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.12) project(CollisionAlgorithm VERSION 0.1 LANGUAGES CXX) -set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - find_package(Sofa.Simulation.Core REQUIRED) find_package(Sofa.Component.StateContainer REQUIRED) find_package(Sofa.Component.Constraint.Lagrangian.Solver REQUIRED) @@ -11,6 +9,9 @@ find_package(Sofa.GL REQUIRED) set(COLLISIONALGORITHM_SRC "src/${PROJECT_NAME}") set(HEADER_FILES + ${COLLISIONALGORITHM_SRC}/config.h.in + ${COLLISIONALGORITHM_SRC}/initCollisionAlgorithm.h + ${COLLISIONALGORITHM_SRC}/BaseAABBBroadPhase.h ${COLLISIONALGORITHM_SRC}/BaseAlgorithm.h ${COLLISIONALGORITHM_SRC}/BaseElement.h @@ -61,7 +62,7 @@ set(HEADER_FILES ) set(SOURCE_FILES - ${COLLISIONALGORITHM_SRC}/initPlugin.cpp + ${COLLISIONALGORITHM_SRC}/initCollisionAlgorithm.cpp ${COLLISIONALGORITHM_SRC}/CollisionPipeline.cpp diff --git a/src/CollisionAlgorithm/config.h.in b/src/CollisionAlgorithm/config.h.in new file mode 100644 index 00000000..6410d2b9 --- /dev/null +++ b/src/CollisionAlgorithm/config.h.in @@ -0,0 +1,19 @@ +#pragma once + +#include +#include + +#define COLLISIONALGORITHM_VERSION @PROJECT_VERSION@ + +#ifdef SOFA_BUILD_COLLISIONALGORITHM +# define SOFA_TARGET @PROJECT_NAME@ +# define SOFA_COLLISIONALGORITHM_API SOFA_EXPORT_DYNAMIC_LIBRARY +#else +# define SOFA_COLLISIONALGORITHM_API SOFA_IMPORT_DYNAMIC_LIBRARY +#endif + +namespace sofa::collisionalgorithm +{ + constexpr const char* MODULE_NAME = "@PROJECT_NAME@"; + constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@"; +} diff --git a/src/CollisionAlgorithm/initPlugin.cpp b/src/CollisionAlgorithm/initCollisionAlgorithm.cpp similarity index 79% rename from src/CollisionAlgorithm/initPlugin.cpp rename to src/CollisionAlgorithm/initCollisionAlgorithm.cpp index 7b4c56b1..ba5b0849 100644 --- a/src/CollisionAlgorithm/initPlugin.cpp +++ b/src/CollisionAlgorithm/initCollisionAlgorithm.cpp @@ -1,3 +1,5 @@ +#include + #include #include #include @@ -34,21 +36,15 @@ extern void registerPointGeometry(sofa::core::ObjectFactory* factory); extern void registerEdgeGeometry(sofa::core::ObjectFactory* factory); extern void registerTriangleGeometry(sofa::core::ObjectFactory* factory); extern void registerTetrahedronGeometry(sofa::core::ObjectFactory* factory); -} // namespace sofa::collisionalgorithm - -namespace sofa::component -{ - -// Here are just several convenient functions to help user to know what contains the plugin extern "C" { - void initExternalModule(); - const char* getModuleName(); - const char* getModuleVersion(); - const char* getModuleLicense(); - const char* getModuleDescription(); - void registerObjects(sofa::core::ObjectFactory* factory); + SOFA_COLLISIONALGORITHM_API void initExternalModule(); + SOFA_COLLISIONALGORITHM_API const char* getModuleName(); + SOFA_COLLISIONALGORITHM_API const char* getModuleVersion(); + SOFA_COLLISIONALGORITHM_API const char* getModuleLicense(); + SOFA_COLLISIONALGORITHM_API const char* getModuleDescription(); + SOFA_COLLISIONALGORITHM_API void registerObjects(sofa::core::ObjectFactory* factory); } void initCollisionAlgorithm() @@ -56,6 +52,9 @@ void initCollisionAlgorithm() static bool first = true; if (first) { + // make sure that this plugin is registered into the PluginManager + sofa::helper::system::PluginManager::getInstance().registerPlugin(MODULE_NAME); + first = false; #ifdef PLUGIN_DATA_DIR sofa::helper::system::DataRepository.addLastPath(std::string(QUOTE(PLUGIN_DATA_DIR))); @@ -70,7 +69,7 @@ void initExternalModule() initCollisionAlgorithm(); } -const char* getModuleName() { return "CollisionAlgorithm"; } +const char* getModuleName() { return MODULE_NAME; } const char* getModuleVersion() { @@ -87,7 +86,6 @@ const char* getModuleDescription() { return "Plugin for collision detection"; } void registerObjects(sofa::core::ObjectFactory* factory) { - using namespace sofa::collisionalgorithm; // Register CollisionPipeline registerCollisionLoop(factory); // Register Algorithms @@ -107,4 +105,4 @@ void registerObjects(sofa::core::ObjectFactory* factory) registerTetrahedronGeometry(factory); } -} // namespace sofa::component +} // namespace collisionalgorithm diff --git a/src/CollisionAlgorithm/initCollisionAlgorithm.h b/src/CollisionAlgorithm/initCollisionAlgorithm.h new file mode 100644 index 00000000..d6a9e848 --- /dev/null +++ b/src/CollisionAlgorithm/initCollisionAlgorithm.h @@ -0,0 +1,7 @@ +#pragma once +#include + +namespace collisionalgorithm +{ + void SOFA_COLLISIONALGORITHM_API initCollisionAlgorithm(); +} // namespace collisionalgorithm From e042ea61230d3b6262123fce21fa7a199c65212e Mon Sep 17 00:00:00 2001 From: Themis Skamagkis Date: Thu, 18 Sep 2025 22:05:16 +0200 Subject: [PATCH 15/15] [cmake] Add missing headers & sources of operations classes to CMakeLists --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 82d9c8ba..37ba1ed4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,6 +46,8 @@ set(HEADER_FILES ${COLLISIONALGORITHM_SRC}/operations/CreateCenterProximity.h ${COLLISIONALGORITHM_SRC}/operations/FindClosestProximity.h ${COLLISIONALGORITHM_SRC}/operations/Project.h + ${COLLISIONALGORITHM_SRC}/operations/ContainsPoint.h + ${COLLISIONALGORITHM_SRC}/operations/NeedleOperations.h ${COLLISIONALGORITHM_SRC}/proximity/EdgeProximity.h ${COLLISIONALGORITHM_SRC}/proximity/FixedProximity.h @@ -89,6 +91,8 @@ set(SOURCE_FILES ${COLLISIONALGORITHM_SRC}/operations/CreateCenterProximity.cpp ${COLLISIONALGORITHM_SRC}/operations/FindClosestProximity.cpp ${COLLISIONALGORITHM_SRC}/operations/Project.cpp + ${COLLISIONALGORITHM_SRC}/operations/ContainsPoint.cpp + ${COLLISIONALGORITHM_SRC}/operations/NeedleOperations.cpp ${COLLISIONALGORITHM_SRC}/toolbox/EdgeToolBox.cpp ${COLLISIONALGORITHM_SRC}/toolbox/PointToolBox.cpp