Tech ENABLE_TEXTURES_FROM_SVG set as default

1 files changed, 0 insertions, 30 deletions

diff --git a/src/slic3r/GUI/3DBed.hpp b/src/slic3r/GUI/3DBed.hpp
index 186282997..7a8944443 100644
--- a/src/slic3r/GUI/3DBed.hpp
+++ b/src/slic3r/GUI/3DBed.hpp
@@ -3,9 +3,7 @@
 
 #include "GLTexture.hpp"
 #include "3DScene.hpp"
-#if ENABLE_TEXTURES_FROM_SVG
 #include "GLShader.hpp"
-#endif // ENABLE_TEXTURES_FROM_SVG
 
 class GLUquadric;
 typedef class GLUquadric GLUquadricObj;
@@ -17,7 +15,6 @@ class GLCanvas3D;
 
 class GeometryBuffer
 {
-#if ENABLE_TEXTURES_FROM_SVG
     struct Vertex
     {
         float position[3];
@@ -31,27 +28,17 @@ class GeometryBuffer
     };
 
     std::vector<Vertex> m_vertices;
-#else
-    std::vector<float> m_vertices;
-    std::vector<float> m_tex_coords;
-#endif // ENABLE_TEXTURES_FROM_SVG
 
 public:
     bool set_from_triangles(const Polygons& triangles, float z, bool generate_tex_coords);
     bool set_from_lines(const Lines& lines, float z);
 
-#if ENABLE_TEXTURES_FROM_SVG
     const float* get_vertices_data() const;
     unsigned int get_vertices_data_size() const { return (unsigned int)m_vertices.size() * get_vertex_data_size(); }
     unsigned int get_vertex_data_size() const { return (unsigned int)(5 * sizeof(float)); }
     size_t get_position_offset() const { return 0; }
     size_t get_tex_coords_offset() const { return (size_t)(3 * sizeof(float)); }
     unsigned int get_vertices_count() const { return (unsigned int)m_vertices.size(); }
-#else
-    const float* get_vertices() const { return m_vertices.data(); }
-    const float* get_tex_coords() const { return m_tex_coords.data(); }
-    unsigned int get_vertices_count() const { return (unsigned int)m_vertices.size() / 3; }
-#endif // ENABLE_TEXTURES_FROM_SVG
 };
 
 class Bed3D
@@ -93,7 +80,6 @@ private:
     Polygon m_polygon;
     GeometryBuffer m_triangles;
     GeometryBuffer m_gridlines;
-#if ENABLE_TEXTURES_FROM_SVG
     mutable GLTexture m_texture;
     // temporary texture shown until the main texture has still no levels compressed
     mutable GLTexture m_temp_texture;
@@ -101,10 +87,6 @@ private:
     mutable bool m_requires_canvas_update;
     mutable Shader m_shader;
     mutable unsigned int m_vbo_id;
-#else
-    mutable GLTexture m_top_texture;
-    mutable GLTexture m_bottom_texture;
-#endif // ENABLE_TEXTURES_FROM_SVG
     mutable GLBed m_model;
     Axes m_axes;
 
@@ -112,9 +94,7 @@ private:
 
 public:
     Bed3D();
-#if ENABLE_TEXTURES_FROM_SVG
     ~Bed3D() { reset(); }
-#endif // ENABLE_TEXTURES_FROM_SVG
 
     EType get_type() const { return m_type; }
 
@@ -129,11 +109,7 @@ public:
     bool contains(const Point& point) const;
     Point point_projection(const Point& point) const;
 
-#if ENABLE_TEXTURES_FROM_SVG
     void render(GLCanvas3D* canvas, float theta, float scale_factor) const;
-#else
-    void render(float theta, float scale_factor) const;
-#endif // ENABLE_TEXTURES_FROM_SVG
     void render_axes() const;
 
 private:
@@ -141,16 +117,10 @@ private:
     void calc_triangles(const ExPolygon& poly);
     void calc_gridlines(const ExPolygon& poly, const BoundingBox& bed_bbox);
     EType detect_type(const Pointfs& shape) const;
-#if ENABLE_TEXTURES_FROM_SVG
     void render_prusa(GLCanvas3D* canvas, const std::string& key, bool bottom) const;
     void render_prusa_shader(bool transparent) const;
-#else
-    void render_prusa(const std::string& key, float theta) const;
-#endif // ENABLE_TEXTURES_FROM_SVG
     void render_custom() const;
-#if ENABLE_TEXTURES_FROM_SVG
     void reset();
-#endif // ENABLE_TEXTURES_FROM_SVG
 };
 
 } // GUI