Moved C++ code into new libslic3r directory

xs/MANIFEST

@@ -1,6 +1,6 @@
 Build.PL
 lib/Slic3r/XS.pm
-MANIFEST			This list of files
+MANIFEST
 src/admesh/connect.c
 src/admesh/normals.c
 src/admesh/shared.c
@@ -1648,46 +1648,68 @@ src/boost/utility/swap.hpp
 src/boost/utility/value_init.hpp
 src/boost/version.hpp
 src/boost/visit_each.hpp
-src/BoundingBox.cpp
-src/BoundingBox.hpp
 src/clipper.cpp
 src/clipper.hpp
-src/ClipperUtils.cpp
+src/libslic3r/BoundingBox.cpp
-src/ClipperUtils.hpp
+src/libslic3r/BoundingBox.hpp
-src/Config.cpp
+src/libslic3r/ClipperUtils.cpp
-src/Config.hpp
+src/libslic3r/ClipperUtils.hpp
-src/ExPolygon.cpp
+src/libslic3r/Config.cpp
-src/ExPolygon.hpp
+src/libslic3r/Config.hpp
-src/ExPolygonCollection.cpp
+src/libslic3r/ExPolygon.cpp
-src/ExPolygonCollection.hpp
+src/libslic3r/ExPolygon.hpp
-src/Extruder.cpp
+src/libslic3r/ExPolygonCollection.cpp
-src/Extruder.hpp
+src/libslic3r/ExPolygonCollection.hpp
-src/ExtrusionEntity.cpp
+src/libslic3r/Extruder.cpp
-src/ExtrusionEntity.hpp
+src/libslic3r/Extruder.hpp
-src/ExtrusionEntityCollection.cpp
+src/libslic3r/ExtrusionEntity.cpp
-src/ExtrusionEntityCollection.hpp
+src/libslic3r/ExtrusionEntity.hpp
-src/Flow.cpp
+src/libslic3r/ExtrusionEntityCollection.cpp
-src/Flow.hpp
+src/libslic3r/ExtrusionEntityCollection.hpp
-src/GCode.hpp
+src/libslic3r/Flow.cpp
-src/Geometry.cpp
+src/libslic3r/Flow.hpp
-src/Geometry.hpp
+src/libslic3r/GCode.hpp
-src/Layer.cpp
+src/libslic3r/Geometry.cpp
-src/Layer.hpp
+src/libslic3r/Geometry.hpp
-src/LayerRegion.cpp
+src/libslic3r/Layer.cpp
-src/Line.cpp
+src/libslic3r/Layer.hpp
-src/Line.hpp
+src/libslic3r/LayerRegion.cpp
-src/Model.cpp
+src/libslic3r/libslic3r.h
-src/Model.hpp
+src/libslic3r/Line.cpp
-src/MotionPlanner.cpp
+src/libslic3r/Line.hpp
-src/MotionPlanner.hpp
+src/libslic3r/Model.cpp
-src/MultiPoint.cpp
+src/libslic3r/Model.hpp
-src/MultiPoint.hpp
+src/libslic3r/MotionPlanner.cpp
+src/libslic3r/MotionPlanner.hpp
+src/libslic3r/MultiPoint.cpp
+src/libslic3r/MultiPoint.hpp
+src/libslic3r/PlaceholderParser.cpp
+src/libslic3r/PlaceholderParser.hpp
+src/libslic3r/Point.cpp
+src/libslic3r/Point.hpp
+src/libslic3r/Polygon.cpp
+src/libslic3r/Polygon.hpp
+src/libslic3r/Polyline.cpp
+src/libslic3r/Polyline.hpp
+src/libslic3r/PolylineCollection.cpp
+src/libslic3r/PolylineCollection.hpp
+src/libslic3r/Print.cpp
+src/libslic3r/Print.hpp
+src/libslic3r/PrintConfig.cpp
+src/libslic3r/PrintConfig.hpp
+src/libslic3r/PrintObject.cpp
+src/libslic3r/PrintRegion.cpp
+src/libslic3r/Surface.cpp
+src/libslic3r/Surface.hpp
+src/libslic3r/SurfaceCollection.cpp
+src/libslic3r/SurfaceCollection.hpp
+src/libslic3r/SVG.cpp
+src/libslic3r/SVG.hpp
+src/libslic3r/TriangleMesh.cpp
+src/libslic3r/TriangleMesh.hpp
+src/libslic3r/utils.cpp
 src/myinit.h
 src/perlglue.hpp
