3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename its storing functions

Browse Source
This commit is contained in:
Filip Sykala 2022-03-02 12:23:22 +01:00
parent 99d3e102c8
commit 2a62881c39
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/QuadricEdgeCollapse.cpp
View File

@ -184,7 +184,7 @@ void Slic3r::its_quadric_edge_collapse(
throw_on_cancel(); throw_on_cancel();
status_fn(status_init_size); 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); //store_surround("triangle_surround1.obj", 1182, 1, its, v_infos, e_infos);
// convert from triangle index to mutable priority queue index // convert from triangle index to mutable priority queue index
@ -896,7 +896,7 @@ void QuadricEdgeCollapse::store_surround(const char *obj_filename,
std::vector<size_t> trs; std::vector<size_t> trs;
trs.reserve(triangles.size()); trs.reserve(triangles.size());
for (size_t ti : triangles) trs.push_back(ti); 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"); // its_write_obj(its,"original.obj");
} }

12
src/libslic3r/TriangleMesh.cpp
View File

@ -775,9 +775,9 @@ int its_compactify_vertices(indexed_triangle_set &its, bool shrink_to_fit)
return removed; return removed;
} }
bool its_store_triangle(const indexed_triangle_set &its, bool its_store_triangle_to_obj(const indexed_triangle_set &its,
const char * obj_filename, const char *obj_filename,
size_t triangle_index) size_t triangle_index)
{ {
if (its.indices.size() <= triangle_index) return false; if (its.indices.size() <= triangle_index) return false;
Vec3i t = its.indices[triangle_index]; 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); return its_write_obj(its2, obj_filename);
} }
bool its_store_triangles(const indexed_triangle_set &its, bool its_store_triangles_to_obj(const indexed_triangle_set &its,
const char * obj_filename, const char *obj_filename,
const std::vector<size_t> & triangles) const std::vector<size_t> &triangles)
{ {
indexed_triangle_set its2; indexed_triangle_set its2;
its2.vertices.reserve(triangles.size() * 3); its2.vertices.reserve(triangles.size() * 3);

4
src/libslic3r/TriangleMesh.hpp
View File

@ -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); int its_compactify_vertices(indexed_triangle_set &its, bool shrink_to_fit = true);
// store part of index triangle set // 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_triangle_to_obj(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<size_t>& triangles); bool its_store_triangles_to_obj(const indexed_triangle_set &its, const char *obj_filename, const std::vector<size_t>& triangles);
std::vector<indexed_triangle_set> its_split(const indexed_triangle_set &its); std::vector<indexed_triangle_set> its_split(const indexed_triangle_set &its);
std::vector<indexed_triangle_set> its_split(const indexed_triangle_set &its, std::vector<Vec3i> &face_neighbors); std::vector<indexed_triangle_set> its_split(const indexed_triangle_set &its, std::vector<Vec3i> &face_neighbors);