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

First prototype of CGAL hole-drilling

Browse Source
This commit is contained in:
Lukas Matena 2019-12-13 13:42:10 +01:00
parent 9805b02a25
commit 2cb30f3641
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/CMakeLists.txt
View File

@ -117,6 +117,8 @@ add_library(libslic3r STATIC
"${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h" "${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h"
Line.cpp Line.cpp
Line.hpp Line.hpp
MeshBoolean.cpp
MeshBoolean.hpp
Model.cpp Model.cpp
Model.hpp Model.hpp
Arrange.hpp Arrange.hpp

2
src/slic3r/CMakeLists.txt
View File

@ -176,7 +176,7 @@ add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES})
encoding_check(libslic3r_gui) encoding_check(libslic3r_gui)
target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi) target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi CGAL::CGAL)
if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY) if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
add_precompiled_header(libslic3r_gui pchheader.hpp FORCEINCLUDE) add_precompiled_header(libslic3r_gui pchheader.hpp FORCEINCLUDE)
endif () endif ()

30
src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
View File

@ -1,4 +1,3 @@
// Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code, which overrides our localization "L" macro.
#include "GLGizmoHollow.hpp" #include "GLGizmoHollow.hpp"
#include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GLCanvas3D.hpp"
#include "slic3r/GUI/Gizmos/GLGizmos.hpp" #include "slic3r/GUI/Gizmos/GLGizmos.hpp"
@ -12,6 +11,8 @@
#include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/Plater.hpp"
#include "slic3r/GUI/PresetBundle.hpp" #include "slic3r/GUI/PresetBundle.hpp"
#include "libslic3r/SLAPrint.hpp" #include "libslic3r/SLAPrint.hpp"
#include "libslic3r/TriangleMesh.hpp"
#include "libslic3r/MeshBoolean.hpp"
namespace Slic3r { namespace Slic3r {
@ -107,15 +108,15 @@ void GLGizmoHollow::on_render() const
if (! m_mesh) if (! m_mesh)
const_cast<GLGizmoHollow*>(this)->update_mesh(); const_cast<GLGizmoHollow*>(this)->update_mesh();
glsafe(::glEnable(GL_BLEND));
glsafe(::glEnable(GL_DEPTH_TEST));
if (m_volume_with_cavity) { if (m_volume_with_cavity) {
m_parent.get_shader().start_using(); m_parent.get_shader().start_using();
m_volume_with_cavity->render(); m_volume_with_cavity->render();
m_parent.get_shader().stop_using(); m_parent.get_shader().stop_using();
} }
glsafe(::glEnable(GL_BLEND));
glsafe(::glEnable(GL_DEPTH_TEST));
m_z_shift = selection.get_volume(*selection.get_volume_idxs().begin())->get_sla_shift_z(); m_z_shift = selection.get_volume(*selection.get_volume_idxs().begin())->get_sla_shift_z();
if (m_quadric != nullptr && selection.is_from_single_instance()) if (m_quadric != nullptr && selection.is_from_single_instance())
@ -583,12 +584,31 @@ void GLGizmoHollow::hollow_mesh()
wxGetApp().plater()->hollow(); wxGetApp().plater()->hollow();
} }
void GLGizmoHollow::update_hollowed_mesh(std::unique_ptr<TriangleMesh> &&mesh) void GLGizmoHollow::update_hollowed_mesh(std::unique_ptr<TriangleMesh> &&mesh)
{ {
// Called from Plater when the UI job finishes // Called from Plater when the UI job finishes
m_cavity_mesh = std::move(mesh); m_cavity_mesh = std::move(mesh);
if(m_cavity_mesh) {// create a new GLVolume that only has the cavity inside if(m_cavity_mesh) {
// First subtract the holes:
if (! m_model_object->sla_drain_holes.empty()) {
TriangleMesh holes_mesh;
for (const sla::DrainHole& hole : m_model_object->sla_drain_holes) {
TriangleMesh hole_mesh = make_cylinder(hole.radius, hole.height, 2*M_PI/8);
Eigen::Quaternionf q;
Transform3f m = Transform3f::Identity();
m.matrix().block(0, 0, 3, 3) = q.setFromTwoVectors(Vec3f::UnitZ(), hole.normal).toRotationMatrix();
hole_mesh.transform(m.cast<double>());
hole_mesh.translate(hole.pos);
holes_mesh.merge(hole_mesh);
//MeshBoolean::minus(*m_cavity_mesh.get(), hole_mesh);
}
MeshBoolean::minus(*m_cavity_mesh.get(), holes_mesh);
}
// create a new GLVolume that only has the cavity inside
Geometry::Transformation volume_trafo = m_model_object->volumes.front()->get_transformation(); Geometry::Transformation volume_trafo = m_model_object->volumes.front()->get_transformation();
volume_trafo.set_offset(volume_trafo.get_offset() + Vec3d(0., 0., m_z_shift)); volume_trafo.set_offset(volume_trafo.get_offset() + Vec3d(0., 0., m_z_shift));
m_volume_with_cavity.reset(new GLVolume(1.f, 0.f, 0.f, 0.5f)); m_volume_with_cavity.reset(new GLVolume(1.f, 0.f, 0.f, 0.5f));