3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 01:37:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

WIP: FDM gizmo: triangles not facing the camera are no more selected with fdm selection tool

Browse source
This commit is contained in:
Lukas Matena 2019-10-24 14:01:03 +02:00
parent 590569e8f6
commit 1b05ecae8c
1 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
View file

@ -251,17 +251,15 @@ void GLGizmoFdmSupports::update_mesh()
m_mesh = &m_model_object->volumes.front()->mesh(); m_mesh = &m_model_object->volumes.front()->mesh();
m_its = &m_mesh->its; m_its = &m_mesh->its;
m_selected_facets.clear(); m_selected_facets.assign(m_mesh->its.indices.size(), false);
m_selected_facets.resize(m_mesh->its.indices.size());
// Prepare vector of vertex_index - facet_index pairs to quickly find adjacent facets // Prepare vector of vertex_index - facet_index pairs to quickly find adjacent facets
m_neighbors.clear();
m_neighbors.resize(3 * m_mesh->its.indices.size()); m_neighbors.resize(3 * m_mesh->its.indices.size());
for (size_t i=0; i<m_mesh->its.indices.size(); ++i) { for (size_t i=0; i<m_mesh->its.indices.size(); ++i) {
const stl_triangle_vertex_indices& ind = m_mesh->its.indices[i]; const stl_triangle_vertex_indices& ind = m_mesh->its.indices[i];
m_neighbors.emplace_back(ind(0), i); m_neighbors[3*i] = std::make_pair(ind(0), i);
m_neighbors.emplace_back(ind(1), i); m_neighbors[3*i+1] = std::make_pair(ind(1), i);
m_neighbors.emplace_back(ind(2), i); m_neighbors[3*i+2] = std::make_pair(ind(2), i);
} }
std::sort(m_neighbors.begin(), m_neighbors.end()); std::sort(m_neighbors.begin(), m_neighbors.end());
@ -353,21 +351,33 @@ bool GLGizmoFdmSupports::gizmo_event(SLAGizmoEventType action, const Vec2d& mous
return (diff - diff.dot(dir) * dir).squaredNorm(); return (diff - diff.dot(dir) * dir).squaredNorm();
}; };
std::vector<size_t> next_facets{facet}; // A lambda to determine whether this facet is potentionally visible (still can be obscured)
NeighborData helper_pair = std::make_pair(0, 0); auto faces_camera = [&dir, this](const size_t& facet) -> bool {
std::vector<bool> visited(m_selected_facets.size(), false); return (m_mesh->stl.facet_start[facet].normal.dot(dir) > 0.);
size_t facet_idx = 0; };
while (facet_idx < next_facets.size()) { // Now start with the facet the pointer points to and check all adjacent facets. m_neighbors vector stores
size_t facet = next_facets[facet_idx]; // pairs of vertex_idx - facet_idx and is sorted with respect to the former. Neighboring facet index can be
// quickly found by finding a vertex in the list and read the respective facet ids.
std::vector<size_t> facets_to_select{facet};
NeighborData vertex = std::make_pair(0, 0);
std::vector<bool> visited(m_selected_facets.size(), false); // keep track of facets we already processed
size_t facet_idx = 0; // index into facets_to_select
auto it = m_neighbors.end();
while (facet_idx < facets_to_select.size()) {
size_t facet = facets_to_select[facet_idx];
if (! visited[facet]) { if (! visited[facet]) {
// check all three vertices and in case they're close enough, find the remaining facets
// and add them to the list to be proccessed later
for (size_t i=0; i<3; ++i) { for (size_t i=0; i<3; ++i) {
helper_pair.first = m_mesh->its.indices[facet](i); // vertex index vertex.first = m_mesh->its.indices[facet](i); // vertex index
float dist = squared_distance_from_line(m_mesh->its.vertices[helper_pair.first]); float dist = squared_distance_from_line(m_mesh->its.vertices[vertex.first]);
if (dist < limit) { if (dist < limit) {
auto it = std::lower_bound(m_neighbors.begin(), m_neighbors.end(), helper_pair); it = std::lower_bound(m_neighbors.begin(), m_neighbors.end(), vertex);
while (it != m_neighbors.end() && it->first == helper_pair.first) { while (it != m_neighbors.end() && it->first == vertex.first) {
next_facets.push_back(it->second); if (it->second != facet && faces_camera(it->second))
facets_to_select.push_back(it->second);
++it; ++it;
} }
} }
@ -376,12 +386,10 @@ bool GLGizmoFdmSupports::gizmo_event(SLAGizmoEventType action, const Vec2d& mous
} }
++facet_idx; ++facet_idx;
} }
// Now just select all facets that passed
for (size_t next_facet : next_facets) for (size_t next_facet : facets_to_select)
m_selected_facets[next_facet] = select; m_selected_facets[next_facet] = select;
m_wait_for_up_event = true; m_wait_for_up_event = true;
m_parent.set_as_dirty(); m_parent.set_as_dirty();
return true; return true;