Merge branch 'master' into xsdata

Conflicts:
	lib/Slic3r.pm
	lib/Slic3r/ExPolygon.pm
	lib/Slic3r/Fill.pm
	lib/Slic3r/Fill/Rectilinear.pm
	lib/Slic3r/GCode.pm
	lib/Slic3r/GUI/Plater.pm
	lib/Slic3r/Geometry/Clipper.pm
	lib/Slic3r/Layer/Region.pm
	lib/Slic3r/Print.pm
	lib/Slic3r/Print/Object.pm
	lib/Slic3r/TriangleMesh.pm
	t/shells.t
	xs/MANIFEST

xs/src/ClipperUtils.cpp

@@ -277,4 +277,19 @@ void union_ex(Slic3r::Polygons &subject, Slic3r::ExPolygons &retval, bool safety
     _clipper(ClipperLib::ctUnion, subject, p, retval, safety_offset);
 }
 
+void simplify_polygons(Slic3r::Polygons &subject, Slic3r::Polygons &retval)
+{
+    // convert into Clipper polygons
+    ClipperLib::Polygons* input_subject = new ClipperLib::Polygons();
+    Slic3rPolygons_to_ClipperPolygons(subject, *input_subject);
+    
+    ClipperLib::Polygons* output = new ClipperLib::Polygons();
+    ClipperLib::SimplifyPolygons(*input_subject, *output, ClipperLib::pftNonZero);
+    delete input_subject;
+    
+    // convert into Slic3r polygons
+    ClipperPolygons_to_Slic3rPolygons(*output, retval);
+    delete output;
+}
+
 }

xs/src/ClipperUtils.hpp

@@ -62,6 +62,8 @@ void xor_ex(Slic3r::Polygons &subject, Slic3r::Polygons &clip, Slic3r::ExPolygon
 
 void union_ex(Slic3r::Polygons &subject, Slic3r::ExPolygons &retval, bool safety_offset = false);
 
+void simplify_polygons(Slic3r::Polygons &subject, Slic3r::Polygons &retval);
+
 }
 
 #endif

xs/src/ExPolygon.hpp

@@ -11,7 +11,6 @@ class ExPolygon
     public:
     Polygon contour;
     Polygons holes;
-    bool in_collection;
     void from_SV(SV* poly_sv);
     void from_SV_check(SV* poly_sv);
     SV* to_SV();
@@ -23,7 +22,6 @@ class ExPolygon
 };
 
 typedef std::vector<ExPolygon> ExPolygons;
-typedef std::vector<ExPolygon*> ExPolygonsPtr;
 
 }
 

xs/src/ExPolygonCollection.cpp

