From dd3c83b01ce8c0d15facc6a19c7af3d9301a3881 Mon Sep 17 00:00:00 2001 From: Michael Kirsch Date: Sat, 30 Mar 2019 21:45:33 +0100 Subject: [PATCH] comment out 3mf only properties --- xs/src/libslic3r/Model.cpp | 4 ---- xs/src/libslic3r/Model.hpp | 9 +++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/xs/src/libslic3r/Model.cpp b/xs/src/libslic3r/Model.cpp index 06e26d7c0..12c2d40dd 100644 --- a/xs/src/libslic3r/Model.cpp +++ b/xs/src/libslic3r/Model.cpp @@ -1068,10 +1068,6 @@ ModelInstance::swap(ModelInstance &other) { std::swap(this->rotation, other.rotation); std::swap(this->scaling_factor, other.scaling_factor); - std::swap(this->scaling_vector, other.scaling_vector); - std::swap(this->x_rotation, other.x_rotation); - std::swap(this->y_rotation, other.y_rotation); - std::swap(this->z_translation, other.z_translation); std::swap(this->offset, other.offset); } diff --git a/xs/src/libslic3r/Model.hpp b/xs/src/libslic3r/Model.hpp index 7617724dd..d1e5e4922 100644 --- a/xs/src/libslic3r/Model.hpp +++ b/xs/src/libslic3r/Model.hpp @@ -7,6 +7,7 @@ #include "Layer.hpp" #include "Point.hpp" #include "TriangleMesh.hpp" +#include "TransformationMatrix.hpp" #include "LayerHeightSpline.hpp" #include #include @@ -530,12 +531,12 @@ class ModelInstance friend class ModelObject; public: double rotation; ///< Rotation around the Z axis, in radians around mesh center point. - double x_rotation; ///< Rotation around the X axis, in radians around mesh center point. Specific to 3MF format. - double y_rotation; ///< Rotation around the Y axis, in radians around mesh center point. Specific to 3MF format. +// double x_rotation; ///< Rotation around the X axis, in radians around mesh center point. Specific to 3MF format. +// double y_rotation; ///< Rotation around the Y axis, in radians around mesh center point. Specific to 3MF format. double scaling_factor; ///< uniform scaling factor. - Pointf3 scaling_vector; ///< scaling vector. Specific to 3MF format. +// Pointf3 scaling_vector; ///< scaling vector. Specific to 3MF format. Pointf offset; ///< offset in unscaled coordinates. - double z_translation; ///< translation in z axis. Specific to 3MF format. It's not used anywhere in Slic3r except at writing/reading 3mf. +// double z_translation; ///< translation in z axis. Specific to 3MF format. It's not used anywhere in Slic3r except at writing/reading 3mf. /// Get the owning ModelObject /// \return ModelObject* pointer to the owner ModelObject