GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-04 01:40:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

wrap every object transforming function to work from the centers

Browse Source
This commit is contained in:
Michael Kirsch 2019-06-29 00:56:41 +02:00 committed by Joseph Lenox
parent 4e00c34f45
commit ea156dab02
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
xs/src/libslic3r/Model.cpp
View File

@ -753,7 +753,11 @@ void
ModelObject::scale(const Pointf3 &versor)
{
if (versor.x == 1 && versor.y == 1 && versor.z == 1) return;
TransformationMatrix trafo = TransformationMatrix::mat_scale(versor.x, versor.y, versor.z);
TransformationMatrix center_trafo = this->get_trafo_to_center();
TransformationMatrix trafo = TransformationMatrix::multiply(TransformationMatrix::mat_scale(versor.x, versor.y, versor.z), center_trafo);
trafo.applyLeft(center_trafo.inverse());
this->apply_transformation(trafo);
// reset origin translation since it doesn't make sense anymore
@ -779,7 +783,11 @@ void
ModelObject::rotate(double angle, const Axis &axis)
{
if (angle == 0) return;
TransformationMatrix trafo = TransformationMatrix::mat_rotation(angle, axis);
TransformationMatrix center_trafo = this->get_trafo_to_center();
TransformationMatrix trafo = TransformationMatrix::multiply(TransformationMatrix::mat_rotation(angle, axis), center_trafo);
trafo.applyLeft(center_trafo.inverse());
this->apply_transformation(trafo);
this->origin_translation = Pointf3(0,0,0);
@ -790,7 +798,11 @@ void
ModelObject::rotate(double angle, const Vectorf3 &axis)
{
if (angle == 0) return;
TransformationMatrix trafo = TransformationMatrix::mat_rotation(angle, axis);
TransformationMatrix center_trafo = this->get_trafo_to_center();
TransformationMatrix trafo = TransformationMatrix::multiply(TransformationMatrix::mat_rotation(angle, axis), center_trafo);
trafo.applyLeft(center_trafo.inverse());
this->apply_transformation(trafo);
this->origin_translation = Pointf3(0,0,0);
@ -800,7 +812,11 @@ ModelObject::rotate(double angle, const Vectorf3 &axis)
void
ModelObject::rotate(const Vectorf3 &origin, const Vectorf3 &target)
{
TransformationMatrix trafo = TransformationMatrix::mat_rotation(origin, target);
TransformationMatrix center_trafo = this->get_trafo_to_center();
TransformationMatrix trafo = TransformationMatrix::multiply(TransformationMatrix::mat_rotation(origin, target), center_trafo);
trafo.applyLeft(center_trafo.inverse());
this->apply_transformation(trafo);
this->origin_translation = Pointf3(0,0,0);
@ -810,7 +826,10 @@ ModelObject::rotate(const Vectorf3 &origin, const Vectorf3 &target)
void
ModelObject::mirror(const Axis &axis)
{
TransformationMatrix trafo = TransformationMatrix::mat_mirror(axis);
TransformationMatrix center_trafo = this->get_trafo_to_center();
TransformationMatrix trafo = TransformationMatrix::multiply(TransformationMatrix::mat_mirror(axis), center_trafo);
trafo.applyLeft(center_trafo.inverse());
this->apply_transformation(trafo);
this->origin_translation = Pointf3(0,0,0);