Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of bed axes

1 files changed, 34 insertions, 0 deletions

diff --git a/src/slic3r/GUI/CoordAxes.cpp b/src/slic3r/GUI/CoordAxes.cpp
index c3cced2f9..2ec303c61 100644
--- a/src/slic3r/GUI/CoordAxes.cpp
+++ b/src/slic3r/GUI/CoordAxes.cpp
@@ -3,6 +3,10 @@
 #include "CoordAxes.hpp"
 #include "GUI_App.hpp"
 #include "3DScene.hpp"
+#if ENABLE_GL_SHADERS_ATTRIBUTES
+#include "Plater.hpp"
+#include "Camera.hpp"
+#endif // ENABLE_GL_SHADERS_ATTRIBUTES
 
 #include <GL/glew.h>
 
@@ -18,20 +22,38 @@ const float CoordAxes::DefaultTipLength = 5.0f;
 
 void CoordAxes::render(float emission_factor)
 {
+#if ENABLE_GL_SHADERS_ATTRIBUTES
+    auto render_axis = [this](GLShaderProgram& shader, const Transform3d& transform) {
+        const Camera& camera = wxGetApp().plater()->get_camera();
+        const Transform3d matrix = camera.get_view_matrix() * transform;
+        shader.set_uniform("view_model_matrix", matrix);
+        shader.set_uniform("projection_matrix", camera.get_projection_matrix());
+        shader.set_uniform("normal_matrix", (Matrix3d)matrix.matrix().block(0, 0, 3, 3).inverse().transpose());
+        m_arrow.render();
+#else
     auto render_axis = [this](const Transform3f& transform) {
         glsafe(::glPushMatrix());
         glsafe(::glMultMatrixf(transform.data()));
         m_arrow.render();
         glsafe(::glPopMatrix());
+#endif // ENABLE_GL_SHADERS_ATTRIBUTES
     };
 
     if (!m_arrow.is_initialized())
         m_arrow.init_from(stilized_arrow(16, m_tip_radius, m_tip_length, m_stem_radius, m_stem_length));
 
     GLShaderProgram* curr_shader = wxGetApp().get_current_shader();
+#if ENABLE_GL_SHADERS_ATTRIBUTES
+    bool shader_differs = (curr_shader == nullptr || curr_shader->get_name() != "gouraud_light_attr");
+#else
     bool shader_differs = (curr_shader == nullptr || curr_shader->get_name() != "gouraud_light");
+#endif // ENABLE_GL_SHADERS_ATTRIBUTES
 
+#if ENABLE_GL_SHADERS_ATTRIBUTES
+    GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light_attr");
+#else
     GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
+#endif // ENABLE_GL_SHADERS_ATTRIBUTES
     if (shader == nullptr)
         return;
 
@@ -48,7 +70,11 @@ void CoordAxes::render(float emission_factor)
 #else
     m_arrow.set_color(-1, ColorRGBA::X());
 #endif // ENABLE_LEGACY_OPENGL_REMOVAL
+#if ENABLE_GL_SHADERS_ATTRIBUTES
+    render_axis(*shader, Geometry::assemble_transform(m_origin, { 0.0, 0.5 * M_PI, 0.0 }));
+#else
     render_axis(Geometry::assemble_transform(m_origin, { 0.0, 0.5 * M_PI, 0.0 }).cast<float>());
+#endif // ENABLE_GL_SHADERS_ATTRIBUTES
 
     // y axis
 #if ENABLE_LEGACY_OPENGL_REMOVAL
@@ -56,7 +82,11 @@ void CoordAxes::render(float emission_factor)
 #else
     m_arrow.set_color(-1, ColorRGBA::Y());
 #endif // ENABLE_LEGACY_OPENGL_REMOVAL
+#if ENABLE_GL_SHADERS_ATTRIBUTES
+    render_axis(*shader, Geometry::assemble_transform(m_origin, { -0.5 * M_PI, 0.0, 0.0 }));
+#else
     render_axis(Geometry::assemble_transform(m_origin, { -0.5 * M_PI, 0.0, 0.0 }).cast<float>());
+#endif // ENABLE_GL_SHADERS_ATTRIBUTES
 
     // z axis
 #if ENABLE_LEGACY_OPENGL_REMOVAL
@@ -64,7 +94,11 @@ void CoordAxes::render(float emission_factor)
 #else
     m_arrow.set_color(-1, ColorRGBA::Z());
 #endif // ENABLE_LEGACY_OPENGL_REMOVAL
+#if ENABLE_GL_SHADERS_ATTRIBUTES
+    render_axis(*shader, Geometry::assemble_transform(m_origin));
+#else
     render_axis(Geometry::assemble_transform(m_origin).cast<float>());
+#endif // ENABLE_GL_SHADERS_ATTRIBUTES
 
     if (shader_differs) {
         shader->stop_using();