[tests] Add command test to tests/unittest/Core/topomesh.cpp

Co-authored-by: David Vanderhaeghe <github@dlyr.fr>

update test

Author: MathiasPaulin

tests/unittest/Core/topomesh.cpp

@@ -13,8 +13,8 @@ using namespace Ra::Core;
 using namespace Ra::Core::Utils;
 using namespace Ra::Core::Geometry;
 
-bool isSameMesh( Ra::Core::Geometry::TriangleMesh& meshOne,
-                 Ra::Core::Geometry::TriangleMesh& meshTwo ) {
+bool isSameMesh( const Ra::Core::Geometry::TriangleMesh& meshOne,
+                 const Ra::Core::Geometry::TriangleMesh& meshTwo ) {
 
     bool result = true;
     int i       = 0;
@@ -196,13 +196,13 @@ TEST_CASE( "Core/Geometry/TopologicalMesh", "[Core][Core/Geometry][TopologicalMe
     using Ra::Core::Geometry::TopologicalMesh;
     using Ra::Core::Geometry::TriangleMesh;
 
-    using Catmull =
-        OpenMesh::Subdivider::Uniform::CatmullClarkT<Ra::Core::Geometry::TopologicalMesh>;
-    using Loop = OpenMesh::Subdivider::Uniform::LoopT<Ra::Core::Geometry::TopologicalMesh>;
+    // using Catmull =
+    //     OpenMesh::Subdivider::Uniform::CatmullClarkT<Ra::Core::Geometry::TopologicalMesh>;
+    // using Loop = OpenMesh::Subdivider::Uniform::LoopT<Ra::Core::Geometry::TopologicalMesh>;
 
-    using Decimater = OpenMesh::Decimater::DecimaterT<Ra::Core::Geometry::TopologicalMesh>;
-    using HModQuadric =
-        OpenMesh::Decimater::ModQuadricT<Ra::Core::Geometry::TopologicalMesh>::Handle;
+    // using Decimater = OpenMesh::Decimater::DecimaterT<Ra::Core::Geometry::TopologicalMesh>;
+    // using HModQuadric =
+    //     OpenMesh::Decimater::ModQuadricT<Ra::Core::Geometry::TopologicalMesh>::Handle;
 
     TriangleMesh newMesh;
     TriangleMesh newMesh2;
@@ -384,3 +384,118 @@ TEST_CASE( "Core/Geometry/TopologicalMesh/EdgeSplit", "[Core][Core/Geometry][Top
     // collapse
     // check float attrib value
 }
+
+TEST_CASE( "Core/Geometry/TopologicalMesh/Manifold", "[Core][Core/Geometry][TopologicalMesh]" ) {
+
+    struct MyNonManifoldCommand {
+        inline MyNonManifoldCommand( int target ) : targetNonManifoldFaces( target ) {}
+        inline void initialize( const TriangleMesh& /*triMesh*/ ) {}
+        inline void process( const std::vector<TopologicalMesh::VertexHandle>& /*face_vhandles*/ ) {
+            LOG( logINFO ) << "Non Manifold face found";
+            nonManifoldFaces++;
+        }
+        inline void postProcess( TopologicalMesh& /*tm*/ ) {
+            // Todo : For each non manifold face, remove the vertices that are not part of a face of
+            // the topomesh For the test, this will reduce the mesh_2 to mesh1
+            REQUIRE( nonManifoldFaces == targetNonManifoldFaces );
+            LOG( logINFO ) << "Process non-manifold faces";
+        }
+
+        int nonManifoldFaces {0};
+        const int targetNonManifoldFaces;
+    };
+
+    VectorArray<Vector3> vertices = {
+        {0_ra, 0_ra, 0_ra}, {0_ra, 1_ra, 0_ra}, {1_ra, 1_ra, 0_ra}, {1_ra, 0_ra, 0_ra}};
+    VectorArray<Vector3> normals {
+        {0_ra, 0_ra, 1_ra}, {0_ra, 0_ra, 1_ra}, {0_ra, 0_ra, 1_ra}, {0_ra, 0_ra, 1_ra}};
+    VectorArray<Vector3ui> indices {{0, 2, 1}, {0, 3, 2}};
+
+    VectorArray<Vector3> vertices_2 = {{0_ra, 0_ra, 0_ra},
+                                       {0_ra, 1_ra, 0_ra},
+                                       {1_ra, 1_ra, 0_ra},
+                                       {1_ra, 0_ra, 0_ra},
+                                       {1_ra, 0_ra, 1_ra}};
+    VectorArray<Vector3> normals_2 {
+        {0_ra, 0_ra, 1_ra},
+        {0_ra, 0_ra, 1_ra},
+        {0_ra, 0_ra, 1_ra},
+        {0_ra, 0_ra, 1_ra},
+        {0_ra, -1_ra, 0_ra},
+    };
+
+    VectorArray<Vector3ui> indices_2 {{0, 2, 1}, {0, 3, 2}, {0, 2, 4}};
+
+    auto buildMesh = []( const VectorArray<Vector3>& v,
+                         const VectorArray<Vector3>& n,
+                         const VectorArray<Vector3ui>& i ) {
+        TriangleMesh m;
+        m.setVertices( v );
+        m.setNormals( n );
+        auto& idx = m.getIndicesWithLock();
+        std::copy( i.begin(), i.end(), std::back_inserter( idx ) );
+        m.indicesUnlock();
+
+        LOG( logINFO ) << " Built a mesh with " << m.vertices().size() << " vertices, "
+                       << m.normals().size() << " normals and " << m.getIndices().size()
+                       << " indices.";
+
+        return m;
+    };
+
+    auto testConverter =
+        []( const TriangleMesh& mesh, const TriangleMesh& mesh2, MyNonManifoldCommand command ) {
+            // test with functor
+            LOG( logINFO ) << "Converter with custom command";
+            TopologicalMesh topo2 {mesh2, command};
+            auto mesh3 = topo2.toTriangleMesh();
+            REQUIRE( isSameMesh( mesh, mesh3 ) );
+
+            // test without functor
+            LOG( logINFO ) << "Converter without custom command";
+            TopologicalMesh topo3 {mesh2};
+            auto mesh4 = topo3.toTriangleMesh();
+            REQUIRE( isSameMesh( mesh, mesh4 ) );
+            return mesh4;
+        };
+
+    using Vector5 = Eigen::Matrix<Scalar, 5, 1>;
+    VectorArray<Vector5> attrib_array {
+        {0_ra, 0_ra, 0_ra, 0_ra, 1_ra},
+        {0_ra, 0_ra, 0_ra, 0_ra, 1_ra},
+        {0_ra, 0_ra, 0_ra, 0_ra, 1_ra},
+        {0_ra, -1_ra, 0_ra, 0_ra, 0_ra},
+    };
+
+    // well formed mesh
+    auto mesh = buildMesh( vertices, normals, indices );
+
+    // edge shared by three faces
+    LOG( logINFO ) << "Test with edge shared by three faces";
+    auto mesh2 = buildMesh( vertices_2, normals_2, indices_2 );
+    testConverter( mesh, mesh2, MyNonManifoldCommand( 1 ) ); // we should find 1 non-manifold face
+
+    // test with unsupported attribute type
+    LOG( logINFO ) << "Test with unsupported attribute (all faces are manifold)";
+    auto mesh3 {mesh}, mesh4 {mesh};
+    auto handle  = mesh3.addAttrib<Vector5>( "vector5_attrib" );
+    auto& attrib = mesh3.getAttrib( handle );
+    auto& buf    = attrib.getDataWithLock();
+    buf          = attrib_array;
+    attrib.unlock();
+
+    REQUIRE( mesh4.vertexAttribs().hasSameAttribs( mesh.vertexAttribs() ) );
+    REQUIRE( mesh.vertexAttribs().hasSameAttribs( mesh4.vertexAttribs() ) );
+    REQUIRE( !mesh4.vertexAttribs().hasSameAttribs( mesh3.vertexAttribs() ) );
+    REQUIRE( !mesh3.vertexAttribs().hasSameAttribs( mesh4.vertexAttribs() ) );
+    mesh4 = testConverter(
+        mesh, mesh3, MyNonManifoldCommand( 0 ) ); // we should find 0 non-manifold face
+    REQUIRE( mesh4.vertexAttribs().hasSameAttribs( mesh.vertexAttribs() ) );
+    REQUIRE( mesh.vertexAttribs().hasSameAttribs( mesh4.vertexAttribs() ) );
+    REQUIRE( !mesh4.vertexAttribs().hasSameAttribs( mesh3.vertexAttribs() ) );
+    REQUIRE( !mesh3.vertexAttribs().hasSameAttribs( mesh4.vertexAttribs() ) );
+
+    // TODO : build a functor that add the faces as independant faces in the topomesh and
+    // define a manifold mesh that is similar to the result of processing of this non manifold.
+    //
+}