3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ensure object on bed while scaling set as default

Browse source
This commit is contained in:
Enrico Turri 2019-01-21 11:46:06 +01:00
parent 25319113f1
commit 060fac5e55
3 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/Technologies.hpp
View file

@ -19,8 +19,6 @@
#define ENABLE_USE_UNIQUE_GLCONTEXT (1 && ENABLE_1_42_0_ALPHA1) #define ENABLE_USE_UNIQUE_GLCONTEXT (1 && ENABLE_1_42_0_ALPHA1)
// Disable synchronization of unselected instances // Disable synchronization of unselected instances
#define DISABLE_INSTANCES_SYNCH (0 && ENABLE_1_42_0_ALPHA1) #define DISABLE_INSTANCES_SYNCH (0 && ENABLE_1_42_0_ALPHA1)
// Keeps objects on bed while scaling them using the scale gizmo
#define ENABLE_ENSURE_ON_BED_WHILE_SCALING (1 && ENABLE_1_42_0_ALPHA1)
// All rotations made using the rotate gizmo are done with respect to the world reference system // All rotations made using the rotate gizmo are done with respect to the world reference system
#define ENABLE_WORLD_ROTATIONS (1 && ENABLE_1_42_0_ALPHA1) #define ENABLE_WORLD_ROTATIONS (1 && ENABLE_1_42_0_ALPHA1)
// Scene's GUI made using imgui library // Scene's GUI made using imgui library

4
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -1857,9 +1857,7 @@ void GLCanvas3D::Selection::scale(const Vec3d& scale, bool local)
_synchronize_unselected_volumes(); _synchronize_unselected_volumes();
#endif // !DISABLE_INSTANCES_SYNCH #endif // !DISABLE_INSTANCES_SYNCH
#if ENABLE_ENSURE_ON_BED_WHILE_SCALING
_ensure_on_bed(); _ensure_on_bed();
#endif // ENABLE_ENSURE_ON_BED_WHILE_SCALING
m_bounding_box_dirty = true; m_bounding_box_dirty = true;
} }
@ -2758,7 +2756,6 @@ void GLCanvas3D::Selection::_synchronize_unselected_volumes()
} }
} }
#if ENABLE_ENSURE_ON_BED_WHILE_SCALING
void GLCanvas3D::Selection::_ensure_on_bed() void GLCanvas3D::Selection::_ensure_on_bed()
{ {
typedef std::map<std::pair<int, int>, double> InstancesToZMap; typedef std::map<std::pair<int, int>, double> InstancesToZMap;
@ -2786,7 +2783,6 @@ void GLCanvas3D::Selection::_ensure_on_bed()
volume->set_instance_offset(Z, volume->get_instance_offset(Z) - it->second); volume->set_instance_offset(Z, volume->get_instance_offset(Z) - it->second);
} }
} }
#endif // ENABLE_ENSURE_ON_BED_WHILE_SCALING
const float GLCanvas3D::Gizmos::OverlayIconsScale = 1.0f; const float GLCanvas3D::Gizmos::OverlayIconsScale = 1.0f;
const float GLCanvas3D::Gizmos::OverlayBorder = 5.0f; const float GLCanvas3D::Gizmos::OverlayBorder = 5.0f;

2
src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -652,9 +652,7 @@ public:
#endif // ENABLE_SIDEBAR_VISUAL_HINTS #endif // ENABLE_SIDEBAR_VISUAL_HINTS
void _synchronize_unselected_instances(bool including_z = false); void _synchronize_unselected_instances(bool including_z = false);
void _synchronize_unselected_volumes(); void _synchronize_unselected_volumes();
#if ENABLE_ENSURE_ON_BED_WHILE_SCALING
void _ensure_on_bed(); void _ensure_on_bed();
#endif // ENABLE_ENSURE_ON_BED_WHILE_SCALING
}; };
class ClippingPlane class ClippingPlane