-src/PlaceholderParser.cpp
-src/PlaceholderParser.hpp
-src/Point.cpp
-src/Point.hpp
 src/poly2tri/common/shapes.cc
 src/poly2tri/common/shapes.h
 src/poly2tri/common/utils.h
@@ -1700,30 +1722,9 @@ src/poly2tri/sweep/sweep.cc
 src/poly2tri/sweep/sweep.h
 src/poly2tri/sweep/sweep_context.cc
 src/poly2tri/sweep/sweep_context.h
-src/Polygon.cpp
-src/Polygon.hpp
-src/Polyline.cpp
-src/Polyline.hpp
-src/PolylineCollection.cpp
-src/PolylineCollection.hpp
 src/polypartition.cpp
 src/polypartition.h
 src/ppport.h
-src/Print.cpp
-src/Print.hpp
-src/PrintConfig.cpp
-src/PrintConfig.hpp
-src/PrintObject.cpp
-src/PrintRegion.cpp
-src/Surface.cpp
-src/Surface.hpp
-src/SurfaceCollection.cpp
-src/SurfaceCollection.hpp
-src/SVG.cpp
-src/SVG.hpp
-src/TriangleMesh.cpp
-src/TriangleMesh.hpp
-src/utils.cpp
 t/01_trianglemesh.t
 t/03_point.t
 t/04_expolygon.t

xs/src/libslic3r/libslic3r.h

@@ -0,0 +1,26 @@
+#ifndef _libslic3r_h_
+#define _libslic3r_h_
+
+// this needs to be included early for MSVC (listing it in Build.PL is not enough)
+#include <ostream>
+#include <iostream>
+#include <sstream>
+
+#define EPSILON 1e-4
+#define SCALING_FACTOR 0.000001
+#define PI 3.141592653589793238
+#define scale_(val) (val / SCALING_FACTOR)
+#define unscale(val) (val * SCALING_FACTOR)
+#define SCALED_EPSILON scale_(EPSILON)
+typedef long coord_t;
+typedef double coordf_t;
+
+namespace Slic3r {}
+using namespace Slic3r;
+
+/* Implementation of CONFESS("foo"): */
+#define CONFESS(...) confess_at(__FILE__, __LINE__, __func__, __VA_ARGS__)
+void confess_at(const char *file, int line, const char *func, const char *pat, ...);
+/* End implementation of CONFESS("foo"): */
+
+#endif

xs/src/myinit.h

