diff options
| author | enricoturri1966 <enricoturri@seznam.cz> | 2021-11-03 16:50:30 +0300 |
|---|---|---|
| committer | enricoturri1966 <enricoturri@seznam.cz> | 2022-06-02 15:58:44 +0300 |
| commit | 79bdcefbde098bbfe9b1497bab22be57aefc26d8 (patch) | |
| tree | e684e5a7f20c74e64aaa934b2d380f53261b5e92 /src/slic3r/GUI/Selection.cpp | |
| parent | 679f8b0111f56996afdb9282cd6d846a061b98f3 (diff) | |
Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - 1st installment: introduction of instance reference system in part manipulation
Fixed conflicts during rebase with master
Diffstat (limited to 'src/slic3r/GUI/Selection.cpp')
| -rw-r--r-- | src/slic3r/GUI/Selection.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index 8a6022c3e..286d0e87b 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -594,10 +594,14 @@ bool Selection::matches(const std::vector<unsigned int>& volume_idxs) const bool Selection::requires_uniform_scale() const
{
#if ENABLE_WORLD_COORDINATE
- if (is_single_modifier() || is_single_volume())
+ if (is_single_volume_or_modifier())
return !Geometry::is_rotation_ninety_degrees(Geometry::Transformation(get_volume(*m_list.begin())->world_matrix()).get_rotation());
else if (is_single_full_instance())
+#if ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES
+ return wxGetApp().obj_manipul()->is_world_coordinates() ?
+#else
return wxGetApp().obj_manipul()->get_world_coordinates() ?
+#endif // ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES
!Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation()) : false;
return true;
@@ -972,7 +976,11 @@ void Selection::scale(const Vec3d& scale, TransformationType transformation_type #endif // ENABLE_WORLD_COORDINATE
}
}
+#if ENABLE_WORLD_COORDINATE
+ else if (is_single_volume_or_modifier())
+#else
else if (is_single_volume() || is_single_modifier())
+#endif // ENABLE_WORLD_COORDINATE
v.set_volume_scaling_factor(scale);
else {
const Transform3d m = Geometry::assemble_transform(Vec3d::Zero(), Vec3d::Zero(), scale);
@@ -1424,7 +1432,11 @@ void Selection::render_sidebar_hints(const std::string& sidebar_field) #else
const Vec3d& center = get_bounding_box().center();
#endif // ENABLE_GL_SHADERS_ATTRIBUTES
+#if ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES
+ if (is_single_full_instance() && !wxGetApp().obj_manipul()->is_world_coordinates()) {
+#else
if (is_single_full_instance() && !wxGetApp().obj_manipul()->get_world_coordinates()) {
+#endif // ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES
#if !ENABLE_GL_SHADERS_ATTRIBUTES
glsafe(::glTranslated(center.x(), center.y(), center.z()));
#endif // !ENABLE_GL_SHADERS_ATTRIBUTES
|