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

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

17
src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -7,9 +7,6 @@
#include "3DScene.hpp"
#include "GLToolbar.hpp"
#if !ENABLE_SHADERS_MANAGER
#include "GLShader.hpp"
#endif // !ENABLE_SHADERS_MANAGER
#include "Event.hpp"
#include "Selection.hpp"
#include "Gizmos/GLGizmosManager.hpp"
@ -169,9 +166,6 @@ private:
private:
bool m_enabled;
#if !ENABLE_SHADERS_MANAGER
Shader m_shader;
#endif // !ENABLE_SHADERS_MANAGER
unsigned int m_z_texture_id;
// Not owned by LayersEditing.
const DynamicPrintConfig *m_config;
@ -218,11 +212,8 @@ private:
LayersEditing();
~LayersEditing();
#if ENABLE_SHADERS_MANAGER
void init();
#else
bool init(const std::string& vertex_shader_filename, const std::string& fragment_shader_filename);
#endif // ENABLE_SHADERS_MANAGER
void set_config(const DynamicPrintConfig* config);
void select_object(const Model &model, int object_id);
@ -465,9 +456,6 @@ private:
WarningTexture m_warning_texture;
wxTimer m_timer;
LayersEditing m_layers_editing;
#if !ENABLE_SHADERS_MANAGER
Shader m_shader;
#endif // !ENABLE_SHADERS_MANAGER
Mouse m_mouse;
mutable GLGizmosManager m_gizmos;
mutable GLToolbar m_main_toolbar;
@ -597,9 +585,6 @@ public:
void set_color_by(const std::string& value);
void refresh_camera_scene_box();
#if !ENABLE_SHADERS_MANAGER
const Shader& get_shader() const { return m_shader; }
#endif // !ENABLE_SHADERS_MANAGER
BoundingBoxf3 volumes_bounding_box() const;
BoundingBoxf3 scene_bounding_box() const;