pengo1998/OrcaSlicer-bambulab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflicts after merging with master

Browse Source
This commit is contained in:
Enrico Turri
2018-08-27 14:00:53 +02:00
parent 220d430956 4522811f5b
commit fef5a5252e
38 changed files with 835 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xs/src/libslic3r/TriangleMesh.hpp
View File

@@ -40,6 +40,7 @@ public:
void scale(const Vec3d &versor);
void translate(float x, float y, float z);
void rotate(float angle, const Axis &axis);
void rotate(float angle, const Vec3d& axis);
void rotate_x(float angle) { this->rotate(angle, X); }
void rotate_y(float angle) { this->rotate(angle, Y); }
void rotate_z(float angle) { this->rotate(angle, Z); }
@@ -53,6 +54,7 @@ public:
TriangleMeshPtrs split() const;
void merge(const TriangleMesh &mesh);
ExPolygons horizontal_projection() const;
const float* first_vertex() const;
Polygon convex_hull();
BoundingBoxf3 bounding_box() const;
// Returns the bbox of this TriangleMesh transformed by the given transformation