pengo1998/OrcaSlicer-bambulab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENABLE_SHADERS_MANAGER set as default

Browse Source
This commit is contained in:
enricoturri1966
2020-05-22 16:08:02 +02:00
parent 4d05ec0856
commit 314995fa0b
18 changed files with 57 additions and 1198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/slic3r/GUI/Selection.hpp
View File

@@ -6,13 +6,6 @@
#include "3DScene.hpp"
#if ENABLE_GCODE_VIEWER
#include "GLModel.hpp"
#if !ENABLE_SHADERS_MANAGER
#include "GLShader.hpp"
#endif // !ENABLE_SHADERS_MANAGER
#else
#if !ENABLE_SHADERS_MANAGER
#include "GLShader.hpp"
#endif // !ENABLE_SHADERS_MANAGER
#endif // ENABLE_GCODE_VIEWER
#if ENABLE_RENDER_SELECTION_CENTER
@@ -24,9 +17,7 @@ namespace Slic3r {
#if !ENABLE_GCODE_VIEWER
class Shader;
#endif // !ENABLE_GCODE_VIEWER
#if ENABLE_SHADERS_MANAGER
class GLShaderProgram;
#endif // ENABLE_SHADERS_MANAGER
namespace GUI {
class TransformationType
{
@@ -218,9 +209,6 @@ private:
#if ENABLE_GCODE_VIEWER
GL_Model m_arrow;
GL_Model m_curved_arrow;
#if !ENABLE_SHADERS_MANAGER
Shader m_arrows_shader;
#endif // !ENABLE_SHADERS_MANAGER
#else
mutable GLArrow m_arrow;
mutable GLCurvedArrow m_curved_arrow;
@@ -339,15 +327,7 @@ public:
#if ENABLE_RENDER_SELECTION_CENTER
void render_center(bool gizmo_is_dragging) const;
#endif // ENABLE_RENDER_SELECTION_CENTER
#if ENABLE_GCODE_VIEWER
void render_sidebar_hints(const std::string& sidebar_field) const;
#else
#if ENABLE_SHADERS_MANAGER
void render_sidebar_hints(const std::string& sidebar_field) const;
#else
void render_sidebar_hints(const std::string& sidebar_field, const Shader& shader) const;
#endif // ENABLE_SHADERS_MANAGER
#endif // ENABLE_GCODE_VIEWER
bool requires_local_axes() const;