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

Follow-up of 1a91add2e6 -> Improvements to tighter camera frustrum to reduce z-fighting

Browse source
This commit is contained in:
Enrico Turri 2019-06-14 15:37:29 +02:00
parent 541f58c656
commit ac8de0bcaf
5 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/slic3r/GUI/3DBed.cpp
View file

@ -211,7 +211,7 @@ const double Bed3D::Axes::ArrowLength = 5.0;
Bed3D::Axes::Axes()
: origin(Vec3d::Zero())
, length(Vec3d::Zero())
, length(25.0 * Vec3d::Ones())
{
m_quadric = ::gluNewQuadric();
if (m_quadric != nullptr)
@ -273,7 +273,6 @@ void Bed3D::Axes::render_axis(double length) const
Bed3D::Bed3D()
: m_type(Custom)
, m_extended_bounding_box_dirty(true)
#if ENABLE_TEXTURES_FROM_SVG
, m_vbo_id(0)
#endif // ENABLE_TEXTURES_FROM_SVG
@ -314,8 +313,6 @@ bool Bed3D::set_shape(const Pointfs& shape)
m_axes.origin = Vec3d(0.0, 0.0, (double)GROUND_Z);
m_axes.length = 0.1 * m_bounding_box.max_size() * Vec3d::Ones();
m_extended_bounding_box_dirty = true;
// Let the calee to update the UI.
return true;
}
@ -413,17 +410,12 @@ void Bed3D::calc_bounding_boxes() const
m_extended_bounding_box = m_bounding_box;
if (m_extended_bounding_box_dirty)
{
// extend to contain Z axis
m_extended_bounding_box.merge(0.1 * m_bounding_box.max_size() * Vec3d::UnitZ());
// extend to contain axes
m_extended_bounding_box.merge(m_axes.length + Axes::ArrowLength * Vec3d::Ones());
if (!m_model.get_filename().empty())
// extend to contain model
m_extended_bounding_box.merge(m_model.get_bounding_box());
m_extended_bounding_box_dirty = false;
}
// extend to contain model, if any
if (!m_model.get_filename().empty())
m_extended_bounding_box.merge(m_model.get_transformed_bounding_box());
}
void Bed3D::calc_triangles(const ExPolygon& poly)