style fixes

mlivesu · Jun 24, 2024 · 4b1f466 · 4b1f466
1 parent c2f1e22
commit 4b1f466
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/include/cinolib/merge_meshes_at_coincident_vertices.cpp b/include/cinolib/merge_meshes_at_coincident_vertices.cpp
@@ -45,15 +45,15 @@ void merge_meshes_at_coincident_vertices(const AbstractPolygonMesh<M,V,E,P> & m1
                                          const AbstractPolygonMesh<M,V,E,P> & m2,
                                                AbstractPolygonMesh<M,V,E,P> & res)
 {
-    cinolib::Octree octree;
+    Octree octree;
     octree.build_from_mesh_points(m1);
 
     res = m1;
 
     std::map<uint,uint> vmap;
     for(uint vid=0; vid<m2.num_verts(); ++vid)
     {
-        cinolib::vec3d p = m2.vert(vid);
+        vec3d p = m2.vert(vid);
 
         std::unordered_set<uint> ids;
         if(octree.contains(p, false, ids))
@@ -84,6 +84,8 @@ void merge_meshes_at_coincident_vertices(const AbstractPolygonMesh<M,V,E,P> & m1
     }
 }
 
+//::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
 template<class M, class V, class E, class F, class P>
 CINO_INLINE
 void merge_meshes_at_coincident_vertices(const AbstractPolyhedralMesh<M,V,E,F,P> & m1,

diff --git a/include/cinolib/merge_meshes_at_coincident_vertices.h b/include/cinolib/merge_meshes_at_coincident_vertices.h
@@ -47,6 +47,8 @@ void merge_meshes_at_coincident_vertices(const AbstractPolygonMesh<M,V,E,P> & m1
                                          const AbstractPolygonMesh<M,V,E,P> & m2,
                                                AbstractPolygonMesh<M,V,E,P> & res);
 
+//::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
 template<class M, class V, class E, class F, class P>
 CINO_INLINE
 void merge_meshes_at_coincident_vertices(const AbstractPolyhedralMesh<M,V,E,F,P> & m1,