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

Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of default bed in thumbnails

Browse source 
(cherry picked from commit prusa3d/PrusaSlicer@568bd39c5a)
This commit is contained in:
enricoturri1966 2023-10-27 10:08:29 +08:00 • committed by Noisyfox
parent 96c8c11030
commit cabb8fcf6e
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/slic3r/GUI/3DBed.cpp
View file

@ -688,7 +688,7 @@ void Bed3D::render_model(const Transform3d& view_matrix, const Transform3d& proj
void Bed3D::render_custom(GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom) void Bed3D::render_custom(GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom)
{ {
if (m_model_filename.empty()) { if (m_model_filename.empty()) {
render_default(bottom); render_default(bottom, view_matrix, projection_matrix);
return; return;
} }
@ -699,7 +699,7 @@ void Bed3D::render_custom(GLCanvas3D& canvas, const Transform3d& view_matrix, co
render_texture(bottom, canvas);*/ render_texture(bottom, canvas);*/
} }
void Bed3D::render_default(bool bottom) void Bed3D::render_default(bool bottom, const Transform3d& view_matrix, const Transform3d& projection_matrix)
{ {
bool picking = false; bool picking = false;
m_texture.reset(); m_texture.reset();
@ -710,9 +710,8 @@ void Bed3D::render_default(bool bottom)
if (shader != nullptr) { if (shader != nullptr) {
shader->start_using(); shader->start_using();
const Camera& camera = wxGetApp().plater()->get_camera(); shader->set_uniform("view_model_matrix", view_matrix);
shader->set_uniform("view_model_matrix", camera.get_view_matrix()); shader->set_uniform("projection_matrix", projection_matrix);
shader->set_uniform("projection_matrix", camera.get_projection_matrix());
glsafe(::glEnable(GL_DEPTH_TEST)); glsafe(::glEnable(GL_DEPTH_TEST));
glsafe(::glEnable(GL_BLEND)); glsafe(::glEnable(GL_BLEND));

2
src/slic3r/GUI/3DBed.hpp
View file

@ -166,7 +166,7 @@ private:
//void render_texture(bool bottom, GLCanvas3D& canvas); //void render_texture(bool bottom, GLCanvas3D& canvas);
void render_model(const Transform3d& view_matrix, const Transform3d& projection_matrix); void render_model(const Transform3d& view_matrix, const Transform3d& projection_matrix);
void render_custom(GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom); void render_custom(GLCanvas3D& canvas, const Transform3d& view_matrix, const Transform3d& projection_matrix, bool bottom);
void render_default(bool bottom); void render_default(bool bottom, const Transform3d& view_matrix, const Transform3d& projection_matrix);
}; };
} // GUI } // GUI