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

Code cleanup

Browse Source
This commit is contained in:
Enrico Turri 2018-09-24 10:28:52 +02:00
parent 1026a9c817
commit 270341300f
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xs/src/slic3r/GUI/GLGizmo.cpp
View File

@ -1438,7 +1438,7 @@ void GLGizmoFlatten::update_planes()
polygon = Slic3r::Geometry::convex_hull(polygon); // To remove the inner points polygon = Slic3r::Geometry::convex_hull(polygon); // To remove the inner points
// We will calculate area of the polygon and discard ones that are too small // We will calculate area of the polygons and discard ones that are too small
// The limit is more forgiving in case the normal is in the direction of the coordinate axes // The limit is more forgiving in case the normal is in the direction of the coordinate axes
float area_threshold = (std::abs(normal(0)) > 0.999f || std::abs(normal(1)) > 0.999f || std::abs(normal(2)) > 0.999f) ? minimal_area : 10.0f * minimal_area; float area_threshold = (std::abs(normal(0)) > 0.999f || std::abs(normal(1)) > 0.999f || std::abs(normal(2)) > 0.999f) ? minimal_area : 10.0f * minimal_area;
float& area = m_planes[polygon_id].area; float& area = m_planes[polygon_id].area;
@ -1451,12 +1451,10 @@ void GLGizmoFlatten::update_planes()
continue; continue;
} }
// We check the inner angles and discard polygon with angles smaller than the following threshold // We check the inner angles and discard polygons with angles smaller than the following threshold
const double angle_threshold = ::cos(10.0 * (double)PI / 180.0); const double angle_threshold = ::cos(10.0 * (double)PI / 180.0);
bool discard = false; bool discard = false;
std::cout << std::endl << "polygon: " << polygon_id << " - " << polygon.size() << "(" << area << "/" << 100.0 * area / min_bb_face_area << ")" << std::endl;
for (unsigned int i = 0; i < polygon.size(); ++i) for (unsigned int i = 0; i < polygon.size(); ++i)
{ {
const Vec3d& prec = polygon[(i == 0) ? polygon.size() - 1 : i - 1]; const Vec3d& prec = polygon[(i == 0) ? polygon.size() - 1 : i - 1];
@ -1468,14 +1466,10 @@ void GLGizmoFlatten::update_planes()
discard = true; discard = true;
break; break;
} }
std::cout << ::acos((prec - curr).normalized().dot((next - curr).normalized())) * 180.0 / PI << std::endl;
} }
if (discard) if (discard)
{ {
// m_planes.erase(m_planes.begin() + polygon_id);
// --polygon_id;
m_planes.erase(m_planes.begin() + (polygon_id--)); m_planes.erase(m_planes.begin() + (polygon_id--));
continue; continue;
} }