Merge branch 'master' into 202501_lifecycle_v2506

sofa-framework · Jan 29, 2025 · 0e688df · 0e688df
2 parents e5041a1 + 3659403
commit 0e688df
Show file tree

Hide file tree

Showing 10 changed files with 830 additions and 88 deletions.
diff --git a/Sofa/Component/Playback/src/sofa/component/playback/CompareState.cpp b/Sofa/Component/Playback/src/sofa/component/playback/CompareState.cpp
@@ -263,7 +263,7 @@ void CompareState::draw(const core::visual::VisualParams* vparams)
 CompareStateCreator::CompareStateCreator(const core::ExecParams* params)
     : Visitor(params)
     , sceneName("")
-#if SOFAGENERALLOADER_HAVE_ZLIB
+#if SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB
     , extension(".txt.gz")
 #else
     , extension(".txt")
@@ -277,7 +277,7 @@ CompareStateCreator::CompareStateCreator(const core::ExecParams* params)
 CompareStateCreator::CompareStateCreator(const std::string &n, const core::ExecParams* params, bool i, int c)
     : Visitor(params)
     , sceneName(n)
-#if SOFAGENERALLOADER_HAVE_ZLIB
+#if SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB
     , extension(".txt.gz")
 #else
     , extension(".txt")

diff --git a/Sofa/Component/Playback/src/sofa/component/playback/CompareTopology.cpp b/Sofa/Component/Playback/src/sofa/component/playback/CompareTopology.cpp
@@ -298,7 +298,7 @@ void CompareTopology::processCompareTopology()
 CompareTopologyCreator::CompareTopologyCreator(const core::ExecParams* params)
     :Visitor(params)
     , sceneName("")
-#if SOFAGENERALLOADER_HAVE_ZLIB
+#if SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB
     , extension(".txt.gz")
 #else
     , extension(".txt")
@@ -312,7 +312,7 @@ CompareTopologyCreator::CompareTopologyCreator(const core::ExecParams* params)
 CompareTopologyCreator::CompareTopologyCreator(const std::string &n, const core::ExecParams* params, bool i, int c)
     :Visitor(params)
     , sceneName(n)
-#if SOFAGENERALLOADER_HAVE_ZLIB
+#if SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB
     , extension(".txt.gz")
 #else
     , extension(".txt")

diff --git a/Sofa/Component/Playback/src/sofa/component/playback/config.h.in b/Sofa/Component/Playback/src/sofa/component/playback/config.h.in
@@ -39,11 +39,3 @@ namespace sofa::component::playback
 	constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@";
 } // namespace sofa::component::playback
 
-// Keep the previous macros
-// This backward compatibility will be removed at v23.06
-#ifndef SOFAGENERALLOADER_HAVE_ZLIB
-#define SOFAGENERALLOADER_HAVE_ZLIB SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB
-#endif
-#ifndef SOFAEXPORTER_HAVE_ZLIB
-#define SOFAEXPORTER_HAVE_ZLIB SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB
-#endif
diff --git a/Sofa/Component/StateContainer/tests/CMakeLists.txt b/Sofa/Component/StateContainer/tests/CMakeLists.txt
@@ -4,6 +4,7 @@ project(Sofa.Component.StateContainer_test)
 
 set(SOURCE_FILES
     MechanicalObject_test.cpp
+    MechanicalObjectVOp_test.cpp
 )
 
 add_executable(${PROJECT_NAME} ${SOURCE_FILES})