Skip to content

Cleanup the plugin and fix compilation #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alxbilger merged 4 commits into from
Apr 30, 2025
Merged

Cleanup the plugin and fix compilation #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
215fcc9
Remove unnecessary includes to ConstantForceField.h
alxbilger Apr 30, 2025
bb150d4
Missing Sofa.Component.Mapping.Linear package
alxbilger Apr 30, 2025
ac4ecdf
sort lines
alxbilger Apr 30, 2025
fde882c
cleaning dependencies
alxbilger Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 4 additions & 24 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +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.StateContainer REQUIRED)
sofa_find_package(Sofa.Component.Mapping.NonLinear 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.Component.StateContainer REQUIRED)
sofa_find_package(Sofa.Component.Mapping.Linear REQUIRED)
sofa_find_package(Sofa.GL REQUIRED)

set(README_FILE README.md)

Expand Down Expand Up @@ -120,20 +112,8 @@ 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.Constraint.Lagrangian.Model
Sofa.Component.Constraint.Lagrangian.Solver
Sofa.Component.Constraint.Lagrangian
Sofa.Component.Constraint.Projective
Sofa.Component.Mass
Sofa.Component.SolidMechanics.Spring
Sofa.Component.MechanicalLoad
Sofa.Component.LinearSolver.Iterative
Sofa.Component.ODESolver.Backward
Sofa.Component.Engine.Select
Sofa.Component.Mapping.Linear
Sofa.GL
)

sofa_create_package_with_targets(
Expand Down
11 changes: 5 additions & 6 deletions src/Shell/mapping/BendingPlateMechanicalMapping.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,18 @@
#pragma once
#include <Shell/mapping/BendingPlateMechanicalMapping.h>
#include <sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.h>
#include <sofa/component/collision/detection/intersection/MinProximityIntersection.h>
// #include <sofa/component/collision/detection/intersection/MinProximityIntersection.h>
#include <sofa/core/visual/VisualParams.h>

#include <sofa/component/collision/detection/intersection/MinProximityIntersection.h>
#include <sofa/component/collision/detection/intersection/MeshMinProximityIntersection.h>
// #include <sofa/component/collision/detection/intersection/MinProximityIntersection.h>
// #include <sofa/component/collision/detection/intersection/MeshMinProximityIntersection.h>

#include <sofa/component/mechanicalload/ConstantForceField.h>

namespace sofa::component::mapping
{

using namespace sofa::component::collision;

// using namespace sofa::component::collision;
//

template <class TIn, class TOut>
void BendingPlateMechanicalMapping<TIn, TOut>::init()
Expand Down
5 changes: 0 additions & 5 deletions src/Shell/mapping/BezierTriangleMechanicalMapping.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,8 @@

#include <Shell/mapping/BezierTriangleMechanicalMapping.h>
#include <sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.h>
#include <sofa/component/collision/detection/intersection/MinProximityIntersection.h>
#include <sofa/core/visual/VisualParams.h>

#include <sofa/component/mechanicalload/ConstantForceField.h>


namespace sofa
{

Expand All @@ -42,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
Expand Down
4 changes: 0 additions & 4 deletions src/Shell/shells2/mapping/BezierShellMechanicalMapping.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,8 @@
#include <Shell/misc/PointProjection.h>

#include <sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.h>
#include <sofa/component/collision/detection/intersection/MinProximityIntersection.h>
#include <sofa/core/ConstraintParams.h>

#include <sofa/component/mechanicalload/ConstantForceField.h>

// We have own code to check the getJ() because checkJacobian sucks (at this
// point in time).
//#define CHECK_J
Expand All @@ -48,7 +45,6 @@ namespace component
namespace mapping
{

using namespace sofa::component::collision;
using namespace sofa::helper;


Expand Down
Loading