diff options
Diffstat (limited to 'src/slic3r/GUI/3DBed.cpp')
| -rw-r--r-- | src/slic3r/GUI/3DBed.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/slic3r/GUI/3DBed.cpp b/src/slic3r/GUI/3DBed.cpp index 7b34d59bf..503c35a9b 100644 --- a/src/slic3r/GUI/3DBed.cpp +++ b/src/slic3r/GUI/3DBed.cpp @@ -102,7 +102,7 @@ const float* GeometryBuffer::get_vertices_data() const } #endif // !ENABLE_LEGACY_OPENGL_REMOVAL -#if !ENABLE_WORLD_COORDINATE_SHOW_AXES +#if !ENABLE_WORLD_COORDINATE const float Bed3D::Axes::DefaultStemRadius = 0.5f; const float Bed3D::Axes::DefaultStemLength = 25.0f; const float Bed3D::Axes::DefaultTipRadius = 2.5f * Bed3D::Axes::DefaultStemRadius; @@ -180,7 +180,7 @@ void Bed3D::Axes::render() glsafe(::glDisable(GL_DEPTH_TEST)); } -#endif // !ENABLE_WORLD_COORDINATE_SHOW_AXES +#endif // !ENABLE_WORLD_COORDINATE bool Bed3D::set_shape(const Pointfs& bed_shape, const double max_print_height, const std::string& custom_texture, const std::string& custom_model, bool force_as_custom) { @@ -343,11 +343,11 @@ BoundingBoxf3 Bed3D::calc_extended_bounding_box() const out.max.z() = 0.0; // extend to contain axes out.merge(m_axes.get_origin() + m_axes.get_total_length() * Vec3d::Ones()); -#if ENABLE_WORLD_COORDINATE_SHOW_AXES +#if ENABLE_WORLD_COORDINATE out.merge(out.min + Vec3d(-m_axes.get_tip_radius(), -m_axes.get_tip_radius(), out.max.z())); #else out.merge(out.min + Vec3d(-Axes::DefaultTipRadius, -Axes::DefaultTipRadius, out.max.z())); -#endif // ENABLE_WORLD_COORDINATE_SHOW_AXES +#endif // ENABLE_WORLD_COORDINATE // extend to contain model, if any BoundingBoxf3 model_bb = m_model.get_bounding_box(); if (model_bb.defined) { @@ -545,7 +545,7 @@ std::tuple<Bed3D::Type, std::string, std::string> Bed3D::detect_type(const Point void Bed3D::render_axes() { if (m_build_volume.valid()) -#if ENABLE_WORLD_COORDINATE_SHOW_AXES +#if ENABLE_WORLD_COORDINATE #if ENABLE_GL_SHADERS_ATTRIBUTES m_axes.render(Transform3d::Identity(), 0.25f); #else @@ -553,7 +553,7 @@ void Bed3D::render_axes() #endif // ENABLE_GL_SHADERS_ATTRIBUTES #else m_axes.render(); -#endif // ENABLE_WORLD_COORDINATE_SHOW_AXES +#endif // ENABLE_WORLD_COORDINATE } #if ENABLE_GL_SHADERS_ATTRIBUTES |