From d4ae734659196a3a784d297c879bda5ee8d208f8 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Tue, 6 Jan 2015 20:58:07 +0100 Subject: [PATCH] Minor improvement to IntersectionLine (now subclasses Line) --- xs/src/libslic3r/TriangleMesh.cpp | 6 ++---- xs/src/libslic3r/TriangleMesh.hpp | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/xs/src/libslic3r/TriangleMesh.cpp b/xs/src/libslic3r/TriangleMesh.cpp index 94e5668dd..7c2a0a344 100644 --- a/xs/src/libslic3r/TriangleMesh.cpp +++ b/xs/src/libslic3r/TriangleMesh.cpp @@ -614,10 +614,8 @@ TriangleMeshSlicer::slice_facet(float slice_z, const stl_facet &facet, const int if (!points.empty()) { assert(points.size() == 2); // facets must intersect each plane 0 or 2 times IntersectionLine line; - line.a.x = points[1].x; - line.a.y = points[1].y; - line.b.x = points[0].x; - line.b.y = points[0].y; + line.a = (Point)points[1]; + line.b = (Point)points[0]; line.a_id = points[1].point_id; line.b_id = points[0].point_id; line.edge_a_id = points[1].edge_id; diff --git a/xs/src/libslic3r/TriangleMesh.hpp b/xs/src/libslic3r/TriangleMesh.hpp index afde8a65d..227bceae0 100644 --- a/xs/src/libslic3r/TriangleMesh.hpp +++ b/xs/src/libslic3r/TriangleMesh.hpp @@ -5,6 +5,7 @@ #include #include #include "BoundingBox.hpp" +#include "Line.hpp" #include "Point.hpp" #include "Polygon.hpp" #include "ExPolygon.hpp" @@ -71,11 +72,9 @@ class IntersectionPoint : public Point IntersectionPoint() : point_id(-1), edge_id(-1) {}; }; -class IntersectionLine +class IntersectionLine : public Line { public: - Point a; - Point b; int a_id; int b_id; int edge_a_id;