[Topology] Container for prisms and pyramids (#5784)

* [Topology] Container for prisms and pyramids

* remove duplicate

---------

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

Author: alxbilger

Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.cpp

@@ -491,6 +491,8 @@ MeshTopology::MeshTopology()
     , d_seqQuads(initData(&d_seqQuads, "quads", "List of quad indices"))
     , d_seqTetrahedra(initData(&d_seqTetrahedra, "tetrahedra", "List of tetrahedron indices"))
     , d_seqHexahedra(initData(&d_seqHexahedra, "hexahedra", "List of hexahedron indices"))
+    , d_seqPrisms(initData(&d_seqPrisms, "prisms", "List of prisms indices"))
+    , d_seqPyramids(initData(&d_seqPyramids, "pyramids", "List of pyramids indices"))
     , d_seqUVs(initData(&d_seqUVs, "uv", "List of uv coordinates"))
     , d_computeAllBuffers(initData(&d_computeAllBuffers, false, "computeAllBuffers", "Option to compute all crossed topology buffers at init. False by default"))
     , nbPoints(0)
@@ -763,7 +765,6 @@ const MeshTopology::SeqTriangles& MeshTopology::getTriangles()
 
 const MeshTopology::SeqQuads& MeshTopology::getQuads()
 {
-
     return d_seqQuads.getValue();
 }
 
@@ -787,6 +788,16 @@ const MeshTopology::SeqHexahedra& MeshTopology::getHexahedra()
     return d_seqHexahedra.getValue();
 }
 
