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

comment out 3mf only properties

Browse Source
This commit is contained in:
Michael Kirsch 2019-03-30 21:45:33 +01:00 committed by Joseph Lenox
parent e10fd143da
commit dd3c83b01c
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
}

9
xs/src/libslic3r/Model.hpp
View File

@ -7,6 +7,7 @@
#include "Layer.hpp"
#include "Point.hpp"
#include "TriangleMesh.hpp"
#include "TransformationMatrix.hpp"
#include "LayerHeightSpline.hpp"
#include <map>
#include <string>
@ -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