Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit f8ed001
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Wed Jan 22 14:24:35 2025 +0100

    [tests] Template method design pattern from BaseTest in derived classes (sofa-framework#5162)

    * [tests] Template method design pattern from BaseTest in derived classes

    * rename

    * use the deprecated function

    * Make SetUp and TearDown final

    * fix SofaCarving test

    * missing override

commit 41bac37
Author: Frederick Roy <fredroy@users.noreply.github.com>
Date:   Tue Jan 21 16:21:12 2025 +0100

    [Helper] XCode: run in Debug (and load debug plugins) (sofa-framework#5168)

    remove deprecated cmake statement

    Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>

commit 723420c
Author: Hugo <hugo.talbot@sofa-framework.org>
Date:   Tue Jan 21 16:18:00 2025 +0100

    [Project] Start dev phase v25.06 (sofa-framework#5218)

    * Add ChangeLog for v24.12

    * Bump dev version to v25.06.99

commit b445f57
Author: Frederick Roy <fredroy@users.noreply.github.com>
Date:   Tue Jan 21 16:16:25 2025 +0100

    [Helper] WriteAccessorVector: add resize method with default filler value (sofa-framework#5228)

    add resize with default filler value

commit 4ba3bbe
Author: Hugo <hugo.talbot@sofa-framework.org>
Date:   Tue Jan 21 15:58:00 2025 +0100

    [Core] Move all LifeCycle classes in a dedicated namespace (sofa-framework#5225)

    Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com>

commit eb9fe59
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Mon Jan 20 05:45:39 2025 +0100

    [Type] Support structured binding for tuple-like types (sofa-framework#5208)

    * [Type] Support structured binding for tuple-like types

    * fix redefinition

    * fix test

commit aedc7ff
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Mon Jan 20 00:10:57 2025 +0100

    [Type] Simplification of the Rebind trait using concepts (sofa-framework#5200)

    * [Type] Simplification of the Rebind trait using concepts

    * fix

    * fix and test

    * parentheses

commit 1f11bee
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Fri Jan 17 12:39:13 2025 +0100

    [Type] Deprecate is_container trait (sofa-framework#5210)

commit 3635db7
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Fri Jan 17 08:19:18 2025 +0100

    [Type] Convert enable_if to concepts in fixed_array (sofa-framework#5205)

commit 1072217
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Fri Jan 17 05:42:59 2025 +0100

    [Type] Convert is_fixed_array trait to concept (sofa-framework#5209)

    Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com>

commit d83d7ed
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Fri Jan 17 01:46:10 2025 +0100

    [Type] Convert is_vector trait to concept (sofa-framework#5201)

    * [Type] Concert is_vector trait to concept

    * fix

    * use the concept

commit 84e79d1
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Thu Jan 16 02:48:10 2025 +0100

    [Type] A concept for isRigidType (sofa-framework#5199)

    * [Type] A concept for isRigidType

    * fix

commit f28c570
Author: Hugo <hugo.talbot@sofa-framework.org>
Date:   Wed Jan 15 14:29:40 2025 +0100

    [Helper] Fix warning in SelectableItem (sofa-framework#5163)

    * [Helper] Fix warning in SelectableItem

    * simpler code

    * simplify trait using concept

    * remove unused include

    ---------

    Co-authored-by: Alex Bilger <alexbilger0@gmail.com>

commit bf730d2
Author: Hugo <hugo.talbot@sofa-framework.org>
Date:   Wed Jan 15 05:48:20 2025 +0100

    [SolidMechanics] Make Data innerRadius of BeamFEMFF not required (sofa-framework#5203)

commit 964136a
Author: Hugo <hugo.talbot@sofa-framework.org>
Date:   Thu Jan 9 16:37:53 2025 +0100

    [Mapping] Fix draw in RigidMapping (sofa-framework#5204)

    * [Mapping] Fix draw in RigidMapping

    * Apply suggestions from code review

    Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com>

    ---------

    Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com>

commit 61d4924
Author: Hugo <hugo.talbot@sofa-framework.org>
Date:   Thu Jan 9 14:35:29 2025 +0100

    [Engine] Fix drawLines from ValuesFromPositions (sofa-framework#5206)

commit 88320b8
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Thu Jan 9 07:39:53 2025 +0100

    [Config] Introduce SOFA modules data structure (sofa-framework#5148)

    * Introduce SOFA modules data structure

    * apply everywhere

    * don't shadow with unique name

    * try to fix

    * generate unit tests automatically

    * remove dependency to string and make modules constexpr

    * restore conversion to string

    * constexpr

    * remove ambiguity

    * include modules.h only when necessary

commit 1cbfa03
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Thu Jan 9 06:09:39 2025 +0100

    [DefaultType] Aliases defined twice (sofa-framework#5198)

commit 589ea72
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Thu Jan 9 01:34:09 2025 +0100

    [Core] Isolate the intrusive reference counting (sofa-framework#5149)

    * [Core] Isolate the intrusive reference counting

    * add unit tests

commit 7b3729f
Author: erik pernod <erik.pernod@gmail.com>
Date:   Wed Jan 8 23:33:30 2025 +0100

    [Topology] Add function in BaseMeshTopology to compute all topology containers (sofa-framework#3368)

    * [Topology] rename method initTpology into initContainers and provide access to it from BaseMeshTopology

    * [MultiThreading] Replace call to getter to init topology by call to initContainers

    * Fix MeshTopology initContainer

    * REname initContainers into computeCrossElementBuffers

    * restore comment

    * Fix compilation

    * Update MeshTopology.cpp

    * Update MeshTopology.cpp

    * Update applications/plugins/MultiThreading/src/MultiThreading/component/collision/detection/algorithm/ParallelBVHNarrowPhase.cpp

    Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>

    * Update MeshTopology, Keep method ComputeCorssElementBuffer to be call only if needed. Not called at init

    * Update MeshTopology.h

    * Update MeshTopology.cpp

    * Update MeshTopology.h

    ---------

    Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>

commit 292f5bc
Author: Paul Baksic <30337881+bakpaul@users.noreply.github.com>
Date:   Wed Jan 8 23:32:44 2025 +0100

    [tools] Update post-install fixup to fix rpath (sofa-framework#5197)

    Update post-install fixup to fix rpath

commit 0bc3fb9
Author: Damien Marchal <damien.marchal@univ-lille1.fr>
Date:   Mon Jan 6 15:30:09 2025 +0100

    [GUI.Qt] Fix invalid color of the warning sign on object (sofa-framework#5190)

    Fix invalid color of the warning sign on object.

commit b5c1f17
Author: Hugo <hugo.talbot@sofa-framework.org>
Date:   Mon Dec 30 12:28:46 2024 +0100

    [all] Fix additional warnings (sofa-framework#5180)

    * [all] Fix additional warnings

    * Update Sofa/Component/Collision/Response/Mapper/src/sofa/component/collision/response/mapper/init.cpp

    Co-authored-by: erik pernod <erik.pernod@gmail.com>

    * Update Sofa/Component/Collision/Response/Mapper/src/sofa/component/collision/response/mapper/init.cpp

    ---------

    Co-authored-by: erik pernod <erik.pernod@gmail.com>

commit 82c4ea2
Author: Frederick Roy <fredroy@users.noreply.github.com>
Date:   Sun Dec 29 04:08:56 2024 +0900

    [Multithreading] Apply new factory registration mechanism (sofa-framework#5178)

    * apply new register mechanism to multithreading

    * fix test

    * Apply suggestions from code review (update descriptions)

    Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>

    ---------

    Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>

commit bcc5a16
Author: Frederick Roy <fredroy@users.noreply.github.com>
Date:   Sat Dec 28 00:26:20 2024 +0900

    [Helper] PluginManager: support loading from Non-MSVC Multi-Configuration Build (sofa-framework#5133)

    * remove collections from searchable paths

    * cmake: pass config info and use it for search paths

    * remove typo in template parameters

    * add support for minsizerel

    * test existence of directory before browsing

    * just use the string

commit 07ce419
Author: erik pernod <erik.pernod@gmail.com>
Date:   Fri Dec 27 10:57:04 2024 +0100

    [Sofa.GL] Fix OglModel crash when texture file is not found (sofa-framework#5182)

    [OglModel] Backup fix on texture not found crash

commit 3711b9e
Author: erik pernod <erik.pernod@gmail.com>
Date:   Fri Dec 27 10:56:45 2024 +0100

    [Core] Fix VisualState.h compilation on windows (sofa-framework#5181)

    [Visual] Fix VisualState.h compilation

commit 238851c
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Thu Dec 26 22:01:07 2024 +0100

    [SofaCUDA] Explicit the CUDA C++ standard version to 17 (sofa-framework#5165)

commit 30844d0
Author: Paul Baksic <30337881+bakpaul@users.noreply.github.com>
Date:   Thu Dec 26 18:36:11 2024 +0100

    [Plugins] Remove unsupported plugins: InvertibleFVM, SofaSimpleGUI and SensableEmulation (sofa-framework#5175)

    Remove unsupported plugins

commit e2b9428
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Mon Dec 23 05:52:16 2024 +0100

    [Testing] Mitigate plugin import leakage between tests (sofa-framework#5161)

    * [Testing] ScopedPlugin

    * add version with lists

    * unload plugins at tear down

    * use ScopedPlugin in a test as an example

    * support multiple calls to loadPlugins

commit ca66554
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Fri Dec 20 13:31:30 2024 +0100

    [Config] Upgrade to C++20 (sofa-framework#5111)

commit 642cdc6
Author: Hugo <hugo.talbot@sofa-framework.org>
Date:   Fri Dec 20 04:54:50 2024 +0100

    [Lagrangian] Remove unused data numericalTolerance in BLC (sofa-framework#5164)

commit 3e508d3
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Fri Dec 20 04:53:09 2024 +0100

    [Type] Test and clean BoundingBox (sofa-framework#5138)

    [Type] Test for BoundingBox

commit 3ecd69c
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Wed Dec 18 17:24:59 2024 +0100

    [SofaCUDA] Remove NO_CUDA condition (sofa-framework#5171)

commit 4aca268
Author: Frederick Roy <fredroy@users.noreply.github.com>
Date:   Wed Dec 18 21:28:35 2024 +0900

    [Core, Simulation.Core] Registration: (re)enable deprecation warnings (sofa-framework#5155)

    * enable deprecation warnings for RegisterObject

    * enable runtime deprecation warnings

    * re enable disabled tests

    * fix typo

    * fix units tests

    * expect a warning when loading pluginA

    * load plugins once (avoiding registering several times)

    * add more info when warning the user of a deprecated registration

    * set warnings only if dev mode is enabled (SOFA_WITH_DEVTOOLS enabled)

    * apply new mechanism registration to AugmentedLagrangianConstraint

commit 99df0a2
Author: Alex Bilger <alxbilger@users.noreply.github.com>
Date:   Tue Dec 17 15:26:53 2024 +0100

    [Visual] Move, rename and clean OglCylinderModel (sofa-framework#5124)

    * move files

    * depreciation

    * rename

    * fix color management

    * remove string to color conversion and use the one from RGBAColor

    * remove unused private methods

    * cleaning

    * component change

    * remove Index alias

    * change the description

    * cache drawTool

    * remove calls to removed functions

commit 02b3366
Author: Paul Baksic <30337881+bakpaul@users.noreply.github.com>
Date:   Tue Dec 17 02:06:24 2024 +0100

    [All] Fix visualisation (sofa-framework#5152)

    * Fix visualisation

    * Remove inheritance from visual model; Remove the use of visitor for VisualStyle and instead call the fwdDraw directly in the two visualVisitor

    * Change methods name

    * Update Sofa/framework/Core/src/sofa/core/visual/BaseVisualStyle.h

    Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com>

    ---------

    Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com>

commit 4eda9c7
Author: Paul Baksic <30337881+bakpaul@users.noreply.github.com>
Date:   Fri Dec 13 15:52:24 2024 +0100

    [Constraint.Lagrangian] Add augmented lagrangians (sofa-framework#5003)

    * Add AugmentedLagrangianConstraint response

    * accelerate GS convergence

    * Added virtualization layer for constraints, but linker issue arise. Need to fix it then add virutalization in Contact response

    * FIX linking

    * Add virtualization layer for contact response

    * Fix OBBCapsule

    * Fix Distance grid and simplify fix for OBB

    * Fix default friction used by tests

    * Try fix macos compilation

    * Add tag for augmented lagrangian

    * add details to the description of epsilon data

    * remove multiple registration in factory

    * MAke parameters struct final

    * USe data accessor instead

    * fix compilation

    * Try fix scene tests

    * Apply suggestions from code review

    Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>

    * Add reference

    ---------

    Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>

commit 8ba12f0
Author: Hugo <hugo.talbot@sofa-framework.org>
Date:   Fri Dec 13 03:22:11 2024 +0100

    [examples] Make symplectic option explicit (sofa-framework#5159)

    [Explicit] Make symplectic option explicit

commit 6ae972f
Author: Paul Baksic <30337881+bakpaul@users.noreply.github.com>
Date:   Wed Dec 11 13:56:40 2024 +0100

    [Constraint.Projective] Make LinearVelocityProjectiveConstraint work with FreeMotionAL (sofa-framework#5025)

    * Implement missing methods to work in FreeMotionAnimationLoop and add feature to keep the constraint applied after all the key event have passed

    * Apply suggestions from code review

    Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>

    * Use constexpr when possible

    * Add example scene

    * Simplify the example and added the complete scene in the demo folder

    * Refactor finished mechanism and fix behavior when finished

    * Update scenes and regression tests

    * Put the boolean test on wether the constraint is still active or not inside a method

    ---------

    Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>

commit 6141aac
Author: Frederick Roy <fredroy@users.noreply.github.com>
Date:   Wed Dec 11 18:29:09 2024 +0900

    [All] Remove spam warnings (sofa-framework#5156)

    * fix duplicated macro

    * fix unused variables

    * use new vecids
  • Loading branch information
@bakpaul
bakpaul committed Jan 23, 2025
1 parent a13b3ca commit 885e980
Show file tree
Hide file tree
Showing 471 changed files with 36,486 additions and 12,018 deletions.
229 changes: 229 additions & 0 deletions CHANGELOG.md
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ project(Sofa
include(CMakeDependentOption)

# Manually define VERSION
set(Sofa_VERSION_MAJOR 24)
set(Sofa_VERSION_MINOR 12)
set(Sofa_VERSION_MAJOR 25)
set(Sofa_VERSION_MINOR 06)
set(Sofa_VERSION_PATCH 99)
set(Sofa_VERSION ${Sofa_VERSION_MAJOR}.${Sofa_VERSION_MINOR}.${Sofa_VERSION_PATCH})

Expand Down
4 changes: 2 additions & 2 deletions Sofa/Component/AnimationLoop/src/sofa/component/animationloop/FreeMotionAnimationLoop.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <sofa/simulation/CollisionAnimationLoop.h>
#include <sofa/core/MultiVecId.h>
#include <sofa/core/objectmodel/RenamedData.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>

namespace sofa::core::behavior
{
Expand All @@ -45,7 +45,7 @@ class SOFA_COMPONENT_ANIMATIONLOOP_API FreeMotionAnimationLoop : public sofa::si


SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
sofa::core::objectmodel::RenamedData<bool> m_solveVelocityConstraintFirst;
sofa::core::objectmodel::lifecycle::RenamedData<bool> m_solveVelocityConstraintFirst;

Data<bool> d_solveVelocityConstraintFirst; ///< solve separately velocity constraint violations before position constraint violations
Data<bool> d_threadSafeVisitor; ///< If true, do not use realloc and free visitors in fwdInteractionForceField.
Expand Down
6 changes: 3 additions & 3 deletions Sofa/Component/AnimationLoop/src/sofa/component/animationloop/MultiStepAnimationLoop.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include <sofa/core/behavior/BaseAnimationLoop.h>
#include <sofa/simulation/CollisionAnimationLoop.h>
#include <sofa/core/objectmodel/RenamedData.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>

namespace sofa::component::animationloop
{
Expand All @@ -43,10 +43,10 @@ class SOFA_COMPONENT_ANIMATIONLOOP_API MultiStepAnimationLoop : public sofa::sim
void step (const sofa::core::ExecParams* params, SReal dt) override;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
sofa::core::objectmodel::RenamedData<int> collisionSteps;
sofa::core::objectmodel::lifecycle::RenamedData<int> collisionSteps;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_ANIMATIONLOOP()
sofa::core::objectmodel::RenamedData<int> integrationSteps;
sofa::core::objectmodel::lifecycle::RenamedData<int> integrationSteps;

Data<int> d_collisionSteps; ///< number of collision steps between each frame rendering
Data<int> d_integrationSteps; ///< number of integration steps between each collision detection
Expand Down
7 changes: 7 additions & 0 deletions Sofa/Component/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,10 @@ sofa_create_package_with_targets(
INCLUDE_SOURCE_DIR "src"
INCLUDE_INSTALL_DIR "${PROJECT_NAME}"
)

# Tests
# If SOFA_BUILD_TESTS exists and is OFF, then these tests will be auto-disabled
cmake_dependent_option(SOFA_COMPONENT_BUILD_TESTS "Compile the automatic tests" ON "SOFA_BUILD_TESTS OR NOT DEFINED SOFA_BUILD_TESTS" OFF)
if(SOFA_COMPONENT_BUILD_TESTS)
add_subdirectory(test)
endif()
4 changes: 2 additions & 2 deletions ...tection/Algorithm/src/sofa/component/collision/detection/algorithm/BruteForceBroadPhase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <sofa/component/collision/detection/algorithm/config.h>
#include <sofa/core/collision/BroadPhaseDetection.h>
#include <sofa/component/collision/geometry/CubeModel.h>
#include <sofa/core/objectmodel/RenamedData.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>

namespace sofa::component::collision::detection::algorithm
{
Expand All @@ -51,7 +51,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API BruteForceBroadPhase : pu
private:
///< if not empty, objects that do not intersect this bounding-box will be ignored
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM()
sofa::core::objectmodel::RenamedData<type::fixed_array<sofa::type::Vec3, 2> > box;
sofa::core::objectmodel::lifecycle::RenamedData<type::fixed_array<sofa::type::Vec3, 2> > box;

Data<type::fixed_array<sofa::type::Vec3, 2> > d_box; ///< if not empty, objects that do not intersect this bounding-box will be ignored

Expand Down
4 changes: 2 additions & 2 deletions .../Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include <map>
#include <deque>

#include <sofa/core/objectmodel/RenamedData.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>


namespace sofa::component::collision::detection::algorithm
Expand Down Expand Up @@ -215,7 +215,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API IncrSAP :
core::objectmodel::lifecycle::DeprecatedData bDraw {this, "v24.06", "v24.12", "draw", "This Data was not used"};

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_ALGORITHM()
sofa::core::objectmodel::RenamedData< type::fixed_array<type::Vec3,2> > box; ///< if not empty, objects that do not intersect this bounding-box will be ignored
sofa::core::objectmodel::lifecycle::RenamedData< type::fixed_array<type::Vec3,2> > box; ///< if not empty, objects that do not intersect this bounding-box will be ignored

Data< type::fixed_array<type::Vec3,2> > d_box; ///< if not empty, objects that do not intersect this bounding-box will be ignored

Expand Down
8 changes: 4 additions & 4 deletions Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ class TestCollisionPipeline : public BaseSimulationTest {
void checkCollisionPipelineWithMissingContactManager();
int checkCollisionPipelineWithMonkeyValueForDepth(int value);

void SetUp() override
void doSetUp() override
{
sofa::simpleapi::importPlugin("Sofa.Component.StateContainer");
sofa::simpleapi::importPlugin("Sofa.Component.Collision");
sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
sofa::simpleapi::importPlugin(Sofa.Component.Collision);
}

void TearDown() override
void doTearDown() override
{
if (root)
sofa::simulation::node::unload(root);
Expand Down
6 changes: 3 additions & 3 deletions ...ersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <sofa/component/collision/detection/intersection/DiscreteIntersection.h>
#include <sofa/component/collision/geometry/CubeModel.h>

#include <sofa/core/objectmodel/RenamedData.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>


namespace sofa::component::collision::detection::intersection
Expand All @@ -41,10 +41,10 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API BaseProximityIntersect
public:
SOFA_ABSTRACT_CLASS(BaseProximityIntersection,DiscreteIntersection);
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::RenamedData<SReal> alarmDistance;
sofa::core::objectmodel::lifecycle::RenamedData<SReal> alarmDistance;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::RenamedData<SReal> contactDistance;
sofa::core::objectmodel::lifecycle::RenamedData<SReal> contactDistance;


Data<SReal> d_alarmDistance; ///< Distance above which the intersection computations ignores the proximity pair. This distance can also be used in some broad phase algorithms to reduce the search area
Expand Down
10 changes: 5 additions & 5 deletions ...ction/Intersection/src/sofa/component/collision/detection/intersection/LocalMinDistance.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <sofa/component/collision/geometry/CubeModel.h>
#include <sofa/component/collision/geometry/RayModel.h>

#include <sofa/core/objectmodel/RenamedData.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>

namespace sofa::component::collision::detection::intersection
{
Expand Down Expand Up @@ -64,16 +64,16 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API LocalMinDistance : pub
typedef core::collision::IntersectorFactory<LocalMinDistance> IntersectorFactory;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::RenamedData<bool> filterIntersection;
sofa::core::objectmodel::lifecycle::RenamedData<bool> filterIntersection;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::RenamedData<double> angleCone;
sofa::core::objectmodel::lifecycle::RenamedData<double> angleCone;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::RenamedData<double> coneFactor;
sofa::core::objectmodel::lifecycle::RenamedData<double> coneFactor;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::RenamedData<bool> useLMDFilters;
sofa::core::objectmodel::lifecycle::RenamedData<bool> useLMDFilters;


Data<bool> d_filterIntersection; ///< Activate LMD filter
Expand Down
12 changes: 6 additions & 6 deletions ...tersection/src/sofa/component/collision/detection/intersection/MinProximityIntersection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

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

#include <sofa/core/objectmodel/RenamedData.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>

namespace sofa::component::collision::detection::intersection
{
Expand Down Expand Up @@ -57,19 +57,19 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API MinProximityIntersecti
public:
SOFA_CLASS(MinProximityIntersection,BaseProximityIntersection);
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::RenamedData<bool> useSphereTriangle;
sofa::core::objectmodel::lifecycle::RenamedData<bool> useSphereTriangle;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::RenamedData<bool> usePointPoint;
sofa::core::objectmodel::lifecycle::RenamedData<bool> usePointPoint;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::RenamedData<bool> useSurfaceNormals;
sofa::core::objectmodel::lifecycle::RenamedData<bool> useSurfaceNormals;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::RenamedData<bool> useLinePoint;
sofa::core::objectmodel::lifecycle::RenamedData<bool> useLinePoint;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::RenamedData<bool> useLineLine;
sofa::core::objectmodel::lifecycle::RenamedData<bool> useLineLine;



Expand Down
4 changes: 2 additions & 2 deletions ...tersection/src/sofa/component/collision/detection/intersection/NewProximityIntersection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include <sofa/component/collision/geometry/CubeModel.h>

#include <sofa/core/objectmodel/RenamedData.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>

namespace sofa::component::collision::detection::intersection
{
Expand Down Expand Up @@ -58,7 +58,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API NewProximityIntersecti
public:
SOFA_CLASS(NewProximityIntersection,BaseProximityIntersection);
SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_DETECTION_INTERSECTION()
sofa::core::objectmodel::RenamedData<bool> useLineLine;
sofa::core::objectmodel::lifecycle::RenamedData<bool> useLineLine;

Data<bool> d_useLineLine; ///< Line-line collision detection enabled

Expand Down
8 changes: 4 additions & 4 deletions Sofa/Component/Collision/Detection/Intersection/tests/LocalMinDistance_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ namespace
{

struct TestLocalMinDistance : public BaseSimulationTest {
void SetUp() override
void doSetUp() override
{
sofa::simpleapi::importPlugin("Sofa.Component.StateContainer");
sofa::simpleapi::importPlugin("Sofa.Component.Collision.Detection.Intersection");
sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
sofa::simpleapi::importPlugin(Sofa.Component.Collision.Detection.Intersection);
}
void TearDown() override
void doTearDown() override
{
}

Expand Down
5 changes: 3 additions & 2 deletions Sofa/Component/Collision/Detection/src/sofa/component/collision/detection/init.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include <sofa/helper/system/PluginManager.h>
#include <sofa/core/ObjectFactory.h>
#include <sofa/Modules.h>

namespace sofa::component::collision::detection
{
Expand Down Expand Up @@ -54,8 +55,8 @@ const char* getModuleVersion()

void registerObjects(sofa::core::ObjectFactory* factory)
{
factory->registerObjectsFromPlugin("Sofa.Component.Collision.Detection.Algorithm");
factory->registerObjectsFromPlugin("Sofa.Component.Collision.Detection.Intersection");
factory->registerObjectsFromPlugin(Sofa.Component.Collision.Detection.Algorithm);
factory->registerObjectsFromPlugin(Sofa.Component.Collision.Detection.Intersection);
}

void init()
Expand Down
6 changes: 3 additions & 3 deletions Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/LineModel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <sofa/core/topology/BaseMeshTopology.h>
#include <sofa/defaulttype/VecTypes.h>

#include <sofa/core/objectmodel/RenamedData.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>


namespace sofa::component::collision::geometry
Expand Down Expand Up @@ -145,7 +145,7 @@ public :
int getLineFlags(sofa::Index i);

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY()
sofa::core::objectmodel::RenamedData<bool> bothSide;
sofa::core::objectmodel::lifecycle::RenamedData<bool> bothSide;


Data<bool> d_bothSide; ///< activate collision on both side of the line model (when surface normals are defined on these lines)
Expand All @@ -172,7 +172,7 @@ public :
void computeBBox(const core::ExecParams* params, bool onlyVisible) override;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY()
sofa::core::objectmodel::RenamedData<bool> m_displayFreePosition;
sofa::core::objectmodel::lifecycle::RenamedData<bool> m_displayFreePosition;


Data<bool> d_displayFreePosition; ///< Display Collision Model Points free position(in green)
Expand Down
8 changes: 4 additions & 4 deletions Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/PointModel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <sofa/core/topology/BaseMeshTopology.h>
#include <sofa/defaulttype/VecTypes.h>

#include <sofa/core/objectmodel/RenamedData.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>

namespace sofa::component::collision::geometry
{
Expand Down Expand Up @@ -104,7 +104,7 @@ class PointCollisionModel : public core::CollisionModel
const Deriv& velocity(sofa::Index index) const;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY()
sofa::core::objectmodel::RenamedData<bool> bothSide;
sofa::core::objectmodel::lifecycle::RenamedData<bool> bothSide;


Data<bool> d_bothSide; ///< activate collision on both side of the point model (when surface normals are defined on these points)
Expand Down Expand Up @@ -136,10 +136,10 @@ class PointCollisionModel : public core::CollisionModel
core::behavior::MechanicalState<DataTypes>* mstate;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY()
sofa::core::objectmodel::RenamedData<bool> computeNormals;
sofa::core::objectmodel::lifecycle::RenamedData<bool> computeNormals;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY()
sofa::core::objectmodel::RenamedData<bool> m_displayFreePosition;
sofa::core::objectmodel::lifecycle::RenamedData<bool> m_displayFreePosition;

Data<bool> d_computeNormals; ///< activate computation of normal vectors (required for some collision detection algorithms)

Expand Down
4 changes: 2 additions & 2 deletions Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/RayModel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <sofa/defaulttype/VecTypes.h>
#include <set>

#include <sofa/core/objectmodel/RenamedData.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>

namespace sofa::component::collision::response::contact
{
Expand Down Expand Up @@ -96,7 +96,7 @@ class SOFA_COMPONENT_COLLISION_GEOMETRY_API RayCollisionModel : public core::Col
sofa::type::vector<type::Vec3> direction;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY()
sofa::core::objectmodel::RenamedData<SReal> defaultLength;
sofa::core::objectmodel::lifecycle::RenamedData<SReal> defaultLength;



Expand Down
6 changes: 3 additions & 3 deletions Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereModel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <sofa/core/behavior/MechanicalState.h>
#include <sofa/core/topology/BaseMeshTopology.h>

#include <sofa/core/objectmodel/RenamedData.h>
#include <sofa/core/objectmodel/lifecycle/RenamedData.h>

namespace sofa::component::collision::geometry
{
Expand Down Expand Up @@ -165,10 +165,10 @@ class SphereCollisionModel : public core::CollisionModel
}

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY()
sofa::core::objectmodel::RenamedData< VecReal > radius;
sofa::core::objectmodel::lifecycle::RenamedData< VecReal > radius;

SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_COLLISION_GEOMETRY()
sofa::core::objectmodel::RenamedData<SReal> defaultRadius;
sofa::core::objectmodel::lifecycle::RenamedData<SReal> defaultRadius;

Data< VecReal > d_radius; ///< Radius of each sphere
Data< SReal > d_defaultRadius; ///< Default radius
Expand Down
8 changes: 4 additions & 4 deletions Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@ namespace sofa {

struct TestSphere : public BaseSimulationTest
{
void SetUp() override
void doSetUp() override
{
sofa::simpleapi::importPlugin("Sofa.Component.StateContainer");
sofa::simpleapi::importPlugin("Sofa.Component.Collision.Geometry");
sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
sofa::simpleapi::importPlugin(Sofa.Component.Collision.Geometry);

m_proxIntersection = sofa::core::objectmodel::New<MinProximityIntersection>();
m_proxIntersection->setAlarmDistance(1.0);
m_proxIntersection->setContactDistance(1.0);
}
void TearDown() override
void doTearDown() override
{
}

Expand Down
4 changes: 2 additions & 2 deletions Sofa/Component/Collision/Geometry/tests/Triangle_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ namespace sofa
{
struct TestTriangle : public BaseTest
{
void SetUp() override
void doSetUp() override
{
}
void TearDown() override
void doTearDown() override
{

}
Expand Down
Loading

0 comments on commit 885e980

Please sign in to comment.