+const BaseMeshTopology::SeqPrisms& MeshTopology::getPrisms()
+{
+    return d_seqPrisms.getValue();
+}
+
+const BaseMeshTopology::SeqPyramids& MeshTopology::getPyramids()
+{
+    return d_seqPyramids.getValue();
+}
+
 const MeshTopology::SeqUV& MeshTopology::getUVs()
 {
     return d_seqUVs.getValue();

Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.h

@@ -98,6 +98,8 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_CONSTANT_API MeshTopology : public core:
     const SeqQuads& getQuads() override;
     const SeqTetrahedra& getTetrahedra() override;
     const SeqHexahedra& getHexahedra() override;
+    const SeqPrisms& getPrisms() override;
+    const SeqPyramids& getPyramids() override;
 
     // If using STEP loader, include also uv coordinates
     typedef Index					UVID;
@@ -298,6 +300,8 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_CONSTANT_API MeshTopology : public core:
     Data<SeqQuads>       d_seqQuads; ///< List of quad indices
     Data<SeqTetrahedra>      d_seqTetrahedra; ///< List of tetrahedron indices
     Data<SeqHexahedra>	   d_seqHexahedra; ///< List of hexahedron indices
+    Data<SeqPrisms> d_seqPrisms;
+    Data<SeqPyramids> d_seqPyramids;
     Data<SeqUV>	d_seqUVs; ///< List of uv coordinates
     Data<bool> d_computeAllBuffers; ///< Option to call method computeCrossElementBuffers. False by default
 

Sofa/framework/Core/src/sofa/core/topology/BaseMeshTopology.h

@@ -34,11 +34,13 @@ class SOFA_CORE_API BaseMeshTopology : public core::topology::Topology
     SOFA_ABSTRACT_CLASS(BaseMeshTopology, core::topology::Topology);
     SOFA_BASE_CAST_IMPLEMENTATION(BaseMeshTopology)
 
-    typedef sofa::type::vector<Edge> 		        SeqEdges;
-    typedef sofa::type::vector<Triangle>		    SeqTriangles;
-    typedef sofa::type::vector<Quad>		        SeqQuads;
-    typedef sofa::type::vector<Tetra>		        SeqTetrahedra;
-    typedef sofa::type::vector<Hexa>		        SeqHexahedra;
+    using SeqEdges = sofa::type::vector<Edge>;
+    using SeqTriangles = sofa::type::vector<Triangle>;
+    using SeqQuads = sofa::type::vector<Quad>;
+    using SeqTetrahedra = sofa::type::vector<Tetra>;
+    using SeqHexahedra = sofa::type::vector<Hexa>;
+    using SeqPrisms = sofa::type::vector<Prism>;
+    using SeqPyramids = sofa::type::vector<Pyramid>;
 
     /// @name Deprecated types, for backward-compatibility
     /// @{
@@ -104,6 +106,8 @@ class SOFA_CORE_API BaseMeshTopology : public core::topology::Topology
     virtual const SeqQuads& getQuads() = 0;
     virtual const SeqTetrahedra& getTetrahedra() = 0;
     virtual const SeqHexahedra& getHexahedra() = 0;
+    virtual const SeqPrisms& getPrisms() = 0;
+    virtual const SeqPyramids& getPyramids() = 0;
     /// @}
 
     /// Random accessors
@@ -113,14 +117,18 @@ class SOFA_CORE_API BaseMeshTopology : public core::topology::Topology
     virtual Size getNbTriangles()               { return Size(getTriangles().size()); }
     virtual Size getNbQuads()                   { return Size(getQuads().size()); }
     virtual Size getNbTetrahedra()              { return Size(getTetrahedra().size()); }
-    virtual Size getNbHexahedra()	              { return Size(getHexahedra().size()); }
+    virtual Size getNbHexahedra()               { return Size(getHexahedra().size()); }
+    virtual Size getNbPrisms()                  { return Size(getPrisms().size()); }
+    virtual Size getNbPyramids()                { return Size(getPyramids().size()); }
 
     virtual const Edge getEdge(EdgeID i)             { return getEdges()[i]; }
     virtual const Triangle getTriangle(TriangleID i) { return getTriangles()[i]; }
     virtual const Quad getQuad(QuadID i)             { return getQuads()[i]; }
     virtual const Tetra getTetrahedron(TetraID i)    { return getTetrahedra()[i]; }
-    virtual const Hexa getHexahedron(HexaID i)       { return getHexahedra()[i]; }   
-	   
+    virtual const Hexa getHexahedron(HexaID i)       { return getHexahedra()[i]; }
+    virtual const Prism getPrism(PrismID i)          { return getPrisms()[i]; }
+    virtual const Pyramid getPyramid(PyramidID i)    { return getPyramids()[i]; }
+
     /// Type of higher topology element contains in this container @see ElementType
     virtual sofa::geometry::ElementType getTopologyType() const = 0;
     /// @}

Sofa/framework/Core/src/sofa/core/topology/BaseTopology.h

@@ -174,6 +174,8 @@ class SOFA_CORE_API TopologyContainer : public sofa::core::topology::BaseTopolog
     const SeqQuads& getQuads()         override { static SeqQuads     empty; return empty; }
     const SeqTetrahedra& getTetrahedra()       override { static SeqTetrahedra    empty; return empty; }
     const SeqHexahedra& getHexahedra()         override { static SeqHexahedra     empty; return empty; }
+    const SeqPrisms& getPrisms() override { static SeqPrisms empty; return empty; }
+    const SeqPyramids& getPyramids() override { static SeqPyramids empty; return empty; }
 
     /** \brief Get the current revision of this mesh.
     *

Sofa/framework/Core/src/sofa/core/topology/Topology.h

@@ -71,6 +71,8 @@ class SOFA_CORE_API Topology : public virtual sofa::core::objectmodel::BaseObjec
     typedef sofa::Index HexahedronID;
     SOFA_CORE_TOPOLOGY_ATTRIBUTE_DEPRECATED__ALIASES_INDEX()
     typedef sofa::Index HexaID;
+    SOFA_CORE_TOPOLOGY_ATTRIBUTE_DEPRECATED__ALIASES_INDEX()
+    typedef sofa::Index PrismID;
 
     inline static const auto InvalidSet = sofa::topology::InvalidSet;
     static constexpr auto InvalidEdge = sofa::topology::InvalidEdge;

Sofa/framework/Core/test/topology/TopologySubsetIndices_test.cpp

@@ -45,11 +45,13 @@ class SimplePointTopology: public BaseMeshTopology
         m_data.createTopologyHandler(this);
     }
 
-    virtual const SeqEdges& getEdges() { return m_edges; }
-    virtual const SeqTriangles& getTriangles() { return m_triangles; }
-    virtual const SeqQuads& getQuads() { return m_quads; }
-    virtual const SeqTetrahedra& getTetrahedra() { return m_tetra; }
-    virtual const SeqHexahedra& getHexahedra() { return m_hexa; }
+    const SeqEdges& getEdges() override { return m_edges; }
+    const SeqTriangles& getTriangles() override { return m_triangles; }
+    const SeqQuads& getQuads() override { return m_quads; }
+    const SeqTetrahedra& getTetrahedra() override { return m_tetra; }
+    const SeqHexahedra& getHexahedra() override { return m_hexa; }
+    const SeqPrisms& getPrisms() override { return m_prisms; }
+    const SeqPyramids& getPyramids() override { return m_pyramids; }
 
     virtual sofa::geometry::ElementType getTopologyType() const
     {
@@ -78,6 +80,8 @@ class SimplePointTopology: public BaseMeshTopology
     sofa::type::vector<Quad> m_quads;
     sofa::type::vector<Tetra> m_tetra;
     sofa::type::vector<Hexa> m_hexa;
+    sofa::type::vector<Prism> m_prisms;
+    sofa::type::vector<Pyramid> m_pyramids;
 
     TopologySubsetIndices m_data;
     type::vector<sofa::Index> m_points;