From 8c1e1cc3ea07a0a2a8379e058a035a8b8bd0c855 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Sun, 14 Jul 2013 16:09:54 +0200
Subject: [PATCH] Have Polygon inherit from Polyline

---
 xs/src/Polygon.hpp  | 37 ++-------------------
 xs/src/Polyline.hpp | 78 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 35 deletions(-)
 create mode 100644 xs/src/Polyline.hpp

diff --git a/xs/src/Polygon.hpp b/xs/src/Polygon.hpp
index 2dca5da9d..264cc3b9c 100644
--- a/xs/src/Polygon.hpp
+++ b/xs/src/Polygon.hpp
@@ -8,47 +8,14 @@ extern "C" {
 #include "ppport.h"
 }
 
-#include "Point.hpp"
+#include "Polyline.hpp"
 
 namespace Slic3r {
 
-class Polygon
-{
-    public:
-    Points points;
-    void scale(double factor);
-    void translate(double x, double y);
-    void rotate(double angle, Point* center);
-};
+class Polygon : public Polyline {};
 
 typedef std::vector<Polygon> Polygons;
 
-void
-Polygon::scale(double factor)
-{
-    for (Points::iterator it = points.begin(); it != points.end(); ++it) {
-        (*it).x *= factor;
-        (*it).y *= factor;
-    }
-}
-
-void
-Polygon::translate(double x, double y)
-{
-    for (Points::iterator it = points.begin(); it != points.end(); ++it) {
-        (*it).x += x;
-        (*it).y += y;
-    }
-}
-
-void
-Polygon::rotate(double angle, Point* center)
-{
-    for (Points::iterator it = points.begin(); it != points.end(); ++it) {
-        (*it).rotate(angle, center);
-    }
-}
-
 void
 perl2polygon(SV* poly_sv, Polygon& poly)
 {
diff --git a/xs/src/Polyline.hpp b/xs/src/Polyline.hpp
new file mode 100644
index 000000000..65285126d
--- /dev/null
+++ b/xs/src/Polyline.hpp
@@ -0,0 +1,78 @@
+#ifndef slic3r_Polyline_hpp_
+#define slic3r_Polyline_hpp_
+
+extern "C" {
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+#include "ppport.h"
+}
+
+#include "Point.hpp"
+
+namespace Slic3r {
+
+class Polyline
+{
+    public:
+    Points points;
+    void scale(double factor);
+    void translate(double x, double y);
+    void rotate(double angle, Point* center);
+};
+
+typedef std::vector<Polyline> Polylines;
+
+void
+Polyline::scale(double factor)
+{
+    for (Points::iterator it = points.begin(); it != points.end(); ++it) {
+        (*it).x *= factor;
+        (*it).y *= factor;
+    }
+}
+
+void
+Polyline::translate(double x, double y)
+{
+    for (Points::iterator it = points.begin(); it != points.end(); ++it) {
+        (*it).x += x;
+        (*it).y += y;
+    }
+}
+
+void
+Polyline::rotate(double angle, Point* center)
+{
+    for (Points::iterator it = points.begin(); it != points.end(); ++it) {
+        (*it).rotate(angle, center);
+    }
+}
+
+void
+perl2polyline(SV* poly_sv, Polyline& poly)
+{
+    AV* poly_av = (AV*)SvRV(poly_sv);
+    const unsigned int num_points = av_len(poly_av)+1;
+    poly.points.resize(num_points);
+    
+    for (unsigned int i = 0; i < num_points; i++) {
+        SV** point_sv = av_fetch(poly_av, i, 0);
+        perl2point(*point_sv, poly.points[i]);
+    }
+}
+
+SV*
+polyline2perl(Polyline& poly) {
+    const unsigned int num_points = poly.points.size();
+    AV* av = newAV();
+    av_extend(av, num_points-1);
+    for (unsigned int i = 0; i < num_points; i++) {
+        av_store(av, i, point2perl(poly.points[i]));
+    }
+    return sv_bless(newRV_noinc((SV*)av), gv_stashpv("Slic3r::Polyline", GV_ADD));
+}
+
+}
+
+#endif