3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' of https://github.com/prusa3d/Slic3r

Browse source
This commit is contained in:
Enrico Turri 2018-12-18 11:12:22 +01:00
commit 507d74c7aa
3 changed files with 35 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1548,11 +1548,16 @@ void GLCanvas3D::Selection::rotate(const Vec3d& rotation, bool local)
{ {
if (is_single_full_instance()) if (is_single_full_instance())
#if ENABLE_WORLD_ROTATIONS #if ENABLE_WORLD_ROTATIONS
{
if (local)
(*m_volumes)[i]->set_instance_rotation(rotation);
else
{ {
Transform3d m = Geometry::assemble_transform(Vec3d::Zero(), rotation); Transform3d m = Geometry::assemble_transform(Vec3d::Zero(), rotation);
Vec3d new_rotation = Geometry::extract_euler_angles(m * m_cache.volumes_data[i].get_instance_rotation_matrix()); Vec3d new_rotation = Geometry::extract_euler_angles(m * m_cache.volumes_data[i].get_instance_rotation_matrix());
(*m_volumes)[i]->set_instance_rotation(new_rotation); (*m_volumes)[i]->set_instance_rotation(new_rotation);
} }
}
#else #else
#if ENABLE_MODELVOLUME_TRANSFORM #if ENABLE_MODELVOLUME_TRANSFORM
(*m_volumes)[i]->set_instance_rotation(rotation); (*m_volumes)[i]->set_instance_rotation(rotation);

47
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View file

@ -144,8 +144,8 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) :
// Settings table // Settings table
m_og->append_line(add_og_to_object_settings(L("Position"), L("mm")), &m_move_Label); m_og->append_line(add_og_to_object_settings(L("Position"), L("mm")), &m_move_Label);
m_og->append_line(add_og_to_object_settings(L("Rotation"), "°")); m_og->append_line(add_og_to_object_settings(L("Rotation"), "°"), &m_rotate_Label);
m_og->append_line(add_og_to_object_settings(L("Scale"), "%")); m_og->append_line(add_og_to_object_settings(L("Scale"), "%"), &m_scale_Label);
m_og->append_line(add_og_to_object_settings(L("Size"), "mm")); m_og->append_line(add_og_to_object_settings(L("Size"), "mm"));
/* Unused parameter at this time /* Unused parameter at this time
@ -192,9 +192,11 @@ int ObjectManipulation::ol_selection()
void ObjectManipulation::update_settings_value(const GLCanvas3D::Selection& selection) void ObjectManipulation::update_settings_value(const GLCanvas3D::Selection& selection)
{ {
wxString move_label = _(L("Position")); wxString move_label = _(L("Position:"));
wxString rotate_label = _(L("Rotation:"));
wxString scale_label = _(L("Scale factors:"));
#if ENABLE_MODELVOLUME_TRANSFORM #if ENABLE_MODELVOLUME_TRANSFORM
if (selection.is_single_full_instance() || selection.is_single_full_object()) if (selection.is_single_full_instance())
#else #else
if (selection.is_single_full_object()) if (selection.is_single_full_object())
{ {
@ -228,19 +230,15 @@ void ObjectManipulation::update_settings_value(const GLCanvas3D::Selection& sele
#endif // ENABLE_MODELVOLUME_TRANSFORM #endif // ENABLE_MODELVOLUME_TRANSFORM
m_og->enable(); m_og->enable();
} }
else if (selection.is_wipe_tower()) else if (selection.is_single_full_object())
{ {
// the selection contains a single volume const BoundingBoxf3& box = selection.get_bounding_box();
const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin()); update_position_value(box.center());
#if ENABLE_MODELVOLUME_TRANSFORM reset_rotation_value();
update_position_value(volume->get_volume_offset()); reset_scale_value();
update_rotation_value(volume->get_volume_rotation()); update_size_value(box.size());
update_scale_value(volume->get_volume_scaling_factor()); rotate_label = _(L("Rotate:"));
#else scale_label = _(L("Scale:"));
update_position_value(volume->get_offset());
update_rotation_value(volume->get_rotation());
update_scale_value(volume->get_scaling_factor());
#endif // ENABLE_MODELVOLUME_TRANSFORM
m_og->enable(); m_og->enable();
} }
else if (selection.is_single_modifier() || selection.is_single_volume()) else if (selection.is_single_modifier() || selection.is_single_volume())
@ -262,7 +260,7 @@ void ObjectManipulation::update_settings_value(const GLCanvas3D::Selection& sele
else if (wxGetApp().obj_list()->multiple_selection()) else if (wxGetApp().obj_list()->multiple_selection())
{ {
reset_settings_value(); reset_settings_value();
move_label = _(L("Displacement")); move_label = _(L("Translate:"));
update_size_value(selection.get_bounding_box().size()); update_size_value(selection.get_bounding_box().size());
m_og->enable(); m_og->enable();
} }
@ -270,6 +268,8 @@ void ObjectManipulation::update_settings_value(const GLCanvas3D::Selection& sele
reset_settings_value(); reset_settings_value();
m_move_Label->SetLabel(move_label); m_move_Label->SetLabel(move_label);
m_rotate_Label->SetLabel(rotate_label);
m_scale_Label->SetLabel(scale_label);
} }
void ObjectManipulation::reset_settings_value() void ObjectManipulation::reset_settings_value()
@ -358,11 +358,9 @@ void ObjectManipulation::update_rotation_value(const Vec3d& rotation)
void ObjectManipulation::change_position_value(const Vec3d& position) void ObjectManipulation::change_position_value(const Vec3d& position)
{ {
Vec3d displacement(position - cache_position);
auto canvas = wxGetApp().plater()->canvas3D(); auto canvas = wxGetApp().plater()->canvas3D();
canvas->get_selection().start_dragging(); canvas->get_selection().start_dragging();
canvas->get_selection().translate(displacement); canvas->get_selection().translate(position - cache_position);
canvas->do_move(); canvas->do_move();
cache_position = position; cache_position = position;
@ -370,12 +368,17 @@ void ObjectManipulation::change_position_value(const Vec3d& position)
void ObjectManipulation::change_rotation_value(const Vec3d& rotation) void ObjectManipulation::change_rotation_value(const Vec3d& rotation)
{ {
GLCanvas3D* canvas = wxGetApp().plater()->canvas3D();
const GLCanvas3D::Selection& selection = canvas->get_selection();
Vec3d rad_rotation; Vec3d rad_rotation;
for (size_t i = 0; i < 3; ++i) for (size_t i = 0; i < 3; ++i)
{
rad_rotation(i) = Geometry::deg2rad(rotation(i)); rad_rotation(i) = Geometry::deg2rad(rotation(i));
auto canvas = wxGetApp().plater()->canvas3D(); }
canvas->get_selection().start_dragging(); canvas->get_selection().start_dragging();
canvas->get_selection().rotate(rad_rotation, false); canvas->get_selection().rotate(rad_rotation, selection.is_single_full_instance());
canvas->do_rotate(); canvas->do_rotate();
} }

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

@ -20,6 +20,8 @@ class ObjectManipulation : public OG_Settings
Vec3d cache_size { 0., 0., 0. }; Vec3d cache_size { 0., 0., 0. };
wxStaticText* m_move_Label = nullptr; wxStaticText* m_move_Label = nullptr;
wxStaticText* m_scale_Label = nullptr;
wxStaticText* m_rotate_Label = nullptr;
public: public:
ObjectManipulation(wxWindow* parent); ObjectManipulation(wxWindow* parent);