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

Fixed differences after rebase with master

Browse source
This commit is contained in:
enricoturri1966 2022-06-06 14:55:38 +02:00
parent 00878fb330
commit c99e93c357
9 changed files with 80 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libslic3r/Geometry.hpp
View file

@ -408,14 +408,14 @@ class Transformation
public:
#if ENABLE_WORLD_COORDINATE
Transformation() = default;
explicit Transformation(const Transform3d & transform) : m_matrix(transform) {}
explicit Transformation(const Transform3d& transform) : m_matrix(transform) {}
Vec3d get_offset() const { return m_matrix.translation(); }
double get_offset(Axis axis) const { return get_offset()[axis]; }
Transform3d get_offset_matrix() const;
void set_offset(const Vec3d & offset) { m_matrix.translation() = offset; }
void set_offset(const Vec3d& offset) { m_matrix.translation() = offset; }
void set_offset(Axis axis, double offset) { m_matrix.translation()[axis] = offset; }
Vec3d get_rotation() const;
@ -424,12 +424,12 @@ public:
Transform3d get_rotation_matrix() const;
#else
Transformation();
explicit Transformation(const Transform3d & transform);
explicit Transformation(const Transform3d& transform);
const Vec3d& get_offset() const { return m_offset; }
double get_offset(Axis axis) const { return m_offset(axis); }
void set_offset(const Vec3d & offset);
void set_offset(const Vec3d& offset);
void set_offset(Axis axis, double offset);
const Vec3d& get_rotation() const { return m_rotation; }