@@ -20,21 +20,6 @@ extern "C" {
 #include "perlglue.hpp"
 #endif
 
-#define EPSILON 1e-4
+#include "libslic3r/libslic3r.h"
-#define SCALING_FACTOR 0.000001
-#define PI 3.141592653589793238
-#define scale_(val) (val / SCALING_FACTOR)
-#define unscale(val) (val * SCALING_FACTOR)
-#define SCALED_EPSILON scale_(EPSILON)
-typedef long coord_t;
-typedef double coordf_t;
-
-namespace Slic3r {}
-using namespace Slic3r;
-
-/* Implementation of CONFESS("foo"): */
-#define CONFESS(...) confess_at(__FILE__, __LINE__, __func__, __VA_ARGS__)
-void confess_at(const char *file, int line, const char *func, const char *pat, ...);
-/* End implementation of CONFESS("foo"): */
 
 #endif

xs/xsp/BoundingBox.xsp

@@ -2,8 +2,8 @@
 
 %{
 #include <myinit.h>
-#include "BoundingBox.hpp"
+#include "libslic3r/BoundingBox.hpp"
-#include "Point.hpp"
+#include "libslic3r/Point.hpp"
 %}
 
 %name{Slic3r::Geometry::BoundingBox} class BoundingBox {

xs/xsp/Clipper.xsp

@@ -3,7 +3,7 @@
 %{
 #include <myinit.h>
 #include "clipper.hpp"
-#include "ClipperUtils.hpp"
+#include "libslic3r/ClipperUtils.hpp"
 %}
 
 %package{Slic3r::Geometry::Clipper};

xs/xsp/Config.xsp

@@ -2,7 +2,7 @@
 
 %{
 #include <myinit.h>
-#include "PrintConfig.hpp"
+#include "libslic3r/PrintConfig.hpp"
 %}
 
 %name{Slic3r::Config} class DynamicPrintConfig {

xs/xsp/ExPolygon.xsp

@@ -2,7 +2,7 @@
 
 %{
 #include <myinit.h>
-#include "ExPolygon.hpp"
+#include "libslic3r/ExPolygon.hpp"
 %}
 
 %name{Slic3r::ExPolygon} class ExPolygon {

xs/xsp/ExPolygonCollection.xsp

@@ -2,7 +2,7 @@
 
 %{
 #include <myinit.h>
-#include "ExPolygonCollection.hpp"
+#include "libslic3r/ExPolygonCollection.hpp"
 %}
 
 %name{Slic3r::ExPolygon::Collection} class ExPolygonCollection {

xs/xsp/Extruder.xsp

@@ -2,7 +2,7 @@
 
 %{
 #include <myinit.h>
-#include "Extruder.hpp"
+#include "libslic3r/Extruder.hpp"
 %}
 
 %name{Slic3r::Extruder} class Extruder {

xs/xsp/ExtrusionEntityCollection.xsp

@@ -2,7 +2,7 @@
 
 %{
 #include <myinit.h>
-#include "ExtrusionEntityCollection.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
 %}
 
 %name{Slic3r::ExtrusionPath::Collection} class ExtrusionEntityCollection {

xs/xsp/ExtrusionLoop.xsp

@@ -2,7 +2,7 @@
 
 %{
 #include <myinit.h>
-#include "ExtrusionEntity.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
 %}
 
 %name{Slic3r::ExtrusionLoop} class ExtrusionLoop {

xs/xsp/ExtrusionPath.xsp

@@ -2,8 +2,8 @@
 
 %{
 #include <myinit.h>
-#include "ExtrusionEntity.hpp"
+#include "libslic3r/ExtrusionEntity.hpp"
-#include "ExtrusionEntityCollection.hpp"
+#include "libslic3r/ExtrusionEntityCollection.hpp"
 %}
 
 %name{Slic3r::ExtrusionPath} class ExtrusionPath {

xs/xsp/Flow.xsp

@@ -2,7 +2,7 @@
 
 %{
 #include <myinit.h>
-#include "Flow.hpp"
+#include "libslic3r/Flow.hpp"
 %}
 
 %name{Slic3r::Flow} class Flow {

xs/xsp/Geometry.xsp

@@ -2,7 +2,7 @@
 
 %{
 #include <myinit.h>
-#include "Geometry.hpp"
+#include "libslic3r/Geometry.hpp"
 %}
 
 

xs/xsp/Layer.xsp

@@ -2,8 +2,7 @@
 
 %{
 #include <myinit.h>
-#include "Layer.hpp"
+#include "libslic3r/Layer.hpp"
-#include "perlglue.hpp"
 %}
 
 %name{Slic3r::Layer::Region} class LayerRegion {

xs/xsp/Line.xsp

@@ -2,8 +2,8 @@
 
 %{
 #include <myinit.h>
-#include "Line.hpp"
+#include "libslic3r/Line.hpp"
-#include "Polyline.hpp"
+#include "libslic3r/Polyline.hpp"
 %}
 
 %name{Slic3r::Line} class Line {

xs/xsp/Model.xsp

@@ -2,8 +2,8 @@
 
 %{
 #include <myinit.h>
-#include "Model.hpp"
+#include "libslic3r/Model.hpp"
-#include "PrintConfig.hpp"
+#include "libslic3r/PrintConfig.hpp"
 %}
 
 %name{Slic3r::Model} class Model {

xs/xsp/MotionPlanner.xsp

@@ -2,7 +2,7 @@
 
 %{
 #include <myinit.h>
-#include "MotionPlanner.hpp"
+#include "libslic3r/MotionPlanner.hpp"
 %}
 
 %name{Slic3r::MotionPlanner} class MotionPlanner {

xs/xsp/PlaceholderParser.xsp

@@ -3,7 +3,7 @@
 %{
 #include <myinit.h>
 #include <vector>
-#include "PlaceholderParser.hpp"
+#include "libslic3r/PlaceholderParser.hpp"
 %}
 
 %name{Slic3r::GCode::PlaceholderParser} class PlaceholderParser {

xs/xsp/Point.xsp

@@ -2,9 +2,9 @@
 
 %{
 #include <myinit.h>
-#include "Point.hpp"
+#include "libslic3r/Point.hpp"
-#include "Polygon.hpp"
+#include "libslic3r/Polygon.hpp"
-#include "Polyline.hpp"
+#include "libslic3r/Polyline.hpp"
 %}
 
 %name{Slic3r::Point} class Point {

xs/xsp/Polygon.xsp

@@ -2,9 +2,9 @@
 
 %{
 #include <myinit.h>
-#include "BoundingBox.hpp"
+#include "libslic3r/BoundingBox.hpp"
-#include "Polygon.hpp"
+#include "libslic3r/Polygon.hpp"
-#include "BoundingBox.hpp"
+#include "libslic3r/BoundingBox.hpp"
 %}
 
 %name{Slic3r::Polygon} class Polygon {

xs/xsp/Polyline.xsp

@@ -2,9 +2,9 @@
 
 %{
 #include <myinit.h>
-#include "BoundingBox.hpp"
+#include "libslic3r/BoundingBox.hpp"
-#include "ClipperUtils.hpp"
+#include "libslic3r/ClipperUtils.hpp"
-#include "Polyline.hpp"
+#include "libslic3r/Polyline.hpp"
 %}
 
 %name{Slic3r::Polyline} class Polyline {

xs/xsp/PolylineCollection.xsp

@@ -2,7 +2,7 @@
 
 %{
 #include <myinit.h>
-#include "PolylineCollection.hpp"
+#include "libslic3r/PolylineCollection.hpp"
 %}
 
 %name{Slic3r::Polyline::Collection} class PolylineCollection {

xs/xsp/Print.xsp

@@ -2,8 +2,8 @@
 
 %{
 #include <myinit.h>
-#include "Print.hpp"
+#include "libslic3r/Print.hpp"
-#include "PlaceholderParser.hpp"
+#include "libslic3r/PlaceholderParser.hpp"
 %}
 
 %package{Slic3r::Print::State};

xs/xsp/Surface.xsp

@@ -2,8 +2,8 @@
 
 %{
 #include <myinit.h>
-#include "Surface.hpp"
+#include "libslic3r/Surface.hpp"
-#include "ClipperUtils.hpp"
+#include "libslic3r/ClipperUtils.hpp"
 %}
 
 %name{Slic3r::Surface} class Surface {

xs/xsp/SurfaceCollection.xsp

@@ -2,7 +2,7 @@
 
 %{
 #include <myinit.h>
-#include "SurfaceCollection.hpp"
+#include "libslic3r/SurfaceCollection.hpp"
 %}
 
 %name{Slic3r::Surface::Collection} class SurfaceCollection {

xs/xsp/TriangleMesh.xsp

@@ -2,7 +2,7 @@
 
 %{
 #include <myinit.h>
-#include "TriangleMesh.hpp"
+#include "libslic3r/TriangleMesh.hpp"
 %}
 
 %name{Slic3r::TriangleMesh} class TriangleMesh {