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

Modified camera target behavior set as default

Browse source
This commit is contained in:
Enrico Turri 2019-01-02 14:04:26 +01:00
parent 0ccd19f1ee
commit 9b8a68565f
4 changed files with 0 additions and 20 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) #define ENABLE_USE_UNIQUE_GLCONTEXT (1 && ENABLE_1_42_0)
// Disable synchronization of unselected instances // Disable synchronization of unselected instances
#define DISABLE_INSTANCES_SYNCH (0 && ENABLE_1_42_0) #define DISABLE_INSTANCES_SYNCH (0 && ENABLE_1_42_0)
// Modified camera target behavior
#define ENABLE_MODIFIED_CAMERA_TARGET (1 && ENABLE_1_42_0)
// Keeps objects on bed while scaling them using the scale gizmo // Keeps objects on bed while scaling them using the scale gizmo
#define ENABLE_ENSURE_ON_BED_WHILE_SCALING (1 && ENABLE_1_42_0) #define ENABLE_ENSURE_ON_BED_WHILE_SCALING (1 && ENABLE_1_42_0)
// 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

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

@ -4041,13 +4041,11 @@ void GLCanvas3D::zoom_to_volumes()
m_apply_zoom_to_volumes_filter = false; m_apply_zoom_to_volumes_filter = false;
} }
#if ENABLE_MODIFIED_CAMERA_TARGET
void GLCanvas3D::zoom_to_selection() void GLCanvas3D::zoom_to_selection()
{ {
if (!m_selection.is_empty()) if (!m_selection.is_empty())
_zoom_to_bounding_box(m_selection.get_bounding_box()); _zoom_to_bounding_box(m_selection.get_bounding_box());
} }
#endif // ENABLE_MODIFIED_CAMERA_TARGET
void GLCanvas3D::select_view(const std::string& direction) void GLCanvas3D::select_view(const std::string& direction)
{ {
@ -4827,7 +4825,6 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
// key O/o // key O/o
case 79: case 79:
case 111: { set_camera_zoom(-1.0f); break; } case 111: { set_camera_zoom(-1.0f); break; }
#if ENABLE_MODIFIED_CAMERA_TARGET
// key Z/z // key Z/z
case 90: case 90:
case 122: case 122:
@ -4839,11 +4836,6 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
break; break;
} }
#else
// key Z/z
case 90:
case 122: { zoom_to_volumes(); break; }
#endif // ENABLE_MODIFIED_CAMERA_TARGET
default: default:
{ {
if (m_gizmos.handle_shortcut(keyCode, m_selection)) if (m_gizmos.handle_shortcut(keyCode, m_selection))

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

@ -918,9 +918,7 @@ public:
void zoom_to_bed(); void zoom_to_bed();
void zoom_to_volumes(); void zoom_to_volumes();
#if ENABLE_MODIFIED_CAMERA_TARGET
void zoom_to_selection(); void zoom_to_selection();
#endif // ENABLE_MODIFIED_CAMERA_TARGET
void select_view(const std::string& direction); void select_view(const std::string& direction);
void set_viewport_from_scene(const GLCanvas3D& other); void set_viewport_from_scene(const GLCanvas3D& other);

8
src/slic3r/GUI/Plater.cpp
View file

@ -1571,9 +1571,6 @@ std::vector<size_t> Plater::priv::load_model_objects(const ModelObjectPtrs &mode
} }
update(); update();
#if !ENABLE_MODIFIED_CAMERA_TARGET
this->canvas3D->zoom_to_volumes();
#endif // !ENABLE_MODIFIED_CAMERA_TARGET
object_list_changed(); object_list_changed();
this->schedule_background_process(); this->schedule_background_process();
@ -3348,11 +3345,6 @@ void Plater::changed_object(int obj_idx)
// update print // update print
this->p->schedule_background_process(); this->p->schedule_background_process();
if (list->is_parts_changed() || list->is_part_settings_changed()) {
#if !ENABLE_MODIFIED_CAMERA_TARGET
p->canvas3D->zoom_to_volumes();
#endif // !ENABLE_MODIFIED_CAMERA_TARGET
}
} }
void Plater::fix_through_netfabb(const int obj_idx) { p->fix_through_netfabb(obj_idx); } void Plater::fix_through_netfabb(const int obj_idx) { p->fix_through_netfabb(obj_idx); }