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

Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.

Browse source 
Shader: flat - Rectangle selection
This commit is contained in:
enricoturri1966 2022-03-01 15:39:00 +01:00
parent cc1d3b738d
commit 0d001ce84f
2 changed files with 48 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/slic3r/GUI/GLSelectionRectangle.cpp
View file

@ -74,22 +74,40 @@ namespace GUI {
if (!is_dragging()) if (!is_dragging())
return; return;
#if !ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
const Camera& camera = wxGetApp().plater()->get_camera(); const Camera& camera = wxGetApp().plater()->get_camera();
float inv_zoom = (float)camera.get_inv_zoom(); const float inv_zoom = (float)camera.get_inv_zoom();
#endif // !ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
Size cnv_size = canvas.get_canvas_size(); const Size cnv_size = canvas.get_canvas_size();
float cnv_half_width = 0.5f * (float)cnv_size.get_width(); #if ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
float cnv_half_height = 0.5f * (float)cnv_size.get_height(); const float cnv_width = (float)cnv_size.get_width();
const float cnv_height = (float)cnv_size.get_height();
if (cnv_width == 0.0f || cnv_height == 0.0f)
return;
#else
const float cnv_half_width = 0.5f * (float)cnv_size.get_width();
const float cnv_half_height = 0.5f * (float)cnv_size.get_height();
if (cnv_half_width == 0.0f || cnv_half_height == 0.0f) if (cnv_half_width == 0.0f || cnv_half_height == 0.0f)
return; return;
#endif // ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
Vec2d start(m_start_corner(0) - cnv_half_width, cnv_half_height - m_start_corner(1)); #if ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
Vec2d end(m_end_corner(0) - cnv_half_width, cnv_half_height - m_end_corner(1)); const float cnv_inv_width = 1.0f / cnv_width;
const float cnv_inv_height = 1.0f / cnv_height;
const float left = 2.0f * (get_left() * cnv_inv_width - 0.5f);
const float right = 2.0f * (get_right() * cnv_inv_width - 0.5f);
const float top = -2.0f * (get_top() * cnv_inv_height - 0.5f);
const float bottom = -2.0f * (get_bottom() * cnv_inv_height - 0.5f);
#else
const Vec2d start(m_start_corner.x() - cnv_half_width, cnv_half_height - m_start_corner.y());
const Vec2d end(m_end_corner.x() - cnv_half_width, cnv_half_height - m_end_corner.y());
const float left = (float)std::min(start(0), end(0)) * inv_zoom; const float left = (float)std::min(start.x(), end.x()) * inv_zoom;
const float top = (float)std::max(start(1), end(1)) * inv_zoom; const float top = (float)std::max(start.y(), end.y()) * inv_zoom;
const float right = (float)std::max(start(0), end(0)) * inv_zoom; const float right = (float)std::max(start.x(), end.x()) * inv_zoom;
const float bottom = (float)std::min(start(1), end(1)) * inv_zoom; const float bottom = (float)std::min(start.y(), end.y()) * inv_zoom;
#endif // ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
glsafe(::glLineWidth(1.5f)); glsafe(::glLineWidth(1.5f));
#if !ENABLE_GLBEGIN_GLEND_REMOVAL #if !ENABLE_GLBEGIN_GLEND_REMOVAL
@ -102,6 +120,7 @@ namespace GUI {
glsafe(::glDisable(GL_DEPTH_TEST)); glsafe(::glDisable(GL_DEPTH_TEST));
#if !ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
glsafe(::glPushMatrix()); glsafe(::glPushMatrix());
glsafe(::glLoadIdentity()); glsafe(::glLoadIdentity());
// ensure that the rectangle is renderered inside the frustrum // ensure that the rectangle is renderered inside the frustrum
@ -109,13 +128,18 @@ namespace GUI {
// ensure that the overlay fits the frustrum near z plane // ensure that the overlay fits the frustrum near z plane
const double gui_scale = camera.get_gui_scale(); const double gui_scale = camera.get_gui_scale();
glsafe(::glScaled(gui_scale, gui_scale, 1.0)); glsafe(::glScaled(gui_scale, gui_scale, 1.0));
#endif // !ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
glsafe(::glPushAttrib(GL_ENABLE_BIT)); glsafe(::glPushAttrib(GL_ENABLE_BIT));
glsafe(::glLineStipple(4, 0xAAAA)); glsafe(::glLineStipple(4, 0xAAAA));
glsafe(::glEnable(GL_LINE_STIPPLE)); glsafe(::glEnable(GL_LINE_STIPPLE));
#if ENABLE_GLBEGIN_GLEND_REMOVAL #if ENABLE_GLBEGIN_GLEND_REMOVAL
#if ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
GLShaderProgram* shader = wxGetApp().get_shader("flat_attr");
#else
GLShaderProgram* shader = wxGetApp().get_shader("flat"); GLShaderProgram* shader = wxGetApp().get_shader("flat");
#endif // ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
if (shader != nullptr) { if (shader != nullptr) {
shader->start_using(); shader->start_using();
@ -144,11 +168,11 @@ namespace GUI {
m_rectangle.init_from(std::move(init_data)); m_rectangle.init_from(std::move(init_data));
} }
const ColorRGBA color( #if ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
(m_state == Select) ? 0.3f : 1.0f, shader->set_uniform("projection_view_model_matrix", Transform3d::Identity());
(m_state == Select) ? 1.0f : 0.3f, #endif // ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
0.3f, 1.0f);
m_rectangle.set_color(color); m_rectangle.set_color(ColorRGBA((m_state == Select) ? 0.3f : 1.0f, (m_state == Select) ? 1.0f : 0.3f, 0.3f, 1.0f));
m_rectangle.render(); m_rectangle.render();
shader->stop_using(); shader->stop_using();
} }
@ -163,7 +187,9 @@ namespace GUI {
glsafe(::glPopAttrib()); glsafe(::glPopAttrib());
#if !ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
glsafe(::glPopMatrix()); glsafe(::glPopMatrix());
#endif // !ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
} }
} // namespace GUI } // namespace GUI

12
src/slic3r/GUI/GLSelectionRectangle.hpp
View file

@ -38,12 +38,12 @@ public:
bool is_dragging() const { return m_state != Off; } bool is_dragging() const { return m_state != Off; }
EState get_state() const { return m_state; } EState get_state() const { return m_state; }
float get_width() const { return std::abs(m_start_corner(0) - m_end_corner(0)); } float get_width() const { return std::abs(m_start_corner.x() - m_end_corner.x()); }
float get_height() const { return std::abs(m_start_corner(1) - m_end_corner(1)); } float get_height() const { return std::abs(m_start_corner.y() - m_end_corner.y()); }
float get_left() const { return std::min(m_start_corner(0), m_end_corner(0)); } float get_left() const { return std::min(m_start_corner.x(), m_end_corner.x()); }
float get_right() const { return std::max(m_start_corner(0), m_end_corner(0)); } float get_right() const { return std::max(m_start_corner.x(), m_end_corner.x()); }
float get_top() const { return std::max(m_start_corner(1), m_end_corner(1)); } float get_top() const { return std::max(m_start_corner.y(), m_end_corner.y()); }
float get_bottom() const { return std::min(m_start_corner(1), m_end_corner(1)); } float get_bottom() const { return std::min(m_start_corner.y(), m_end_corner.y()); }
private: private:
EState m_state{ Off }; EState m_state{ Off };