rename SurfaceMeshGL::triangulate()

prevent SurfaceMeshGL::triangulate() from shadowing SurfaceMesh::triangulate()
pmp-library · Jun 2, 2020 · 73425e1 · 73425e1
1 parent e03b457
commit 73425e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/pmp/visualization/SurfaceMeshGL.cpp b/src/pmp/visualization/SurfaceMeshGL.cpp
@@ -341,7 +341,7 @@ void SurfaceMeshGL::update_opengl_buffers()
             assert(cornerVertices.size() >= 3);
 
             // tessellate face into triangles
-            triangulate(cornerPositions, triangles);
+            tesselate(cornerPositions, triangles);
             for (auto& t : triangles)
             {
                 int i0 = t[0];
@@ -654,8 +654,8 @@ void SurfaceMeshGL::draw(const mat4& projection_matrix,
     glCheckError();
 }
 
-void SurfaceMeshGL::triangulate(const std::vector<vec3>& points,
-                                std::vector<ivec3>& triangles)
+void SurfaceMeshGL::tesselate(const std::vector<vec3>& points,
+                              std::vector<ivec3>& triangles)
 {
     const int n = points.size();
 

diff --git a/src/pmp/visualization/SurfaceMeshGL.h b/src/pmp/visualization/SurfaceMeshGL.h
@@ -133,8 +133,8 @@ class SurfaceMeshGL : public SurfaceMesh
 
     // triangulate a polygon such that the sum of squared triangle areas is minimized.
     // this prevents overlapping/folding triangles for non-convex polygons.
-    void triangulate(const std::vector<vec3>& points,
-                     std::vector<ivec3>& triangles);
+    void tesselate(const std::vector<vec3>& points,
+                   std::vector<ivec3>& triangles);
 
 private:
     //! OpenGL buffers