diff --git a/src/libslic3r/QuadricEdgeCollapse.cpp b/src/libslic3r/QuadricEdgeCollapse.cpp index 48a72e6d8..4e8bc0353 100644 --- a/src/libslic3r/QuadricEdgeCollapse.cpp +++ b/src/libslic3r/QuadricEdgeCollapse.cpp @@ -184,7 +184,7 @@ void Slic3r::its_quadric_edge_collapse( throw_on_cancel(); status_fn(status_init_size); - //its_store_triangle(its, "triangle.obj", 1182); + //its_store_triangle_to_obj(its, "triangle.obj", 1182); //store_surround("triangle_surround1.obj", 1182, 1, its, v_infos, e_infos); // convert from triangle index to mutable priority queue index @@ -896,7 +896,7 @@ void QuadricEdgeCollapse::store_surround(const char *obj_filename, std::vector trs; trs.reserve(triangles.size()); for (size_t ti : triangles) trs.push_back(ti); - its_store_triangles(its, obj_filename, trs); + its_store_triangles_to_obj(its, obj_filename, trs); // its_write_obj(its,"original.obj"); } diff --git a/src/libslic3r/TriangleMesh.cpp b/src/libslic3r/TriangleMesh.cpp index 0dffdaab0..97ed74ba4 100644 --- a/src/libslic3r/TriangleMesh.cpp +++ b/src/libslic3r/TriangleMesh.cpp @@ -775,9 +775,9 @@ int its_compactify_vertices(indexed_triangle_set &its, bool shrink_to_fit) return removed; } -bool its_store_triangle(const indexed_triangle_set &its, - const char * obj_filename, - size_t triangle_index) +bool its_store_triangle_to_obj(const indexed_triangle_set &its, + const char *obj_filename, + size_t triangle_index) { if (its.indices.size() <= triangle_index) return false; Vec3i t = its.indices[triangle_index]; @@ -788,9 +788,9 @@ bool its_store_triangle(const indexed_triangle_set &its, return its_write_obj(its2, obj_filename); } -bool its_store_triangles(const indexed_triangle_set &its, - const char * obj_filename, - const std::vector & triangles) +bool its_store_triangles_to_obj(const indexed_triangle_set &its, + const char *obj_filename, + const std::vector &triangles) { indexed_triangle_set its2; its2.vertices.reserve(triangles.size() * 3); diff --git a/src/libslic3r/TriangleMesh.hpp b/src/libslic3r/TriangleMesh.hpp index 3f3af0261..ba36b6bba 100644 --- a/src/libslic3r/TriangleMesh.hpp +++ b/src/libslic3r/TriangleMesh.hpp @@ -210,8 +210,8 @@ int its_remove_degenerate_faces(indexed_triangle_set &its, bool shrink_to_fit = int its_compactify_vertices(indexed_triangle_set &its, bool shrink_to_fit = true); // store part of index triangle set -bool its_store_triangle(const indexed_triangle_set &its, const char *obj_filename, size_t triangle_index); -bool its_store_triangles(const indexed_triangle_set &its, const char *obj_filename, const std::vector& triangles); +bool its_store_triangle_to_obj(const indexed_triangle_set &its, const char *obj_filename, size_t triangle_index); +bool its_store_triangles_to_obj(const indexed_triangle_set &its, const char *obj_filename, const std::vector& triangles); std::vector its_split(const indexed_triangle_set &its); std::vector its_split(const indexed_triangle_set &its, std::vector &face_neighbors);