3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-20 07:11:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Make it work with mesa sw renderer

Browse source
This commit is contained in:
tamasmeszaros 2019-12-19 01:55:46 +01:00
parent fafc2a3510
commit bf44da0e37
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sandboxes/opencsg/main.cpp
View file

@ -2,6 +2,8 @@
#include <utility> #include <utility>
#include <memory> #include <memory>
#include "GLScene.hpp"
#include <GL/glew.h> #include <GL/glew.h>
#include <opencsg/opencsg.h> #include <opencsg/opencsg.h>
@ -18,8 +20,6 @@
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wx/glcanvas.h> #include <wx/glcanvas.h>
#include "GLScene.hpp"
#include "libslic3r/Model.hpp" #include "libslic3r/Model.hpp"
#include "libslic3r/Format/3mf.hpp" #include "libslic3r/Format/3mf.hpp"
#include "libslic3r/SLAPrint.hpp" #include "libslic3r/SLAPrint.hpp"
@ -68,7 +68,7 @@ public:
const wxSize ClientSize = GetClientSize(); const wxSize ClientSize = GetClientSize();
set_screen_size(ClientSize.x, ClientSize.y); set_screen_size(ClientSize.x, ClientSize.y);
repaint(); // repaint();
}); });
} }
@ -280,7 +280,7 @@ MyFrame::MyFrame(const wxString &title, const wxPoint &pos, const wxSize &size):
// glReadPixels would not return the alpha channel on NVIDIA if // glReadPixels would not return the alpha channel on NVIDIA if
// not requested when the GL context is created. // not requested when the GL context is created.
WX_GL_MIN_ALPHA, 8, WX_GL_DEPTH_SIZE, 8, WX_GL_STENCIL_SIZE, 8, WX_GL_MIN_ALPHA, 8, WX_GL_DEPTH_SIZE, 8, WX_GL_STENCIL_SIZE, 8,
WX_GL_SAMPLE_BUFFERS, GL_TRUE, WX_GL_SAMPLES, 4, 0}; /*WX_GL_SAMPLE_BUFFERS, GL_TRUE, WX_GL_SAMPLES, 4,*/ 0};
m_scene = std::make_shared<Scene>(); m_scene = std::make_shared<Scene>();
m_ctl = std::make_shared<Controller>(); m_ctl = std::make_shared<Controller>();
@ -509,7 +509,7 @@ void MyFrame::bind_canvas_events(MouseInput &ms)
void MyFrame::SLAJob::process() void MyFrame::SLAJob::process()
{ {
using Status = Slic3r::PrintBase::SlicingStatus; using SlStatus = Slic3r::PrintBase::SlicingStatus;
Slic3r::DynamicPrintConfig cfg; Slic3r::DynamicPrintConfig cfg;
auto model = Slic3r::Model::read_from_file(m_fname, &cfg); auto model = Slic3r::Model::read_from_file(m_fname, &cfg);
@ -521,7 +521,7 @@ void MyFrame::SLAJob::process()
params.to_object_step = Slic3r::slaposHollowing; params.to_object_step = Slic3r::slaposHollowing;
m_print->set_task(params); m_print->set_task(params);
m_print->set_status_callback([this](const Status &status) { m_print->set_status_callback([this](const SlStatus &status) {
update_status(status.percent, status.text); update_status(status.percent, status.text);
}); });