From 0d282896d002d6e320d8467b8f7e03b3ceadfb40 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Thu, 1 Nov 2018 08:50:54 +0100 Subject: [PATCH] Removed obsolete references to tech ENABLE_MODELINSTANCE_3D_FULL_TRANSFORM --- src/slic3r/GUI/GLGizmo.cpp | 12 ------------ src/slic3r/GUI/GLGizmo.hpp | 6 ------ 2 files changed, 18 deletions(-) diff --git a/src/slic3r/GUI/GLGizmo.cpp b/src/slic3r/GUI/GLGizmo.cpp index 17e42f5f7..90c2e0bce 100644 --- a/src/slic3r/GUI/GLGizmo.cpp +++ b/src/slic3r/GUI/GLGizmo.cpp @@ -1981,13 +1981,7 @@ bool GLGizmoSlaSupports::is_mesh_update_necessary() const if (m_state != On || !m_model_object || m_model_object->instances.empty()) return false; -#if ENABLE_MODELINSTANCE_3D_FULL_TRANSFORM if ((m_model_object->instances.front()->world_matrix() * m_source_data.matrix.inverse() * Vec3d(1., 1., 1.) - Vec3d(1., 1., 1.)).norm() > 0.001 ) -#else - if (m_model_object->instances.front()->get_scaling_factor() != m_source_data.scaling_factor - || m_model_object->instances.front()->get_rotation() != m_source_data.rotation - || m_model_object->instances.front()->get_offset() != m_source_data.offset) -#endif // ENABLE_MODELINSTANCE_3D_ROTATION return true; // following should detect direct mesh changes (can be removed after the mesh is made completely immutable): @@ -2015,13 +2009,7 @@ void GLGizmoSlaSupports::update_mesh() F(i, 1) = 3*i+1; F(i, 2) = 3*i+2; } -#if !ENABLE_MODELINSTANCE_3D_FULL_TRANSFORM - m_source_data.scaling_factor = m_model_object->instances.front()->get_scaling_factor(); - m_source_data.rotation = m_model_object->instances.front()->get_rotation(); - m_source_data.offset = m_model_object->instances.front()->get_offset(); -#else m_source_data.matrix = m_model_object->instances.front()->world_matrix(); -#endif const float* first_vertex = m_model_object->volumes.front()->get_convex_hull().first_vertex(); m_source_data.mesh_first_point = Vec3d((double)first_vertex[0], (double)first_vertex[1], (double)first_vertex[2]); // we'll now reload Grabbers (selection might have changed): diff --git a/src/slic3r/GUI/GLGizmo.hpp b/src/slic3r/GUI/GLGizmo.hpp index 838c7b787..cccdb2bb9 100644 --- a/src/slic3r/GUI/GLGizmo.hpp +++ b/src/slic3r/GUI/GLGizmo.hpp @@ -497,13 +497,7 @@ private: Eigen::MatrixXi m_F; // facets indices struct SourceDataSummary { BoundingBoxf3 bounding_box; -#if !ENABLE_MODELINSTANCE_3D_FULL_TRANSFORM - Vec3d scaling_factor; - Vec3d rotation; - Vec3d offset; -#else Transform3d matrix; -#endif Vec3d mesh_first_point; };