support generation when support point is added or removed. Rendering interface for SLA supports

This commit is contained in:
tamasmeszaros 2018-11-12 17:35:57 +01:00
parent 98a640ea06
commit 31967d0d1d
5 changed files with 76 additions and 2 deletions

View file

@ -2,6 +2,7 @@
#include "GLGizmo.hpp"
#include "GUI.hpp"
#include "GUI_App.hpp"
#include "../../libslic3r/Utils.hpp"
@ -1663,6 +1664,9 @@ void GLGizmoSlaSupports::clicked_on_object(const Vec2d& mouse_position)
m_grabbers.push_back(Grabber());
m_grabbers.back().center = new_pos.cast<double>();
m_model_object->sla_support_points.push_back(new_pos);
// This should trigger the support generation
wxGetApp().plater()->reslice();
}
catch (...) {}
}
@ -1672,12 +1676,18 @@ void GLGizmoSlaSupports::delete_current_grabber(bool delete_all)
if (delete_all) {
m_grabbers.clear();
m_model_object->sla_support_points.clear();
// This should trigger the support generation
wxGetApp().plater()->reslice();
}
else
if (m_hover_id != -1) {
m_grabbers.erase(m_grabbers.begin() + m_hover_id);
m_model_object->sla_support_points.erase(m_model_object->sla_support_points.begin() + m_hover_id);
m_hover_id = -1;
// This should trigger the support generation
wxGetApp().plater()->reslice();
}
}

View file

@ -965,7 +965,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) :
background_process.set_sliced_event(EVT_SLICING_COMPLETED);
background_process.set_finished_event(EVT_PROCESS_COMPLETED);
// Default printer technology for default config.
background_process.select_technology(wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology());
background_process.select_technology(q->printer_technology());
// Register progress callback from the Print class to the Platter.
print.set_status_callback([this](int percent, const std::string &message) {
wxCommandEvent event(EVT_PROGRESS_BAR);
@ -1786,6 +1786,21 @@ void Plater::priv::on_process_completed(wxCommandEvent &evt)
// refresh preview
if (this->preview != nullptr)
this->preview->reload_print();
// TODO: this needs to be implemented somehow
if(q->printer_technology() == PrinterTechnology::ptSLA) {
class Renderer: public SLASupportRenderer {
public:
void add_pillar(const Mesh&, ClickCb ) override {}
void add_head(const Mesh&, ClickCb) override {}
void add_bridge(const Mesh&, ClickCb) override {}
void add_junction(const Mesh&, ClickCb) override {}
void add_pad(const Mesh&, ClickCb) override {}
} renderer;
sla_print.render_supports(renderer);
}
}
void Plater::priv::on_layer_editing_toggled(bool enable)
@ -2331,6 +2346,11 @@ wxGLCanvas* Plater::canvas3D()
return p->canvas3D;
}
PrinterTechnology Plater::printer_technology() const
{
return wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology();
}
void Plater::changed_object(int obj_idx)
{
if (obj_idx < 0)

View file

@ -18,6 +18,8 @@ namespace Slic3r {
class Model;
class Print;
class SLAPrint;
namespace GUI {
class MainFrame;
@ -133,6 +135,8 @@ public:
int get_selected_object_idx();
wxGLCanvas* canvas3D();
PrinterTechnology printer_technology() const;
private:
struct priv;
std::unique_ptr<priv> p;