@@ -5,24 +5,24 @@ namespace Slic3r {
 void
 ExPolygonCollection::scale(double factor)
 {
-    for (ExPolygonsPtr::iterator it = expolygons.begin(); it != expolygons.end(); ++it) {
-        (**it).scale(factor);
+    for (ExPolygons::iterator it = expolygons.begin(); it != expolygons.end(); ++it) {
+        (*it).scale(factor);
     }
 }
 
 void
 ExPolygonCollection::translate(double x, double y)
 {
-   for (ExPolygonsPtr::iterator it = expolygons.begin(); it != expolygons.end(); ++it) {
-        (**it).translate(x, y);
+   for (ExPolygons::iterator it = expolygons.begin(); it != expolygons.end(); ++it) {
+        (*it).translate(x, y);
     }
 }
 
 void
 ExPolygonCollection::rotate(double angle, Point* center)
 {
-    for (ExPolygonsPtr::iterator it = expolygons.begin(); it != expolygons.end(); ++it) {
-        (**it).rotate(angle, center);
+    for (ExPolygons::iterator it = expolygons.begin(); it != expolygons.end(); ++it) {
+        (*it).rotate(angle, center);
     }
 }
 

xs/src/ExPolygonCollection.hpp

@@ -9,7 +9,7 @@ namespace Slic3r {
 class ExPolygonCollection
 {
     public:
-    ExPolygonsPtr expolygons;
+    ExPolygons expolygons;
     void scale(double factor);
     void translate(double x, double y);
     void rotate(double angle, Point* center);

xs/src/Surface.hpp

@@ -16,11 +16,9 @@ class Surface
     unsigned short  thickness_layers;   // in layers
     double          bridge_angle;
     unsigned short  extra_perimeters;
-    bool            in_collection;
 };
 
 typedef std::vector<Surface> Surfaces;
-typedef std::vector<Surface*> SurfacesPtr;
 
 }
 

xs/src/SurfaceCollection.hpp

@@ -8,7 +8,7 @@ namespace Slic3r {
 class SurfaceCollection
 {
     public:
-    SurfacesPtr surfaces;
+    Surfaces surfaces;
 };
 
 }

xs/src/TriangleMesh.cpp

@@ -28,17 +28,17 @@ void TriangleMesh::ReadFromPerl(SV* vertices, SV* facets)
     for (unsigned int i = 0; i < stl.stats.number_of_facets; i++) {
         AV* facet_av = (AV*)SvRV(*av_fetch(facets_av, i, 0));
         stl_facet facet;
-        facet.normal.x = NULL;
-        facet.normal.y = NULL;
-        facet.normal.z = NULL;
+        facet.normal.x = 0;
+        facet.normal.y = 0;
+        facet.normal.z = 0;
         for (unsigned int v = 0; v <= 2; v++) {
             AV* vertex_av = (AV*)SvRV(*av_fetch(vertices_av, SvIV(*av_fetch(facet_av, v, 0)), 0));
             facet.vertex[v].x = SvNV(*av_fetch(vertex_av, 0, 0));
             facet.vertex[v].y = SvNV(*av_fetch(vertex_av, 1, 0));
             facet.vertex[v].z = SvNV(*av_fetch(vertex_av, 2, 0));
         }
-        facet.extra[0] = NULL;
-        facet.extra[1] = NULL;
+        facet.extra[0] = 0;
+        facet.extra[1] = 0;
         
         stl.facet_start[i] = facet;
     }

xs/src/admesh/connect.c

@@ -82,6 +82,7 @@ stl_check_facets_exact(stl_file *stl)
     {
       facet = stl->facet_start[i];
 
+      //If any two of the three vertices are found to be exactally the same, call them degenerate and remove the facet.
       if(   !memcmp(&facet.vertex[0], &facet.vertex[1], 
 		    sizeof(stl_vertex))
 	 || !memcmp(&facet.vertex[1], &facet.vertex[2], 

xs/src/admesh/normals.c

@@ -121,9 +121,13 @@ stl_fix_normal_directions(stl_file *stl)
   
 
   facet_num = 0;
+  //If normal vector is not within tolerance and backwards:
+  //Arbitrarily starts at face 0.  If this one is wrong, we're screwed.  Thankfully, the chances
+  // of it being wrong randomly are low if most of the triangles are right:
   if(stl_check_normal_vector(stl, 0, 0) == 2)
     stl_reverse_facet(stl, 0);
-     
+
+  //Say that we've fixed this facet:
   norm_sw[facet_num] = 1;
   /*  edge_num = 0;
       vnot = stl->neighbors_start[0].which_vertex_not[0];
@@ -133,19 +137,24 @@ stl_fix_normal_directions(stl_file *stl)
   for(;;)
     {
       /* Add neighbors_to_list. */
+      //Add unconnected neighbors to the list:a
       for(j = 0; j < 3; j++)
 	{
 	  /* Reverse the neighboring facets if necessary. */
 	  if(stl->neighbors_start[facet_num].which_vertex_not[j] > 2)
 	    {
+	    // If the facet has a neighbor that is -1, it means that edge isn't shared by another
+        // facet.
 	      if(stl->neighbors_start[facet_num].neighbor[j] != -1)
 		{
 		  stl_reverse_facet
 		    (stl, stl->neighbors_start[facet_num].neighbor[j]);
 		}
 	    }
+	    //If this edge of the facet is connected:
 	  if(stl->neighbors_start[facet_num].neighbor[j] != -1)
 	    {
+	      //If we haven't fixed this facet yet, add it to the list:
 	      if(norm_sw[stl->neighbors_start[facet_num].neighbor[j]] != 1)
 		{
 		  /* Add node to beginning of list. */
@@ -170,14 +179,14 @@ stl_fix_normal_directions(stl_file *stl)
 	  head->next = head->next->next;
 	  free(temp);
 	}
-      else
+      else  //if we ran out of facets to fix:
 	{
 	  /* All of the facets in this part have been fixed. */
 	  stl->stats.number_of_parts += 1;
 	  /* There are (checked-checked_before) facets */
 	  /* in part stl->stats.number_of_parts */
 	  checked_before = checked;
-	  if(checked == stl->stats.number_of_facets)
+	  if(checked >= stl->stats.number_of_facets)
 	    {
 	      /* All of the facets have been checked.  Bail out. */
 	      break;
@@ -350,7 +359,7 @@ void stl_normalize_vector(float v[])
   min_normal_length = 0.000000000001;
   if(length < min_normal_length)
     {
-      v[0] = 1.0;
+      v[0] = 0.0;
       v[1] = 0.0;
       v[2] = 0.0;
       return;

xs/src/admesh/stl_io.c

@@ -198,6 +198,7 @@ stl_print_neighbors(stl_file *stl, char *file)
 	      stl->neighbors_start[i].neighbor[2],
 	      (int)stl->neighbors_start[i].which_vertex_not[2]);
     }
+    fclose(fp);
 }
 
 static void