diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/CompositeCollisionPipeline.cpp b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/CompositeCollisionPipeline.cpp index e50d6e6b0e8..451baac44ce 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/CompositeCollisionPipeline.cpp +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/CompositeCollisionPipeline.cpp @@ -30,8 +30,8 @@ #include #include -#include -#include +#include +#include #include using sofa::helper::ScopedAdvancedTimer ; diff --git a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/CCDTightInclusionIntersection.cpp b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/CCDTightInclusionIntersection.cpp index b47dc1c0486..2b95fa64f69 100644 --- a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/CCDTightInclusionIntersection.cpp +++ b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/CCDTightInclusionIntersection.cpp @@ -28,8 +28,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/CCDTightInclusionIntersection.h b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/CCDTightInclusionIntersection.h index b3e28edc281..3d8c591903d 100644 --- a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/CCDTightInclusionIntersection.h +++ b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/CCDTightInclusionIntersection.h @@ -24,12 +24,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace sofa::component::collision::detection::intersection { diff --git a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CubeModel.h b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CubeModel.h index 341b7b634b2..c703f787427 100644 --- a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CubeModel.h +++ b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CubeModel.h @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/CubeCollisionModel.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/CubeCollisionModel.h") diff --git a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CylinderModel.h b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CylinderModel.h index abca762f4bd..78db05df13f 100644 --- a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CylinderModel.h +++ b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CylinderModel.h @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/CylinderCollisionModel.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/CylinderCollisionModel.h") diff --git a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CylinderModel.inl b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CylinderModel.inl index 92dac1a8181..c54d3ba3a7f 100644 --- a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CylinderModel.inl +++ b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/CylinderModel.inl @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/CylinderCollisionModel.inl") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/CylinderCollisionModel.inl") diff --git a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/LineModel.h b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/LineModel.h index e882808ec73..52f07883160 100644 --- a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/LineModel.h +++ b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/LineModel.h @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/LineCollisionModel.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/LineCollisionModel.h") diff --git a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/LineModel.inl b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/LineModel.inl index 0bc7e55dae2..879da4f6782 100644 --- a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/LineModel.inl +++ b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/LineModel.inl @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/LineCollisionModel.inl") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/LineCollisionModel.inl") diff --git a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/PointModel.h b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/PointModel.h index 0bdfc7b1498..850c1ca2861 100644 --- a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/PointModel.h +++ b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/PointModel.h @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/PointCollisionModel.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/PointCollisionModel.h") diff --git a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/PointModel.inl b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/PointModel.inl index 63efc74c418..8f0c44dc32e 100644 --- a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/PointModel.inl +++ b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/PointModel.inl @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/PointCollisionModel.inl") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/PointCollisionModel.inl") diff --git a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/RayModel.h b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/RayModel.h index 0d60c925bf8..0d0852036fc 100644 --- a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/RayModel.h +++ b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/RayModel.h @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/RayCollisionModel.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/RayCollisionModel.h") diff --git a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/SphereModel.h b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/SphereModel.h index 68e7b4d4cd1..6d529135241 100644 --- a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/SphereModel.h +++ b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/SphereModel.h @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/SphereCollisionModel.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/SphereCollisionModel.h") diff --git a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/SphereModel.inl b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/SphereModel.inl index df2112185c4..19b340097c6 100644 --- a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/SphereModel.inl +++ b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/SphereModel.inl @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/SphereCollisionModel.inl") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/SphereCollisionModel.inl") diff --git a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TetrahedronModel.h b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TetrahedronModel.h index cacaa78f345..03648a8462e 100644 --- a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TetrahedronModel.h +++ b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TetrahedronModel.h @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/TetrahedronCollisionModel.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/TetrahedronCollisionModel.h") diff --git a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TriangleModel.h b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TriangleModel.h index 19f66fdc56d..7268699fc1f 100644 --- a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TriangleModel.h +++ b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TriangleModel.h @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/TriangleCollisionModel.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/TriangleCollisionModel.h") diff --git a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TriangleModel.inl b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TriangleModel.inl index 6619e425575..e4922e44b3f 100644 --- a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TriangleModel.inl +++ b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TriangleModel.inl @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/TriangleCollisionModel.inl") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/TriangleCollisionModel.inl") diff --git a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TriangleOctreeModel.h b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TriangleOctreeModel.h index 302f392ac54..ab2626dfe09 100644 --- a/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TriangleOctreeModel.h +++ b/Sofa/Component/Collision/Geometry/compat/sofa/component/collision/geometry/TriangleOctreeModel.h @@ -23,4 +23,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/component/collision/geometry/TriangleOctreeModel.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/component/collision/geometry/TriangleOctreeModel.h") diff --git a/Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp b/Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp index 5ade720388d..1e100b58086 100644 --- a/Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp +++ b/Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp @@ -44,7 +44,7 @@ using sofa::component::collision::detection::intersection::MinProximityIntersect using sofa::core::execparams::defaultInstance; using sofa::core::objectmodel::New; -#include +#include using sofa::component::collision::geometry::Sphere; using sofa::component::collision::geometry::SphereCollisionModel ; using sofa::component::collision::geometry::RigidSphere; diff --git a/Sofa/Component/Collision/Geometry/tests/Triangle_test.cpp b/Sofa/Component/Collision/Geometry/tests/Triangle_test.cpp index 0727f317683..6dc849851c1 100644 --- a/Sofa/Component/Collision/Geometry/tests/Triangle_test.cpp +++ b/Sofa/Component/Collision/Geometry/tests/Triangle_test.cpp @@ -27,11 +27,11 @@ using sofa::component::collision::detection::intersection::MeshMinProximityInter #include using sofa::component::collision::detection::intersection::MeshNewProximityIntersection; -#include +#include using sofa::core::execparams::defaultInstance; using sofa::core::objectmodel::New; -#include +#include using sofa::component::collision::geometry::Sphere; using sofa::component::collision::geometry::SphereCollisionModel; using sofa::component::collision::geometry::RigidSphere; diff --git a/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/MeshPrimitiveCreator.h b/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/MeshPrimitiveCreator.h index 46453a04828..19dbf5c4243 100644 --- a/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/MeshPrimitiveCreator.h +++ b/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/MeshPrimitiveCreator.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include using sofa::simulation::Node; diff --git a/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/SpherePrimitiveCreator.h b/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/SpherePrimitiveCreator.h index e183b99276e..1abb87c9bef 100644 --- a/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/SpherePrimitiveCreator.h +++ b/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/SpherePrimitiveCreator.h @@ -23,7 +23,7 @@ #include -#include +#include #include using sofa::simulation::Node; diff --git a/Sofa/framework/Geometry/src/sofa/geometry/Pentahedron.h b/Sofa/framework/Geometry/src/sofa/geometry/Pentahedron.h index e6c85ac4348..53bc158c90d 100644 --- a/Sofa/framework/Geometry/src/sofa/geometry/Pentahedron.h +++ b/Sofa/framework/Geometry/src/sofa/geometry/Pentahedron.h @@ -24,4 +24,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/geometry/Prism.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/geometry/Prism.h") diff --git a/Sofa/framework/Simulation/Core/CMakeLists.txt b/Sofa/framework/Simulation/Core/CMakeLists.txt index d1ce0ecd4d9..ddf07a26ff3 100644 --- a/Sofa/framework/Simulation/Core/CMakeLists.txt +++ b/Sofa/framework/Simulation/Core/CMakeLists.txt @@ -148,7 +148,6 @@ set(HEADER_FILES set(SOURCE_FILES ${SRC_ROOT}/AnimateBeginEvent.cpp ${SRC_ROOT}/AnimateEndEvent.cpp - ${SRC_ROOT}/AnimateVisitor.cpp ${SRC_ROOT}/BaseMechanicalVisitor.cpp ${SRC_ROOT}/BehaviorUpdatePositionVisitor.cpp ${SRC_ROOT}/CleanupVisitor.cpp diff --git a/Sofa/framework/Simulation/Core/compat/sofa/simulation/CpuTask.h b/Sofa/framework/Simulation/Core/compat/sofa/simulation/CpuTask.h index b61da7e6b29..2720c2d0782 100644 --- a/Sofa/framework/Simulation/Core/compat/sofa/simulation/CpuTask.h +++ b/Sofa/framework/Simulation/Core/compat/sofa/simulation/CpuTask.h @@ -21,4 +21,4 @@ ******************************************************************************/ #pragma once #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/CpuTask.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/CpuTask.h") diff --git a/Sofa/framework/Simulation/Core/compat/sofa/simulation/CpuTaskStatus.h b/Sofa/framework/Simulation/Core/compat/sofa/simulation/CpuTaskStatus.h index f6796a97b36..d8472f6d252 100644 --- a/Sofa/framework/Simulation/Core/compat/sofa/simulation/CpuTaskStatus.h +++ b/Sofa/framework/Simulation/Core/compat/sofa/simulation/CpuTaskStatus.h @@ -21,4 +21,4 @@ ******************************************************************************/ #pragma once #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/CpuTaskStatus.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/CpuTaskStatus.h") diff --git a/Sofa/framework/Simulation/Core/compat/sofa/simulation/DefaultTaskScheduler.h b/Sofa/framework/Simulation/Core/compat/sofa/simulation/DefaultTaskScheduler.h index c46055027d0..d27af83eef5 100644 --- a/Sofa/framework/Simulation/Core/compat/sofa/simulation/DefaultTaskScheduler.h +++ b/Sofa/framework/Simulation/Core/compat/sofa/simulation/DefaultTaskScheduler.h @@ -21,4 +21,4 @@ ******************************************************************************/ #pragma once #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/DefaultTaskScheduler.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/DefaultTaskScheduler.h") diff --git a/Sofa/framework/Simulation/Core/compat/sofa/simulation/InitTasks.h b/Sofa/framework/Simulation/Core/compat/sofa/simulation/InitTasks.h index ad6f653e089..63e15f06d68 100644 --- a/Sofa/framework/Simulation/Core/compat/sofa/simulation/InitTasks.h +++ b/Sofa/framework/Simulation/Core/compat/sofa/simulation/InitTasks.h @@ -21,4 +21,4 @@ ******************************************************************************/ #pragma once #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/InitTasks.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/InitTasks.h") diff --git a/Sofa/framework/Simulation/Core/compat/sofa/simulation/MainTaskSchedulerFactory.h b/Sofa/framework/Simulation/Core/compat/sofa/simulation/MainTaskSchedulerFactory.h index 819a802c53c..52cbdeeab8d 100644 --- a/Sofa/framework/Simulation/Core/compat/sofa/simulation/MainTaskSchedulerFactory.h +++ b/Sofa/framework/Simulation/Core/compat/sofa/simulation/MainTaskSchedulerFactory.h @@ -21,4 +21,4 @@ ******************************************************************************/ #pragma once #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/MainTaskSchedulerFactory.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/MainTaskSchedulerFactory.h") diff --git a/Sofa/framework/Simulation/Core/compat/sofa/simulation/MainTaskSchedulerRegistry.h b/Sofa/framework/Simulation/Core/compat/sofa/simulation/MainTaskSchedulerRegistry.h index e4319fd3354..8ba6f445e7a 100644 --- a/Sofa/framework/Simulation/Core/compat/sofa/simulation/MainTaskSchedulerRegistry.h +++ b/Sofa/framework/Simulation/Core/compat/sofa/simulation/MainTaskSchedulerRegistry.h @@ -21,4 +21,4 @@ ******************************************************************************/ #pragma once #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/MainTaskSchedulerRegistry.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/MainTaskSchedulerRegistry.h") diff --git a/Sofa/framework/Simulation/Core/compat/sofa/simulation/ParallelForEach.h b/Sofa/framework/Simulation/Core/compat/sofa/simulation/ParallelForEach.h index 9f48227e04d..3397174791b 100644 --- a/Sofa/framework/Simulation/Core/compat/sofa/simulation/ParallelForEach.h +++ b/Sofa/framework/Simulation/Core/compat/sofa/simulation/ParallelForEach.h @@ -21,4 +21,4 @@ ******************************************************************************/ #pragma once #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/ParallelForEach.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/ParallelForEach.h") diff --git a/Sofa/framework/Simulation/Core/compat/sofa/simulation/Task.h b/Sofa/framework/Simulation/Core/compat/sofa/simulation/Task.h index 4b580bffcfe..1b699ce7cd1 100644 --- a/Sofa/framework/Simulation/Core/compat/sofa/simulation/Task.h +++ b/Sofa/framework/Simulation/Core/compat/sofa/simulation/Task.h @@ -21,4 +21,4 @@ ******************************************************************************/ #pragma once #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/Task.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/Task.h") diff --git a/Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskScheduler.h b/Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskScheduler.h index e273f2cef58..2b79327f96c 100644 --- a/Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskScheduler.h +++ b/Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskScheduler.h @@ -21,4 +21,4 @@ ******************************************************************************/ #pragma once #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/TaskScheduler.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/TaskScheduler.h") diff --git a/Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskSchedulerFactory.h b/Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskSchedulerFactory.h index 1fe37c13051..0f0f978a38b 100644 --- a/Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskSchedulerFactory.h +++ b/Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskSchedulerFactory.h @@ -21,4 +21,4 @@ ******************************************************************************/ #pragma once #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/TaskSchedulerFactory.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/TaskSchedulerFactory.h") diff --git a/Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskSchedulerRegistry.h b/Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskSchedulerRegistry.h index dd3e59cfa43..3e1a1f1c147 100644 --- a/Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskSchedulerRegistry.h +++ b/Sofa/framework/Simulation/Core/compat/sofa/simulation/TaskSchedulerRegistry.h @@ -21,4 +21,4 @@ ******************************************************************************/ #pragma once #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/TaskSchedulerRegistry.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/TaskSchedulerRegistry.h") diff --git a/Sofa/framework/Simulation/Core/compat/sofa/simulation/WorkerThread.h b/Sofa/framework/Simulation/Core/compat/sofa/simulation/WorkerThread.h index 121d6b98c6e..fbf0a8fb683 100644 --- a/Sofa/framework/Simulation/Core/compat/sofa/simulation/WorkerThread.h +++ b/Sofa/framework/Simulation/Core/compat/sofa/simulation/WorkerThread.h @@ -21,4 +21,4 @@ ******************************************************************************/ #pragma once #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/WorkerThread.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/WorkerThread.h") diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/AnimateVisitor.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/AnimateVisitor.cpp deleted file mode 100644 index 2c07778e0a9..00000000000 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/AnimateVisitor.cpp +++ /dev/null @@ -1,185 +0,0 @@ -/****************************************************************************** -* SOFA, Simulation Open-Framework Architecture * -* (c) 2006 INRIA, USTL, UJF, CNRS, MGH * -* * -* This program is free software; you can redistribute it and/or modify it * -* under the terms of the GNU Lesser General Public License as published by * -* the Free Software Foundation; either version 2.1 of the License, or (at * -* your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, but WITHOUT * -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * -* for more details. * -* * -* You should have received a copy of the GNU Lesser General Public License * -* along with this program. If not, see . * -******************************************************************************* -* Authors: The SOFA Team and external contributors (see Authors.txt) * -* * -* Contact information: contact@sofa-framework.org * -******************************************************************************/ -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -using sofa::simulation::mechanicalvisitor::MechanicalResetConstraintVisitor; - -#include -using sofa::simulation::mechanicalvisitor::MechanicalBeginIntegrationVisitor; - -#include -using sofa::simulation::mechanicalvisitor::MechanicalProjectPositionAndVelocityVisitor; - -#include -using sofa::simulation::mechanicalvisitor::MechanicalPropagateOnlyPositionAndVelocityVisitor; - -#include -using sofa::simulation::mechanicalvisitor::MechanicalEndIntegrationVisitor; - -#include -using sofa::simulation::mechanicalvisitor::MechanicalAccumulateMatrixDeriv; - -#include -using sofa::simulation::mechanicalvisitor::MechanicalBuildConstraintMatrix; - -using namespace sofa::core; - -namespace sofa::simulation -{ - - -AnimateVisitor::AnimateVisitor(const core::ExecParams* params, SReal dt) - : Visitor(params) - , dt(dt) - , firstNodeVisited(false) -{ -} - -void AnimateVisitor::fwdInteractionForceField(simulation::Node*, core::behavior::BaseInteractionForceField* obj) -{ - helper::ScopedAdvancedTimer timer("InteractionFF", obj); - - const MultiVecDerivId ffId = vec_id::write_access::externalForce; - MechanicalParams mparams; - mparams.setDt(this->dt); - obj->addForce(&mparams, ffId); -} - -void AnimateVisitor::processCollisionPipeline(simulation::Node* node, core::collision::Pipeline* obj) -{ - helper::ScopedAdvancedTimer collisionTimer("Collision", obj); - - { - helper::ScopedAdvancedTimer timer("begin collision", obj); - CollisionBeginEvent evBegin; - PropagateEventVisitor eventPropagation( params, &evBegin); - eventPropagation.execute(node->getContext()); - } - - CollisionVisitor act(this->params); - node->execute(&act); - - { - helper::ScopedAdvancedTimer timer("end collision", obj); - CollisionEndEvent evEnd; - PropagateEventVisitor eventPropagation( params, &evEnd); - eventPropagation.execute(node->getContext()); - } -} - -Visitor::Result AnimateVisitor::processNodeTopDown(simulation::Node* node) -{ - if (!node->isActive()) return Visitor::RESULT_PRUNE; - if (node->isSleeping()) return Visitor::RESULT_PRUNE; - if (!firstNodeVisited) - { - firstNodeVisited=true; - - sofa::core::ConstraintParams cparams(*this->params); - MechanicalResetConstraintVisitor resetConstraint(&cparams); - node->execute(&resetConstraint); - } - - if (dt == 0) setDt(node->getDt()); - else node->setDt(dt); - - if (node->collisionPipeline != nullptr) - { - processCollisionPipeline(node, node->collisionPipeline); - } - if (!node->solver.empty() ) - { - sofa::helper::AdvancedTimer::StepVar timer("Mechanical",node); - const SReal nextTime = node->getTime() + dt; - { - IntegrateBeginEvent evBegin; - PropagateEventVisitor eventPropagation( this->params, &evBegin); - eventPropagation.execute(node); - } - - MechanicalBeginIntegrationVisitor beginVisitor(this->params, dt); - node->execute(&beginVisitor); - - sofa::core::MechanicalParams m_mparams(*this->params); - m_mparams.setDt(dt); - - core::ConstraintParams cparams; - { - unsigned int constraintId=0; - MechanicalBuildConstraintMatrix buildConstraintMatrix(&cparams, core::vec_id::write_access::constraintJacobian, constraintId ); - buildConstraintMatrix.execute(node); - } - - { - MechanicalAccumulateMatrixDeriv accumulateMatrixDeriv(&cparams, core::vec_id::write_access::constraintJacobian); - accumulateMatrixDeriv.execute(node); - } - - for( unsigned i=0; isolver.size(); i++ ) - { - ctime_t t0 = begin(node, node->solver[i]); - node->solver[i]->solve(params, getDt()); - end(node, node->solver[i], t0); - } - - MechanicalProjectPositionAndVelocityVisitor(&m_mparams, nextTime, - sofa::core::vec_id::write_access::position, sofa::core::vec_id::write_access::velocity - ).execute( node ); - MechanicalPropagateOnlyPositionAndVelocityVisitor(&m_mparams, nextTime, - vec_id::write_access::position, - vec_id::write_access::velocity).execute( node ); - - MechanicalEndIntegrationVisitor endVisitor(this->params, dt); - node->execute(&endVisitor); - - { - IntegrateEndEvent evBegin; - PropagateEventVisitor eventPropagation(this->params, &evBegin); - eventPropagation.execute(node); - } - - return RESULT_PRUNE; - } - - // process InteractionForceFields - for_each(this, node, node->interactionForceField, &AnimateVisitor::fwdInteractionForceField); - return RESULT_CONTINUE; -} - -} // namespace sofa::simulation - diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/AnimateVisitor.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/AnimateVisitor.h index 6122ad2c3ac..b533f1658ce 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/AnimateVisitor.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/AnimateVisitor.h @@ -22,43 +22,4 @@ #pragma once #include -SOFA_HEADER_DEPRECATED_NOT_REPLACED("v25.12", "v26.06") - -#include -#include -#include -#include - -#include - -namespace sofa::simulation -{ - -class SOFA_SIMULATION_CORE_API SOFA_ATTRIBUTE_DEPRECATED_ANIMATEVISITOR() AnimateVisitor : public Visitor -{ - -protected : - SReal dt; - bool firstNodeVisited; - -public: - AnimateVisitor(const core::ExecParams* params, SReal dt); - - void setDt(SReal v) { dt = v; } - SReal getDt() const { return dt; } - - virtual void processCollisionPipeline(simulation::Node* node, core::collision::Pipeline* obj); - virtual void fwdInteractionForceField(simulation::Node* node, core::behavior::BaseInteractionForceField* obj); - - Result processNodeTopDown(simulation::Node* node) override; - - /// Specify whether this action can be parallelized. - bool isThreadSafe() const override { return true; } - - /// Return a category name for this action. - /// Only used for debugging / profiling purposes - const char* getCategoryName() const override { return "animate"; } - const char* getClassName() const override { return "AnimateVisitor"; } -}; - -} // namespace sofa::simulation +SOFA_HEADER_DISABLED_NOT_REPLACED("v25.12", "v26.06") diff --git a/Sofa/framework/Simulation/Core/test/ParallelForEach_test.cpp b/Sofa/framework/Simulation/Core/test/ParallelForEach_test.cpp index c6b619799ee..fb406929a93 100644 --- a/Sofa/framework/Simulation/Core/test/ParallelForEach_test.cpp +++ b/Sofa/framework/Simulation/Core/test/ParallelForEach_test.cpp @@ -20,9 +20,9 @@ * Contact information: contact@sofa-framework.org * ******************************************************************************/ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/Sofa/framework/Simulation/Core/test/ParallelSparseMatrixProduct_test.cpp b/Sofa/framework/Simulation/Core/test/ParallelSparseMatrixProduct_test.cpp index 4f759de5268..869fd02c606 100644 --- a/Sofa/framework/Simulation/Core/test/ParallelSparseMatrixProduct_test.cpp +++ b/Sofa/framework/Simulation/Core/test/ParallelSparseMatrixProduct_test.cpp @@ -19,8 +19,8 @@ * * * Contact information: contact@sofa-framework.org * ******************************************************************************/ -#include -#include +#include +#include #include #include diff --git a/Sofa/framework/Simulation/Core/test/TaskSchedulerFactory_test.cpp b/Sofa/framework/Simulation/Core/test/TaskSchedulerFactory_test.cpp index 869534497f5..0f975bb142c 100644 --- a/Sofa/framework/Simulation/Core/test/TaskSchedulerFactory_test.cpp +++ b/Sofa/framework/Simulation/Core/test/TaskSchedulerFactory_test.cpp @@ -20,8 +20,8 @@ * Contact information: contact@sofa-framework.org * ******************************************************************************/ #include -#include -#include +#include +#include namespace sofa { diff --git a/Sofa/framework/Simulation/Core/test/TaskSchedulerTestTasks.cpp b/Sofa/framework/Simulation/Core/test/TaskSchedulerTestTasks.cpp index 426c64b2c92..4e3e9c2db0e 100644 --- a/Sofa/framework/Simulation/Core/test/TaskSchedulerTestTasks.cpp +++ b/Sofa/framework/Simulation/Core/test/TaskSchedulerTestTasks.cpp @@ -21,8 +21,8 @@ ******************************************************************************/ #include "TaskSchedulerTestTasks.h" -#include -#include +#include +#include using sofa::simulation::Task; diff --git a/Sofa/framework/Simulation/Core/test/TaskSchedulerTestTasks.h b/Sofa/framework/Simulation/Core/test/TaskSchedulerTestTasks.h index 5327b9e293c..bee568ba011 100644 --- a/Sofa/framework/Simulation/Core/test/TaskSchedulerTestTasks.h +++ b/Sofa/framework/Simulation/Core/test/TaskSchedulerTestTasks.h @@ -19,7 +19,7 @@ * * * Contact information: contact@sofa-framework.org * ******************************************************************************/ -#include +#include namespace sofa { diff --git a/Sofa/framework/Simulation/Core/test/TaskSchedulerTests.cpp b/Sofa/framework/Simulation/Core/test/TaskSchedulerTests.cpp index 86b77e02677..ffb17c48dc0 100644 --- a/Sofa/framework/Simulation/Core/test/TaskSchedulerTests.cpp +++ b/Sofa/framework/Simulation/Core/test/TaskSchedulerTests.cpp @@ -21,9 +21,9 @@ ******************************************************************************/ #include "TaskSchedulerTestTasks.h" -#include -#include -#include +#include +#include +#include #include namespace sofa diff --git a/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGNode.h b/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGNode.h index 8199663db4c..9410c83068d 100644 --- a/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGNode.h +++ b/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGNode.h @@ -24,9 +24,4 @@ #include //header moved in the plugin SofaValidation -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "'sofa/simulation/Node.h' instead of 'sofa/simulation/graph/DAGNode.h' and replace uses of DAGNode with Node") - -namespace sofa::simulation::graph -{ - using DAGNode = sofa::simulation::Node; -} // namespace sofa::simulation::graph +SOFA_HEADER_DISABLED("v25.12", "v26.06", "'sofa/simulation/Node.h' instead of 'sofa/simulation/Node.h' and replace uses of DAGNode with Node") diff --git a/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGSimulation.cpp b/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGSimulation.cpp index baa0bbf1a22..853861fc0d8 100644 --- a/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGSimulation.cpp +++ b/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGSimulation.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/Sofa/framework/Topology/src/sofa/topology/Pentahedron.h b/Sofa/framework/Topology/src/sofa/topology/Pentahedron.h index d48e873a77d..92076ca920b 100644 --- a/Sofa/framework/Topology/src/sofa/topology/Pentahedron.h +++ b/Sofa/framework/Topology/src/sofa/topology/Pentahedron.h @@ -24,4 +24,4 @@ #include #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/topology/Prism.h") +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/topology/Prism.h") diff --git a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletCollisionDetection.h b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletCollisionDetection.h index 3508e5afe32..2ca3161a289 100644 --- a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletCollisionDetection.h +++ b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletCollisionDetection.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "BulletCollisionModel.h" diff --git a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletRigidContactMapper.h b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletRigidContactMapper.h index ec06f11fd8a..4c18b1ad216 100644 --- a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletRigidContactMapper.h +++ b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletRigidContactMapper.h @@ -9,11 +9,11 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletSphereModel.h b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletSphereModel.h index a06fb6a839d..1615e565a54 100644 --- a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletSphereModel.h +++ b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletSphereModel.h @@ -1,7 +1,7 @@ #ifndef BULLET_SPHERE_MODEL #define BULLET_SPHERE_MODEL -#include +#include #include "BulletCollisionModel.h" #include #include diff --git a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletTriangleModel.h b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletTriangleModel.h index 5c7d2c80806..5f58ec0d2ec 100644 --- a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletTriangleModel.h +++ b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletTriangleModel.h @@ -1,7 +1,7 @@ #ifndef BULLET_TRIANGLE_MODEL #define BULLET_TRIANGLE_MODEL -#include +#include #include "BulletCollisionModel.h" #include #include diff --git a/applications/plugins/CollisionOBBCapsule/CollisionOBBCapsule_test/OBB_test.cpp b/applications/plugins/CollisionOBBCapsule/CollisionOBBCapsule_test/OBB_test.cpp index dce0f3df576..a9251831a8f 100644 --- a/applications/plugins/CollisionOBBCapsule/CollisionOBBCapsule_test/OBB_test.cpp +++ b/applications/plugins/CollisionOBBCapsule/CollisionOBBCapsule_test/OBB_test.cpp @@ -24,9 +24,9 @@ #include #include -#include +#include -#include +#include #include using sofa::testing::BaseTest; @@ -143,7 +143,7 @@ bool TestOBB::faceVertex(){ //first, we create the transformation to make the first OBB (which is axes aligned) double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel0 = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -214,7 +214,7 @@ bool TestOBB::vertexVertex(){ angles[1] = acos(1/sqrt(3.0)); angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel0 = makeOBB(Vec3(0,0,-sqrt(3.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel1 = makeOBB(Vec3(0,0,sqrt(3.0) + 0.01),angles,order,Vec3(0,0,-10),Vec3(1,1,1),scn); @@ -253,7 +253,7 @@ bool TestOBB::vertexVertex(){ bool TestOBB::faceFace(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel0 = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel1 = makeOBB(Vec3(0,1,1.01),angles,order,Vec3(0,0,-10),Vec3(1,1,1),scn); @@ -300,7 +300,7 @@ bool TestOBB::faceFace(){ bool TestOBB::faceEdge(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel0 = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); order[0] = 2; @@ -361,7 +361,7 @@ bool TestOBB::edgeEdge(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel0 = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel1 = makeOBB(Vec3(0,0,sqrt(2.0) + 0.01),angles,order,Vec3(0,0,-10),Vec3(1,1,1),scn); @@ -393,7 +393,7 @@ bool TestOBB::edgeVertex(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel0 = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); order[0] = 2; @@ -425,7 +425,7 @@ bool TestCapOBB::faceVertex(){ //first, we create the transformation to make the first OBB (which is axes aligned) double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -465,7 +465,7 @@ bool TestCapOBB::faceEdge(){ //first, we create the transformation to make the first OBB (which is axes aligned) double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -513,7 +513,7 @@ bool TestCapOBB::edgeVertex(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -561,7 +561,7 @@ bool TestCapOBB::edgeEdge(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -610,7 +610,7 @@ bool TestCapOBB::vertexEdge(){ angles[1] = acos(1/sqrt(3.0)); angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(3.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -658,7 +658,7 @@ bool TestCapOBB::vertexVertex(){ angles[1] = acos(1/sqrt(3.0)); angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(3.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -704,7 +704,7 @@ bool TestSphereOBB::vertex(){ angles[1] = acos(1/sqrt(3.0)); angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(3.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -754,7 +754,7 @@ bool TestSphereOBB::edge(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,-10),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -795,7 +795,7 @@ bool TestSphereOBB::face(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -833,7 +833,7 @@ bool TestSphereOBB::face(){ bool TestTriOBB::faceFace(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::geometry::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::geometry::TriangleCollisionModel::FLAG_EDGES; @@ -863,7 +863,7 @@ bool TestTriOBB::faceFace(){ bool TestTriOBB::faceVertex_out(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(-1.01,0,1.01),angles,order,Vec3(0,0,-10),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::geometry::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::geometry::TriangleCollisionModel::FLAG_EDGES; @@ -898,7 +898,7 @@ bool TestTriOBB::faceVertex_out(){ bool TestTriOBB::faceVertex_out2(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(-1.01,0,-1.01),angles,order,Vec3(0,0,10),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::geometry::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::geometry::TriangleCollisionModel::FLAG_EDGES; @@ -933,7 +933,7 @@ bool TestTriOBB::faceVertex_out2(){ bool TestTriOBB::faceEdge(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::geometry::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::geometry::TriangleCollisionModel::FLAG_EDGES; @@ -963,7 +963,7 @@ bool TestTriOBB::faceEdge(){ bool TestTriOBB::faceVertex(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::geometry::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::geometry::TriangleCollisionModel::FLAG_EDGES; @@ -1000,7 +1000,7 @@ bool TestTriOBB::edgeFace(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::geometry::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::geometry::TriangleCollisionModel::FLAG_EDGES; @@ -1037,7 +1037,7 @@ bool TestTriOBB::edgeEdge(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::geometry::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::geometry::TriangleCollisionModel::FLAG_EDGES; @@ -1074,7 +1074,7 @@ bool TestTriOBB::edgeEdge2(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::geometry::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::geometry::TriangleCollisionModel::FLAG_EDGES; @@ -1110,7 +1110,7 @@ bool TestTriOBB::edgeVertex(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::geometry::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::geometry::TriangleCollisionModel::FLAG_EDGES; @@ -1147,7 +1147,7 @@ bool TestTriOBB::vertexFace(){ angles[1] = acos(1/sqrt(3.0)); angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(3.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::geometry::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::geometry::TriangleCollisionModel::FLAG_EDGES; @@ -1184,7 +1184,7 @@ bool TestTriOBB::vertexEdge(){ angles[1] = acos(1/sqrt(3.0)); angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(3.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::geometry::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::geometry::TriangleCollisionModel::FLAG_EDGES; @@ -1221,7 +1221,7 @@ bool TestTriOBB::vertexVertex(){ angles[1] = acos(1/sqrt(3.0)); angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(3.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::geometry::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::geometry::TriangleCollisionModel::FLAG_EDGES; diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/BaseIntTool.h b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/BaseIntTool.h index 6d96a8faca7..3709c18b565 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/BaseIntTool.h +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/BaseIntTool.h @@ -22,7 +22,7 @@ #pragma once #include -#include +#include #include #include diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/CapsuleIntTool.h b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/CapsuleIntTool.h index d3cc1041daa..fc79532fa36 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/CapsuleIntTool.h +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/CapsuleIntTool.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/CapsuleIntersection.cpp b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/CapsuleIntersection.cpp index 86e72e4d2c1..6c386c970b0 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/CapsuleIntersection.cpp +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/CapsuleIntersection.cpp @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrMeshUtility.h b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrMeshUtility.h index 076a8dd274b..1689a44de86 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrMeshUtility.h +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrMeshUtility.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include namespace collisionobbcapsule::detection::intersection diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrSphereOBB.h b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrSphereOBB.h index c4e10f51847..4bf0a5d55a4 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrSphereOBB.h +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrSphereOBB.h @@ -22,7 +22,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrTriangleOBB.h b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrTriangleOBB.h index 504391296b1..f39562f69ac 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrTriangleOBB.h +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrTriangleOBB.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/MeshIntTool.h b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/MeshIntTool.h index 73777b81564..08e34ac80d1 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/MeshIntTool.h +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/MeshIntTool.h @@ -24,10 +24,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/OBBIntersection.cpp b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/OBBIntersection.cpp index 97b3d5a2970..71a27aee12a 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/OBBIntersection.cpp +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/OBBIntersection.cpp @@ -24,10 +24,10 @@ #include #include -#include +#include #include #include -#include +#include #include diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/OBBIntersection.h b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/OBBIntersection.h index cf8d73c9ed6..c125bd095ea 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/OBBIntersection.h +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/OBBIntersection.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/CapsuleModel.inl b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/CapsuleModel.inl index 3d018ecb681..b86192a666d 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/CapsuleModel.inl +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/CapsuleModel.inl @@ -25,7 +25,7 @@ #include #include -#include +#include namespace collisionobbcapsule::geometry { diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/OBBModel.inl b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/OBBModel.inl index d2d9fcc1b39..8d3b066aa56 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/OBBModel.inl +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/OBBModel.inl @@ -22,7 +22,7 @@ #pragma once #include -#include +#include #include #include diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/RigidCapsuleModel.inl b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/RigidCapsuleModel.inl index 50e2101e7bc..465909ef1e9 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/RigidCapsuleModel.inl +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/RigidCapsuleModel.inl @@ -22,7 +22,7 @@ #include #include -#include +#include namespace collisionobbcapsule::geometry { diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/response/contact/OBBContact.cpp b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/response/contact/OBBContact.cpp index 15fcd595c99..e15ae9761fc 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/response/contact/OBBContact.cpp +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/response/contact/OBBContact.cpp @@ -20,10 +20,10 @@ * Contact information: contact@sofa-framework.org * ******************************************************************************/ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/applications/plugins/Geomagic/src/Geomagic/GeomagicEmulator.cpp b/applications/plugins/Geomagic/src/Geomagic/GeomagicEmulator.cpp index 98dc82f22ac..e3af2624358 100644 --- a/applications/plugins/Geomagic/src/Geomagic/GeomagicEmulator.cpp +++ b/applications/plugins/Geomagic/src/Geomagic/GeomagicEmulator.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/applications/plugins/Geomagic/src/Geomagic/GeomagicEmulator.h b/applications/plugins/Geomagic/src/Geomagic/GeomagicEmulator.h index 43421d74433..752de62e950 100644 --- a/applications/plugins/Geomagic/src/Geomagic/GeomagicEmulator.h +++ b/applications/plugins/Geomagic/src/Geomagic/GeomagicEmulator.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include diff --git a/applications/plugins/MultiThreading/compat/MultiThreading/TaskSchedulerUser.h b/applications/plugins/MultiThreading/compat/MultiThreading/TaskSchedulerUser.h index 1b631aee38a..a0089dfc51a 100644 --- a/applications/plugins/MultiThreading/compat/MultiThreading/TaskSchedulerUser.h +++ b/applications/plugins/MultiThreading/compat/MultiThreading/TaskSchedulerUser.h @@ -21,9 +21,4 @@ ******************************************************************************/ #pragma once #include -SOFA_HEADER_DEPRECATED("v25.12", "v26.06", "sofa/simulation/task/TaskSchedulerUser.h") - -namespace multithreading -{ -using TaskSchedulerUser = sofa::simulation::TaskSchedulerUser; -} +SOFA_HEADER_DISABLED("v25.12", "v26.06", "sofa/simulation/task/TaskSchedulerUser.h") \ No newline at end of file diff --git a/applications/plugins/MultiThreading/src/MultiThreading/CollisionAnimationLoop_mt.h b/applications/plugins/MultiThreading/src/MultiThreading/CollisionAnimationLoop_mt.h index f4ae5bf94c6..ed67b44a08f 100644 --- a/applications/plugins/MultiThreading/src/MultiThreading/CollisionAnimationLoop_mt.h +++ b/applications/plugins/MultiThreading/src/MultiThreading/CollisionAnimationLoop_mt.h @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaLineModel.cpp b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaLineModel.cpp index cc37556cf0b..17cab470c5f 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaLineModel.cpp +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaLineModel.cpp @@ -22,7 +22,7 @@ #define SOFA_GPU_CUDA_CUDALINEMODEL_CPP #include -#include +#include #include namespace sofa::component::collision::geometry diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaLineModel.h b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaLineModel.h index 915072a61f6..1a295ac3a08 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaLineModel.h +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaLineModel.h @@ -22,7 +22,7 @@ #pragma once #include -#include +#include namespace sofa::gpu::cuda { diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaPointModel.cpp b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaPointModel.cpp index 63471bb74ce..0bbd34ff324 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaPointModel.cpp +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaPointModel.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include namespace sofa::gpu::cuda { diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaSphereModel.cpp b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaSphereModel.cpp index 2d58f4ebfbd..ec9d96293d4 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaSphereModel.cpp +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaSphereModel.cpp @@ -22,7 +22,7 @@ #define SOFA_GPU_CUDA_CUDASPHEREMODEL_CPP #include -#include +#include #include namespace sofa::component::collision::geometry diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaSphereModel.h b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaSphereModel.h index 1e8c47aaf2e..b0e56887c1f 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaSphereModel.h +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaSphereModel.h @@ -22,7 +22,7 @@ #pragma once #include -#include +#include namespace sofa::gpu::cuda { diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaTriangleModel.cpp b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaTriangleModel.cpp index 1457fc1c353..627028fcacb 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaTriangleModel.cpp +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaTriangleModel.cpp @@ -22,7 +22,7 @@ #define SOFA_GPU_CUDA_CUDATRIANGLEMODEL_CPP #include -#include +#include #include namespace sofa::component::collision::geometry diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaTriangleModel.h b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaTriangleModel.h index bf7bedccf70..1c68438b576 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaTriangleModel.h +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaTriangleModel.h @@ -22,7 +22,7 @@ #pragma once #include -#include +#include namespace sofa::gpu::cuda { diff --git a/applications/plugins/SofaDistanceGrid/extensions/CUDA/src/SofaDistanceGrid/CUDA/CudaDistanceGridCollisionModel.cpp b/applications/plugins/SofaDistanceGrid/extensions/CUDA/src/SofaDistanceGrid/CUDA/CudaDistanceGridCollisionModel.cpp index f38b4666a3d..b421b1ddc95 100644 --- a/applications/plugins/SofaDistanceGrid/extensions/CUDA/src/SofaDistanceGrid/CUDA/CudaDistanceGridCollisionModel.cpp +++ b/applications/plugins/SofaDistanceGrid/extensions/CUDA/src/SofaDistanceGrid/CUDA/CudaDistanceGridCollisionModel.cpp @@ -23,7 +23,7 @@ #include "CudaDistanceGridCollisionModel.h" #include #include -#include +#include #include #include #if SOFACUDA_HAVE_MINIFLOWVR diff --git a/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/BroadPhase_test.h b/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/BroadPhase_test.h index 6679566aa43..2391ca60da3 100644 --- a/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/BroadPhase_test.h +++ b/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/BroadPhase_test.h @@ -23,7 +23,7 @@ #define SOFA_STANDARDTEST_BroadPhase_test_H #include -#include +#include #include #include @@ -474,7 +474,7 @@ bool BroadPhaseTest::randTest(int seed,int nb1,int nb2, for(int i = 0 ; i < nb2 ; ++i) secondCollision.push_back(randVect(min,max)); - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbm1,obbm2; obbm1 = makeOBBModel(firstCollision,scn,getExtent()); obbm2 = makeOBBModel(secondCollision,scn,getExtent()); diff --git a/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/OBB_test.cpp b/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/OBB_test.cpp index 60ad7bb7d1e..dc4b6cb563d 100644 --- a/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/OBB_test.cpp +++ b/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/OBB_test.cpp @@ -21,7 +21,7 @@ ******************************************************************************/ #include #include -#include +#include #include #include @@ -144,7 +144,7 @@ bool TestOBB::faceVertex(){ //first, we create the transformation to make the first OBB (which is axes aligned) double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel0 = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -215,7 +215,7 @@ bool TestOBB::vertexVertex(){ angles[1] = acos(1/sqrt(3.0)); angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel0 = makeOBB(Vec3(0,0,-sqrt(3.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); sofa::component::collision::OBBCollisionModel::SPtr obbmodel1 = makeOBB(Vec3(0,0,sqrt(3.0) + 0.01),angles,order,Vec3(0,0,-10),Vec3(1,1,1),scn); @@ -254,7 +254,7 @@ bool TestOBB::vertexVertex(){ bool TestOBB::faceFace(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel0 = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); sofa::component::collision::OBBCollisionModel::SPtr obbmodel1 = makeOBB(Vec3(0,1,1.01),angles,order,Vec3(0,0,-10),Vec3(1,1,1),scn); @@ -301,7 +301,7 @@ bool TestOBB::faceFace(){ bool TestOBB::faceEdge(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel0 = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); order[0] = 2; @@ -362,7 +362,7 @@ bool TestOBB::edgeEdge(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel0 = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); sofa::component::collision::OBBCollisionModel::SPtr obbmodel1 = makeOBB(Vec3(0,0,sqrt(2.0) + 0.01),angles,order,Vec3(0,0,-10),Vec3(1,1,1),scn); @@ -394,7 +394,7 @@ bool TestOBB::edgeVertex(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel0 = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); order[0] = 2; @@ -426,7 +426,7 @@ bool TestCapOBB::faceVertex(){ //first, we create the transformation to make the first OBB (which is axes aligned) double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -466,7 +466,7 @@ bool TestCapOBB::faceEdge(){ //first, we create the transformation to make the first OBB (which is axes aligned) double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -514,7 +514,7 @@ bool TestCapOBB::edgeVertex(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -562,7 +562,7 @@ bool TestCapOBB::edgeEdge(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -611,7 +611,7 @@ bool TestCapOBB::vertexEdge(){ angles[1] = acos(1/sqrt(3.0)); angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(3.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -659,7 +659,7 @@ bool TestCapOBB::vertexVertex(){ angles[1] = acos(1/sqrt(3.0)); angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(3.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -705,7 +705,7 @@ bool TestSphereOBB::vertex(){ angles[1] = acos(1/sqrt(3.0)); angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(3.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -755,7 +755,7 @@ bool TestSphereOBB::edge(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,-10),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -796,7 +796,7 @@ bool TestSphereOBB::face(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn);//this OBB is not moving and the contact face will be z = 0 since //the center of this OBB is (0,0,-1) and its extent is 1 @@ -834,7 +834,7 @@ bool TestSphereOBB::face(){ bool TestTriOBB::faceFace(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::TriangleCollisionModel::FLAG_EDGES; @@ -864,7 +864,7 @@ bool TestTriOBB::faceFace(){ bool TestTriOBB::faceVertex_out(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(-1.01,0,1.01),angles,order,Vec3(0,0,-10),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::TriangleCollisionModel::FLAG_EDGES; @@ -899,7 +899,7 @@ bool TestTriOBB::faceVertex_out(){ bool TestTriOBB::faceVertex_out2(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(-1.01,0,-1.01),angles,order,Vec3(0,0,10),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::TriangleCollisionModel::FLAG_EDGES; @@ -934,7 +934,7 @@ bool TestTriOBB::faceVertex_out2(){ bool TestTriOBB::faceEdge(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::TriangleCollisionModel::FLAG_EDGES; @@ -964,7 +964,7 @@ bool TestTriOBB::faceEdge(){ bool TestTriOBB::faceVertex(){ double angles[3] = {0,0,0}; int order[3] = {0,1,2}; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-1),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::TriangleCollisionModel::FLAG_EDGES; @@ -1001,7 +1001,7 @@ bool TestTriOBB::edgeFace(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::TriangleCollisionModel::FLAG_EDGES; @@ -1038,7 +1038,7 @@ bool TestTriOBB::edgeEdge(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::TriangleCollisionModel::FLAG_EDGES; @@ -1075,7 +1075,7 @@ bool TestTriOBB::edgeEdge2(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::TriangleCollisionModel::FLAG_EDGES; @@ -1111,7 +1111,7 @@ bool TestTriOBB::edgeVertex(){ angles[1] = M_PI_2; angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(2.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::TriangleCollisionModel::FLAG_EDGES; @@ -1148,7 +1148,7 @@ bool TestTriOBB::vertexFace(){ angles[1] = acos(1/sqrt(3.0)); angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(3.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::TriangleCollisionModel::FLAG_EDGES; @@ -1185,7 +1185,7 @@ bool TestTriOBB::vertexEdge(){ angles[1] = acos(1/sqrt(3.0)); angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(3.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::TriangleCollisionModel::FLAG_EDGES; @@ -1222,7 +1222,7 @@ bool TestTriOBB::vertexVertex(){ angles[1] = acos(1/sqrt(3.0)); angles[2] = M_PI_4; - sofa::simulation::Node::SPtr scn = New(); + sofa::simulation::Node::SPtr scn = New(); sofa::component::collision::OBBCollisionModel::SPtr obbmodel = makeOBB(Vec3(0,0,-sqrt(3.0)),angles,order,Vec3(0,0,0),Vec3(1,1,1),scn); int tri_flg = sofa::component::collision::TriangleCollisionModel::FLAG_POINTS | sofa::component::collision::TriangleCollisionModel::FLAG_EDGES; diff --git a/applications/plugins/SofaTest/BroadPhase_test.h b/applications/plugins/SofaTest/BroadPhase_test.h index fe36a837fd7..7871a691914 100644 --- a/applications/plugins/SofaTest/BroadPhase_test.h +++ b/applications/plugins/SofaTest/BroadPhase_test.h @@ -25,7 +25,6 @@ #include #include #include -#include #include #include @@ -458,7 +457,7 @@ bool BroadPhaseTest::randTest(int /*seed*/, int nb1, in for(int i = 0 ; i < nb2 ; ++i) secondCollision.push_back(randVect(min,max)); - sofa::simulation::Node::SPtr scn = sofa::core::objectmodel::New(); + sofa::simulation::Node::SPtr scn = sofa::core::objectmodel::New(); sofa::component::collision::OBBCollisionModel::SPtr obbm1,obbm2; obbm1 = makeOBBModel(firstCollision,scn,getExtent()); obbm2 = makeOBBModel(secondCollision,scn,getExtent()); diff --git a/applications/plugins/SofaTest/PrimitiveCreation.h b/applications/plugins/SofaTest/PrimitiveCreation.h index 33dc56429d2..52509970914 100644 --- a/applications/plugins/SofaTest/PrimitiveCreation.h +++ b/applications/plugins/SofaTest/PrimitiveCreation.h @@ -25,8 +25,8 @@ #include -#include -#include +#include +#include #include diff --git a/applications/projects/sofaProjectExample/Main.cpp b/applications/projects/sofaProjectExample/Main.cpp index 5db78fedcfa..8c84b8c2b71 100644 --- a/applications/projects/sofaProjectExample/Main.cpp +++ b/applications/projects/sofaProjectExample/Main.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include #include @@ -62,7 +62,7 @@ using namespace sofa::defaulttype; using sofa::simulation::Node; -using sofa::simulation::graph::DAGNode; +using sofa::simulation::Node; using sofa::helper::system::DataRepository; diff --git a/scripts/deprecated/convert_include_path_splitsimulation.args b/scripts/deprecated/convert_include_path_splitsimulation.args index 2e07bb1f8ae..b2ed589ff48 100644 --- a/scripts/deprecated/convert_include_path_splitsimulation.args +++ b/scripts/deprecated/convert_include_path_splitsimulation.args @@ -159,10 +159,10 @@ sofa/simulation/tree/SMPSimulation.h : SofaSimulationTree/SMPSimulation.h sofa/simulation/tree/tree.h : SofaSimulationTree/tree.h sofa/simulation/tree/TreeSimulation.cpp : SofaSimulationTree/TreeSimulation.cpp sofa/simulation/tree/TreeSimulation.h : SofaSimulationTree/TreeSimulation.h -sofa/simulation/graph/DAGNode.cpp : SofaSimulationGraph/DAGNode.cpp -sofa/simulation/graph/DAGNode.h : SofaSimulationGraph/DAGNode.h -sofa/simulation/graph/DAGNodeMultiMappingElement.cpp : SofaSimulationGraph/DAGNodeMultiMappingElement.cpp -sofa/simulation/graph/DAGNodeMultiMappingElement.h : SofaSimulationGraph/DAGNodeMultiMappingElement.h +sofa/simulation/Node.cpp : SofaSimulationGraph/DAGNode.cpp +sofa/simulation/Node.h : SofaSimulationGraph/DAGNode.h +sofa/simulation/NodeMultiMappingElement.cpp : SofaSimulationGraph/DAGNodeMultiMappingElement.cpp +sofa/simulation/NodeMultiMappingElement.h : SofaSimulationGraph/DAGNodeMultiMappingElement.h sofa/simulation/graph/DAGSimulation.cpp : SofaSimulationGraph/DAGSimulation.cpp sofa/simulation/graph/DAGSimulation.h : SofaSimulationGraph/DAGSimulation.h sofa/simulation/graph/graph.h : SofaSimulationGraph/graph.h