From 3003db411f87f477311078d2a194393b71b3ce3c Mon Sep 17 00:00:00 2001
From: enricoturri1966 <enricoturri@seznam.cz>
Date: Thu, 3 Mar 2022 09:56:13 +0100
Subject: [PATCH] Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex
 attributes and matrices in shaders.

Shader: gouraud_light - GCodeViewer shells
---
 src/slic3r/GUI/3DScene.cpp     | 9 ++++++++-
 src/slic3r/GUI/GCodeViewer.cpp | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp
index 8093cb0de..dad2f5ade 100644
--- a/src/slic3r/GUI/3DScene.cpp
+++ b/src/slic3r/GUI/3DScene.cpp
@@ -714,7 +714,14 @@ void GLVolume::render()
     glsafe(::glCullFace(GL_BACK));
 #if ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
     bool use_attributes = boost::algorithm::iends_with(shader->get_name(), "_attr");
-    if (!use_attributes) {
+    if (use_attributes) {
+        const GUI::Camera& camera = GUI::wxGetApp().plater()->get_camera();
+        const Transform3d matrix = camera.get_view_matrix() * world_matrix();
+        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());
+    }
+    else {
 #endif // ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
         glsafe(::glPushMatrix());
         glsafe(::glMultMatrixd(world_matrix().data()));
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index 022283c38..86da8cf9a 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -3235,7 +3235,11 @@ void GCodeViewer::render_shells()
     if (!m_shells.visible || m_shells.volumes.empty())
         return;
 
+#if ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
+    GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light_attr");
+#else
     GLShaderProgram* shader = wxGetApp().get_shader("gouraud_light");
+#endif // ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES
     if (shader == nullptr)
         return;