3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 20:51:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

Browse source
This commit is contained in:
bubnikv 2018-12-10 09:52:33 +01:00
commit 57232395f4
2 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1080,8 +1080,10 @@ GLCanvas3D::Selection::VolumeCache::TransformCache::TransformCache()
: position(Vec3d::Zero()) : position(Vec3d::Zero())
, rotation(Vec3d::Zero()) , rotation(Vec3d::Zero())
, scaling_factor(Vec3d::Ones()) , scaling_factor(Vec3d::Ones())
, mirror(Vec3d::Ones())
, rotation_matrix(Transform3d::Identity()) , rotation_matrix(Transform3d::Identity())
, scale_matrix(Transform3d::Identity()) , scale_matrix(Transform3d::Identity())
, mirror_matrix(Transform3d::Identity())
{ {
} }
@ -1089,9 +1091,11 @@ GLCanvas3D::Selection::VolumeCache::TransformCache::TransformCache(const Geometr
: position(transform.get_offset()) : position(transform.get_offset())
, rotation(transform.get_rotation()) , rotation(transform.get_rotation())
, scaling_factor(transform.get_scaling_factor()) , scaling_factor(transform.get_scaling_factor())
, mirror(transform.get_mirror())
{ {
rotation_matrix = Geometry::assemble_transform(Vec3d::Zero(), rotation); rotation_matrix = Geometry::assemble_transform(Vec3d::Zero(), rotation);
scale_matrix = Geometry::assemble_transform(Vec3d::Zero(), Vec3d::Zero(), scaling_factor); scale_matrix = Geometry::assemble_transform(Vec3d::Zero(), Vec3d::Zero(), scaling_factor);
mirror_matrix = Geometry::assemble_transform(Vec3d::Zero(), Vec3d::Zero(), Vec3d::Ones(), mirror);
} }
GLCanvas3D::Selection::VolumeCache::VolumeCache(const Geometry::Transformation& volume_transform, const Geometry::Transformation& instance_transform) GLCanvas3D::Selection::VolumeCache::VolumeCache(const Geometry::Transformation& volume_transform, const Geometry::Transformation& instance_transform)
@ -1481,7 +1485,7 @@ void GLCanvas3D::Selection::translate(const Vec3d& displacement)
#if ENABLE_MODELVOLUME_TRANSFORM #if ENABLE_MODELVOLUME_TRANSFORM
if ((m_mode == Volume) || (*m_volumes)[i]->is_wipe_tower) if ((m_mode == Volume) || (*m_volumes)[i]->is_wipe_tower)
{ {
Vec3d local_displacement = (m_cache.volumes_data[i].get_instance_rotation_matrix() * m_cache.volumes_data[i].get_instance_scale_matrix()).inverse() * displacement; Vec3d local_displacement = (m_cache.volumes_data[i].get_instance_rotation_matrix() * m_cache.volumes_data[i].get_instance_scale_matrix() * m_cache.volumes_data[i].get_instance_mirror_matrix()).inverse() * displacement;
(*m_volumes)[i]->set_volume_offset(m_cache.volumes_data[i].get_volume_position() + local_displacement); (*m_volumes)[i]->set_volume_offset(m_cache.volumes_data[i].get_volume_position() + local_displacement);
} }
else if (m_mode == Instance) else if (m_mode == Instance)
@ -5338,6 +5342,15 @@ void GLCanvas3D::do_mirror()
} }
} }
// Fixes sinking/flying instances
for (const std::pair<int, int>& i : done)
{
ModelObject* m = m_model->objects[i.first];
Vec3d shift(0.0, 0.0, -m->get_instance_min_z(i.second));
m_selection.translate(i.first, i.second, shift);
m->translate_instance(i.second, shift);
}
post_event(SimpleEvent(EVT_GLCANVAS_SCHEDULE_BACKGROUND_PROCESS)); post_event(SimpleEvent(EVT_GLCANVAS_SCHEDULE_BACKGROUND_PROCESS));
} }

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

@ -398,8 +398,10 @@ public:
Vec3d position; Vec3d position;
Vec3d rotation; Vec3d rotation;
Vec3d scaling_factor; Vec3d scaling_factor;
Vec3d mirror;
Transform3d rotation_matrix; Transform3d rotation_matrix;
Transform3d scale_matrix; Transform3d scale_matrix;
Transform3d mirror_matrix;
TransformCache(); TransformCache();
explicit TransformCache(const Geometry::Transformation& transform); explicit TransformCache(const Geometry::Transformation& transform);
@ -428,14 +430,18 @@ public:
const Vec3d& get_volume_position() const { return m_volume.position; } const Vec3d& get_volume_position() const { return m_volume.position; }
const Vec3d& get_volume_rotation() const { return m_volume.rotation; } const Vec3d& get_volume_rotation() const { return m_volume.rotation; }
const Vec3d& get_volume_scaling_factor() const { return m_volume.scaling_factor; } const Vec3d& get_volume_scaling_factor() const { return m_volume.scaling_factor; }
const Vec3d& get_volume_mirror() const { return m_volume.mirror; }
const Transform3d& get_volume_rotation_matrix() const { return m_volume.rotation_matrix; } const Transform3d& get_volume_rotation_matrix() const { return m_volume.rotation_matrix; }
const Transform3d& get_volume_scale_matrix() const { return m_volume.scale_matrix; } const Transform3d& get_volume_scale_matrix() const { return m_volume.scale_matrix; }
const Transform3d& get_volume_mirror_matrix() const { return m_volume.mirror_matrix; }
const Vec3d& get_instance_position() const { return m_instance.position; } const Vec3d& get_instance_position() const { return m_instance.position; }
const Vec3d& get_instance_rotation() const { return m_instance.rotation; } const Vec3d& get_instance_rotation() const { return m_instance.rotation; }
const Vec3d& get_instance_scaling_factor() const { return m_instance.scaling_factor; } const Vec3d& get_instance_scaling_factor() const { return m_instance.scaling_factor; }
const Vec3d& get_instance_mirror() const { return m_instance.mirror; }
const Transform3d& get_instance_rotation_matrix() const { return m_instance.rotation_matrix; } const Transform3d& get_instance_rotation_matrix() const { return m_instance.rotation_matrix; }
const Transform3d& get_instance_scale_matrix() const { return m_instance.scale_matrix; } const Transform3d& get_instance_scale_matrix() const { return m_instance.scale_matrix; }
const Transform3d& get_instance_mirror_matrix() const { return m_instance.mirror_matrix; }
#else #else
const Vec3d& get_position() const { return m_position; } const Vec3d& get_position() const { return m_position; }
const Vec3d& get_rotation() const { return m_rotation; } const Vec3d& get_rotation() const { return m_rotation; }