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

Experiment with spherical cursor (painting gizmos)

Browse source
This commit is contained in:
Lukas Matena 2020-09-25 09:07:52 +02:00
parent 8bf0f75e83
commit c696e6ec19
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libslic3r/TriangleSelector.cpp
View file

@ -61,7 +61,7 @@ void TriangleSelector::select_patch(const Vec3f& hit, int facet_start,
// add neighboring facets to list to be proccessed later // add neighboring facets to list to be proccessed later
for (int n=0; n<3; ++n) { for (int n=0; n<3; ++n) {
int neighbor_idx = m_mesh->stl.neighbors_start[facet].neighbor[n]; int neighbor_idx = m_mesh->stl.neighbors_start[facet].neighbor[n];
if (neighbor_idx >=0 && faces_camera(neighbor_idx)) if (neighbor_idx >=0 && true/*faces_camera(neighbor_idx)*/)
facets_to_check.push_back(neighbor_idx); facets_to_check.push_back(neighbor_idx);
} }
} }
@ -206,8 +206,10 @@ void TriangleSelector::split_triangle(int facet_idx)
// Calculate distance of a point from a line. // Calculate distance of a point from a line.
bool TriangleSelector::is_point_inside_cursor(const Vec3f& point) const bool TriangleSelector::is_point_inside_cursor(const Vec3f& point) const
{ {
Vec3f diff = m_cursor.center - point; Vec3f diff = m_cursor.center - point;
return (diff - diff.dot(m_cursor.dir) * m_cursor.dir).squaredNorm() < m_cursor.radius_sqr; // return (diff - diff.dot(m_cursor.dir) * m_cursor.dir).squaredNorm() < m_cursor.radius_sqr;
return diff.squaredNorm() < m_cursor.radius_sqr;
} }

2
src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
View file

@ -119,6 +119,8 @@ void GLGizmoPainterBase::render_triangles(const Selection& selection) const
void GLGizmoPainterBase::render_cursor_circle() const void GLGizmoPainterBase::render_cursor_circle() const
{ {
return;
const Camera& camera = wxGetApp().plater()->get_camera(); const Camera& camera = wxGetApp().plater()->get_camera();
float zoom = (float)camera.get_zoom(); float zoom = (float)camera.get_zoom();
float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f; float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;