From 32d5e2960ebb030afe8074203c576fdf0f6916c2 Mon Sep 17 00:00:00 2001
From: Frederick Roy <fredroy@users.noreply.github.com>
Date: Wed, 27 Dec 2023 16:15:36 +0100
Subject: [PATCH] [Topology.Mapping] Edge2QuadTopologicalMapping: use States
 directly (#4388)

* use directly states for edge2quad

* apply to example scene

* clean/format includes
---
 .../mapping/Edge2QuadTopologicalMapping.cpp   | 23 ++++++-------------
 .../mapping/Edge2QuadTopologicalMapping.h     | 12 +++-------
 .../Mapping/Edge2QuadTopologicalMapping.scn   |  6 +----
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.cpp b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.cpp
index 1ed5049c5cb..2f5bcfe4a2a 100644
--- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.cpp
+++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.cpp
@@ -20,25 +20,16 @@
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
 #include <sofa/component/topology/mapping/Edge2QuadTopologicalMapping.h>
-#include <sofa/core/visual/VisualParams.h>
 
 #include <sofa/core/ObjectFactory.h>
-
-#include <sofa/component/topology/container/dynamic/QuadSetTopologyModifier.h>
-#include <sofa/component/topology/container/dynamic/QuadSetTopologyContainer.h>
-
 #include <sofa/core/topology/TopologyChange.h>
 
-#include <sofa/type/Vec.h>
-#include <map>
 #include <sofa/defaulttype/VecTypes.h>
-
-#include <sofa/core/behavior/MechanicalState.h>
-
-#include <cmath>
-
 #include <sofa/defaulttype/RigidTypes.h>
 
+#include <sofa/component/topology/container/dynamic/QuadSetTopologyModifier.h>
+#include <sofa/component/topology/container/dynamic/QuadSetTopologyContainer.h>
+
 
 namespace sofa::component::topology::mapping
 {
@@ -112,8 +103,8 @@ void Edge2QuadTopologicalMapping::init()
 
     
     // INITIALISATION of QUADULAR mesh from EDGE mesh :
-    const core::behavior::MechanicalState<Rigid3Types>* from_mstate = dynamic_cast<core::behavior::MechanicalState<Rigid3Types>*>(fromModel->getContext()->getMechanicalState());
-    core::behavior::MechanicalState<Vec3Types>* to_mstate = dynamic_cast<core::behavior::MechanicalState<Vec3Types>*>(toModel->getContext()->getMechanicalState());
+    const core::State<Rigid3Types>* from_mstate = dynamic_cast<core::State<Rigid3Types>*>(fromModel->getContext()->getState());
+    core::State<Vec3Types>* to_mstate = dynamic_cast<core::State<Vec3Types>*>(toModel->getContext()->getState());
 
     if (fromModel)
     {
@@ -299,8 +290,8 @@ void Edge2QuadTopologicalMapping::init()
     }
     else
     {
-        // Check type Rigid3 of input mechanical object (required)
-        msg_error() << "Mechanical object associated with the input is not of type Rigid. Edge2QuadTopologicalMapping only supports Rigid3Types to Vec3Types";
+        // Check type Rigid3 of input state object (required)
+        msg_error() << "State object associated with the input is not of type Rigid. Edge2QuadTopologicalMapping only supports Rigid3Types to Vec3Types";
         d_componentState.setValue(sofa::core::objectmodel::ComponentState::Invalid);
     }
 }
diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.h b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.h
index 7d85f56a145..cf838710074 100644
--- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.h
+++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.h
@@ -22,14 +22,11 @@
 #pragma once
 
 #include <sofa/component/topology/mapping/config.h>
-#include <sofa/core/topology/TopologicalMapping.h>
 
 #include <sofa/type/Vec.h>
-#include <sofa/defaulttype/RigidTypes.h>
-#include <map>
+#include <sofa/core/topology/TopologicalMapping.h>
+#include <sofa/core/State.h>
 
-#include <sofa/core/BaseMapping.h>
-#include <sofa/core/behavior/MechanicalState.h>
 
 
 namespace sofa::component::topology::container::dynamic
@@ -54,10 +51,7 @@ class SOFA_COMPONENT_TOPOLOGY_MAPPING_API Edge2QuadTopologicalMapping : public s
 {
 public:
     SOFA_CLASS(Edge2QuadTopologicalMapping,sofa::core::topology::TopologicalMapping);
-
-    using RigidCoord = sofa::core::State<defaulttype::Rigid3Types>::Coord;
-    using Vec3Coord = sofa::core::State<defaulttype::Vec3Types>::Coord;
-    
+        
     using Index = sofa::core::topology::BaseMeshTopology::Index;
     using Edge = sofa::core::topology::BaseMeshTopology::Edge;
     using Quad = sofa::core::topology::BaseMeshTopology::Quad;
diff --git a/examples/Component/Topology/Mapping/Edge2QuadTopologicalMapping.scn b/examples/Component/Topology/Mapping/Edge2QuadTopologicalMapping.scn
index 0c855327e74..d118ca24937 100644
--- a/examples/Component/Topology/Mapping/Edge2QuadTopologicalMapping.scn
+++ b/examples/Component/Topology/Mapping/Edge2QuadTopologicalMapping.scn
@@ -36,17 +36,13 @@
         
         
         <Node name="VisuBeam" activated="true">
-			<MechanicalObject template="Vec3" name="SurfDof" />
+			<OglModel template="Vec3" name="SurfDof" color="0.7 0.7 0.7" />
 			<QuadSetTopologyContainer  name="Container" />
 			<QuadSetTopologyModifier   name="Modifier" />
             <QuadSetGeometryAlgorithms name="GeomAlgo"  template="Vec3" drawQuads="1"/>
 			<Edge2QuadTopologicalMapping nbPointsOnEachCircle="10" radius="2" input="@../MeshLines" output="@Container" flipNormals="true"/>
             <TubularMapping nbPointsOnEachCircle="10" radius="2" input="@../BeamDof" output="@SurfDof" />
             
-			<Node name="VisuOgl" activated="true">
-				<OglModel name="Visual" color="0.7 0.7 0.7" />
-				<IdentityMapping input="@../SurfDof" output="@Visual"/>
-			</Node>
 		</Node>
 	</Node>  
 </Node>