From 215fcc9ba2f17a74bceae2ef3a3e1ea0ddd9ffc0 Mon Sep 17 00:00:00 2001 From: Alex Bilger Date: Wed, 30 Apr 2025 15:26:04 +0200 Subject: [PATCH 1/4] Remove unnecessary includes to ConstantForceField.h --- src/Shell/mapping/BendingPlateMechanicalMapping.inl | 1 - src/Shell/mapping/BezierTriangleMechanicalMapping.inl | 3 --- src/Shell/shells2/mapping/BezierShellMechanicalMapping.inl | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/Shell/mapping/BendingPlateMechanicalMapping.inl b/src/Shell/mapping/BendingPlateMechanicalMapping.inl index 211af25..42686e2 100644 --- a/src/Shell/mapping/BendingPlateMechanicalMapping.inl +++ b/src/Shell/mapping/BendingPlateMechanicalMapping.inl @@ -31,7 +31,6 @@ #include #include -#include namespace sofa::component::mapping { diff --git a/src/Shell/mapping/BezierTriangleMechanicalMapping.inl b/src/Shell/mapping/BezierTriangleMechanicalMapping.inl index ed3105f..9836ef2 100644 --- a/src/Shell/mapping/BezierTriangleMechanicalMapping.inl +++ b/src/Shell/mapping/BezierTriangleMechanicalMapping.inl @@ -30,9 +30,6 @@ #include #include -#include - - namespace sofa { diff --git a/src/Shell/shells2/mapping/BezierShellMechanicalMapping.inl b/src/Shell/shells2/mapping/BezierShellMechanicalMapping.inl index 6f37433..ecb1890 100644 --- a/src/Shell/shells2/mapping/BezierShellMechanicalMapping.inl +++ b/src/Shell/shells2/mapping/BezierShellMechanicalMapping.inl @@ -33,8 +33,6 @@ #include #include -#include - // We have own code to check the getJ() because checkJacobian sucks (at this // point in time). //#define CHECK_J From bb150d4c2b6010973b561c084ff12b2dd59f8747 Mon Sep 17 00:00:00 2001 From: Alex Bilger Date: Wed, 30 Apr 2025 15:36:07 +0200 Subject: [PATCH 2/4] Missing Sofa.Component.Mapping.Linear package --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d2b9dcc..73f8aac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ sofa_find_package(Sofa.Simulation.Core REQUIRED) sofa_find_package(Sofa.Component.Controller REQUIRED) sofa_find_package(Sofa.Component.StateContainer REQUIRED) sofa_find_package(Sofa.Component.Mapping.NonLinear REQUIRED) +sofa_find_package(Sofa.Component.Mapping.Linear REQUIRED) sofa_find_package(Sofa.Component.Constraint REQUIRED) sofa_find_package(Sofa.Component.Constraint.Lagrangian REQUIRED) sofa_find_package(Sofa.Component.Constraint.Lagrangian.Model REQUIRED) @@ -123,6 +124,7 @@ target_link_libraries(${PROJECT_NAME} Sofa.GL Sofa.Component.Collision.Detection.Intersection Sofa.Component.Mapping.NonLinear + Sofa.Component.Mapping.Linear Sofa.Component.Constraint.Lagrangian.Model Sofa.Component.Constraint.Lagrangian.Solver Sofa.Component.Constraint.Lagrangian @@ -133,7 +135,6 @@ target_link_libraries(${PROJECT_NAME} Sofa.Component.LinearSolver.Iterative Sofa.Component.ODESolver.Backward Sofa.Component.Engine.Select - Sofa.Component.Mapping.Linear ) sofa_create_package_with_targets( From ac4ecdf762b0d6889ef8905f47464d97b72d13d4 Mon Sep 17 00:00:00 2001 From: Alex Bilger Date: Wed, 30 Apr 2025 16:01:12 +0200 Subject: [PATCH 3/4] sort lines --- CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73f8aac..1603ef2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,23 +118,23 @@ add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES} ${README_FILE # Link the plugin library to its dependency(ies). target_link_libraries(${PROJECT_NAME} - Sofa.Component.Controller - Sofa.Component.Topology.Container.Dynamic - Sofa.Component.StateContainer - Sofa.GL Sofa.Component.Collision.Detection.Intersection - Sofa.Component.Mapping.NonLinear - Sofa.Component.Mapping.Linear + Sofa.Component.Constraint.Lagrangian Sofa.Component.Constraint.Lagrangian.Model Sofa.Component.Constraint.Lagrangian.Solver - Sofa.Component.Constraint.Lagrangian Sofa.Component.Constraint.Projective + Sofa.Component.Controller + Sofa.Component.Engine.Select + Sofa.Component.LinearSolver.Iterative + Sofa.Component.Mapping.Linear + Sofa.Component.Mapping.NonLinear Sofa.Component.Mass - Sofa.Component.SolidMechanics.Spring Sofa.Component.MechanicalLoad - Sofa.Component.LinearSolver.Iterative Sofa.Component.ODESolver.Backward - Sofa.Component.Engine.Select + Sofa.Component.SolidMechanics.Spring + Sofa.Component.StateContainer + Sofa.Component.Topology.Container.Dynamic + Sofa.GL ) sofa_create_package_with_targets( From fde882c52dafbe398dadc90632b8a214d26a11f8 Mon Sep 17 00:00:00 2001 From: Alex Bilger Date: Wed, 30 Apr 2025 16:14:23 +0200 Subject: [PATCH 4/4] cleaning dependencies --- CMakeLists.txt | 29 +++---------------- .../mapping/BendingPlateMechanicalMapping.inl | 10 +++---- .../BezierTriangleMechanicalMapping.inl | 2 -- .../mapping/BezierShellMechanicalMapping.inl | 2 -- 4 files changed, 9 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1603ef2..46c2b1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,20 +3,11 @@ project(Shell VERSION 1.0 LANGUAGES CXX) # Find and load CMake configuration of packages containing this plugin's dependencies find_package(Sofa.Config REQUIRED) -sofa_find_package(Sofa.GL REQUIRED) -sofa_find_package(Sofa.Type REQUIRED) -sofa_find_package(Sofa.Geometry REQUIRED) -sofa_find_package(Sofa.Simulation.Core REQUIRED) sofa_find_package(Sofa.Component.Controller REQUIRED) +sofa_find_package(Sofa.Component.Topology.Container.Dynamic REQUIRED) sofa_find_package(Sofa.Component.StateContainer REQUIRED) -sofa_find_package(Sofa.Component.Mapping.NonLinear REQUIRED) sofa_find_package(Sofa.Component.Mapping.Linear REQUIRED) -sofa_find_package(Sofa.Component.Constraint REQUIRED) -sofa_find_package(Sofa.Component.Constraint.Lagrangian REQUIRED) -sofa_find_package(Sofa.Component.Constraint.Lagrangian.Model REQUIRED) -sofa_find_package(Sofa.Component.Constraint.Lagrangian.Solver REQUIRED) -sofa_find_package(Sofa.Component.Topology.Container.Dynamic REQUIRED) -sofa_find_package(Sofa.Component.Collision.Detection.Intersection REQUIRED) +sofa_find_package(Sofa.GL REQUIRED) set(README_FILE README.md) @@ -118,22 +109,10 @@ add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES} ${README_FILE # Link the plugin library to its dependency(ies). target_link_libraries(${PROJECT_NAME} - Sofa.Component.Collision.Detection.Intersection - Sofa.Component.Constraint.Lagrangian - Sofa.Component.Constraint.Lagrangian.Model - Sofa.Component.Constraint.Lagrangian.Solver - Sofa.Component.Constraint.Projective Sofa.Component.Controller - Sofa.Component.Engine.Select - Sofa.Component.LinearSolver.Iterative - Sofa.Component.Mapping.Linear - Sofa.Component.Mapping.NonLinear - Sofa.Component.Mass - Sofa.Component.MechanicalLoad - Sofa.Component.ODESolver.Backward - Sofa.Component.SolidMechanics.Spring - Sofa.Component.StateContainer Sofa.Component.Topology.Container.Dynamic + Sofa.Component.StateContainer + Sofa.Component.Mapping.Linear Sofa.GL ) diff --git a/src/Shell/mapping/BendingPlateMechanicalMapping.inl b/src/Shell/mapping/BendingPlateMechanicalMapping.inl index 42686e2..c41f4aa 100644 --- a/src/Shell/mapping/BendingPlateMechanicalMapping.inl +++ b/src/Shell/mapping/BendingPlateMechanicalMapping.inl @@ -25,18 +25,18 @@ #pragma once #include #include -#include +// #include #include -#include -#include +// #include +// #include namespace sofa::component::mapping { -using namespace sofa::component::collision; - +// using namespace sofa::component::collision; +// template void BendingPlateMechanicalMapping::init() diff --git a/src/Shell/mapping/BezierTriangleMechanicalMapping.inl b/src/Shell/mapping/BezierTriangleMechanicalMapping.inl index 9836ef2..80849e2 100644 --- a/src/Shell/mapping/BezierTriangleMechanicalMapping.inl +++ b/src/Shell/mapping/BezierTriangleMechanicalMapping.inl @@ -27,7 +27,6 @@ #include #include -#include #include namespace sofa @@ -39,7 +38,6 @@ namespace component namespace mapping { -using namespace sofa::component::collision; using namespace sofa::helper; // Returns the skew-symetric matrix for computing a cross-product with the diff --git a/src/Shell/shells2/mapping/BezierShellMechanicalMapping.inl b/src/Shell/shells2/mapping/BezierShellMechanicalMapping.inl index ecb1890..b5d8af9 100644 --- a/src/Shell/shells2/mapping/BezierShellMechanicalMapping.inl +++ b/src/Shell/shells2/mapping/BezierShellMechanicalMapping.inl @@ -30,7 +30,6 @@ #include #include -#include #include // We have own code to check the getJ() because checkJacobian sucks (at this @@ -46,7 +45,6 @@ namespace component namespace mapping { -using namespace sofa::component::collision; using namespace sofa::helper;