diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2019-02-19 12:07:37 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2019-02-19 12:07:37 +0300 |
| commit | e861f5a243f0082407a153632f730a08f43e4763 (patch) | |
| tree | 7c38732716edd979c718c8ac98f0c3ff30430a76 /src/slic3r/GUI/3DScene.hpp | |
| parent | 644794233f5024906914f1e9e87e14fb97d9182b (diff) | |
Tech ENABLE_PRINT_BED_MODELS set as default
Diffstat (limited to 'src/slic3r/GUI/3DScene.hpp')
| -rw-r--r-- | src/slic3r/GUI/3DScene.hpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp index 2732b5a13..9c4e0f687 100644 --- a/src/slic3r/GUI/3DScene.hpp +++ b/src/slic3r/GUI/3DScene.hpp @@ -498,20 +498,16 @@ class GLModel protected: GLVolume m_volume; bool m_useVBOs; -#if ENABLE_PRINT_BED_MODELS std::string m_filename; -#endif // ENABLE_PRINT_BED_MODELS public: GLModel(); virtual ~GLModel(); bool init(bool useVBOs) { return on_init(useVBOs); } -#if ENABLE_PRINT_BED_MODELS bool init_from_file(const std::string& filename, bool useVBOs) { return on_init_from_file(filename, useVBOs); } void center_around(const Vec3d& center) { m_volume.set_volume_offset(center - m_volume.bounding_box.center()); } -#endif // ENABLE_PRINT_BED_MODELS void set_color(const float* color, unsigned int size); const Vec3d& get_offset() const; @@ -521,22 +517,16 @@ public: const Vec3d& get_scale() const; void set_scale(const Vec3d& scale); -#if ENABLE_PRINT_BED_MODELS const std::string& get_filename() const { return m_filename; } const BoundingBoxf3& get_bounding_box() const { return m_volume.bounding_box; } void reset(); -#endif // ENABLE_PRINT_BED_MODELS void render() const; protected: -#if ENABLE_PRINT_BED_MODELS virtual bool on_init(bool useVBOs) { return false; } virtual bool on_init_from_file(const std::string& filename, bool useVBOs) { return false; } -#else - virtual bool on_init(bool useVBOs) = 0; -#endif // ENABLE_PRINT_BED_MODELS private: void render_VBOs() const; @@ -560,13 +550,11 @@ protected: virtual bool on_init(bool useVBOs); }; -#if ENABLE_PRINT_BED_MODELS class GLBed : public GLModel { protected: virtual bool on_init_from_file(const std::string& filename, bool useVBOs); }; -#endif // ENABLE_PRINT_BED_MODELS class _3DScene { |