GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 06:26:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix move store function behinde macro

Browse Source
This commit is contained in:
Filip Sykala 2022-06-21 16:59:34 +02:00
parent 093d2dfccd
commit 65bcb896b4
1 changed files with 33 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/libslic3r/CutSurface.cpp
View File

@ -748,19 +748,7 @@ SurfaceCut Slic3r::cut_surface(const indexed_triangle_set &model,
// Self Intersection of surface cuts // Self Intersection of surface cuts
// It is made by damaged models and multi volumes // It is made by damaged models and multi volumes
//priv::merge_intersections(result);
priv::merge_intersections(result);
// std::vector<size_t> best_cut_indices;
// for (size_t i = 0; i < cutAOIs.size(); ++i)
// if (is_best_cut[i]) best_cut_indices.push_back(i);
//
// // cut off part + filtrate cutAOIs
// priv::merge_cuts(cutAOIs, cgal_model, best_cut_indices);
//#ifdef DEBUG_OUTPUT_DIR
// priv::store(cutAOIs, cgal_model, DEBUG_OUTPUT_DIR + "merged-aois/");
// // only debug
//#endif // DEBUG_OUTPUT_DIR
// TODO: fill skipped source triangles to surface of cut // TODO: fill skipped source triangles to surface of cut
return merge(std::move(result)); return merge(std::move(result));
@ -2275,39 +2263,6 @@ priv::ProjectionDistances priv::choose_best_distance(
return result; return result;
} }
// store projection center as circle
void priv::store(const Vec3f &vertex,
const Vec3f &normal,
const std::string &file,
float size)
{
int flatten = 20;
size_t min_i = 0;
for (size_t i = 1; i < 3; i++)
if (normal[min_i] > normal[i])
min_i = i;
Vec3f up_ = Vec3f::Zero();
up_[min_i] = 1.f;
Vec3f side = normal.cross(up_).normalized() * size;
Vec3f up = side.cross(normal).normalized() * size;
indexed_triangle_set its;
its.vertices.reserve(flatten + 1);
its.indices.reserve(flatten);
its.vertices.push_back(vertex);
its.vertices.push_back(vertex + up);
size_t max_i = static_cast<size_t>(flatten);
for (size_t i = 1; i < max_i; i++) {
float angle = i * 2 * M_PI / flatten;
Vec3f v = vertex + sin(angle) * side + cos(angle) * up;
its.vertices.push_back(v);
its.indices.emplace_back(0, i, i + 1);
}
its.indices.emplace_back(0, flatten, 1);
its_write_obj(its, file.c_str());
}
bool priv::merge_intersection(SurfaceCut &cut1, const SurfaceCut &cut2) { bool priv::merge_intersection(SurfaceCut &cut1, const SurfaceCut &cut2) {
return false; return false;
} }
@ -2409,6 +2364,38 @@ SurfaceCuts priv::create_surface_cuts(const CutAOIs &cuts,
} }
#ifdef DEBUG_OUTPUT_DIR #ifdef DEBUG_OUTPUT_DIR
// store projection center as circle
void priv::store(const Vec3f &vertex,
const Vec3f &normal,
const std::string &file,
float size)
{
int flatten = 20;
size_t min_i = 0;
for (size_t i = 1; i < 3; i++)
if (normal[min_i] > normal[i]) min_i = i;
Vec3f up_ = Vec3f::Zero();
up_[min_i] = 1.f;
Vec3f side = normal.cross(up_).normalized() * size;
Vec3f up = side.cross(normal).normalized() * size;
indexed_triangle_set its;
its.vertices.reserve(flatten + 1);
its.indices.reserve(flatten);
its.vertices.push_back(vertex);
its.vertices.push_back(vertex + up);
size_t max_i = static_cast<size_t>(flatten);
for (size_t i = 1; i < max_i; i++) {
float angle = i * 2 * M_PI / flatten;
Vec3f v = vertex + sin(angle) * side + cos(angle) * up;
its.vertices.push_back(v);
its.indices.emplace_back(0, i, i + 1);
}
its.indices.emplace_back(0, flatten, 1);
its_write_obj(its, file.c_str());
}
void priv::store(CutMesh &mesh, const FaceTypeMap &face_type_map, const std::string& file) void priv::store(CutMesh &mesh, const FaceTypeMap &face_type_map, const std::string& file)
{ {
auto face_colors = mesh.add_property_map<priv::FI, CGAL::Color>("f:color").first; auto face_colors = mesh.add_property_map<priv::FI, CGAL::Color>("f:color").first;