diff --git a/src/avrdude/config.c b/src/avrdude/config.c index 1c0ff5525..a75bd8ee1 100644 --- a/src/avrdude/config.c +++ b/src/avrdude/config.c @@ -233,7 +233,7 @@ TOKEN * hexnumber(char * text) TOKEN * string(char * text) { struct token_t * tkn; - int len; + size_t len; tkn = new_token(TKN_STRING); if (tkn == NULL) { diff --git a/src/libslic3r/ExPolygon.cpp b/src/libslic3r/ExPolygon.cpp index ad4948eba..c2ec08b8a 100644 --- a/src/libslic3r/ExPolygon.cpp +++ b/src/libslic3r/ExPolygon.cpp @@ -307,7 +307,7 @@ ExPolygon::get_trapezoids3_half(Polygons* polygons, float spacing) const { BoundingBox bb(pp); // get all x coordinates - int min_x = pp[0].x(), max_x = pp[0].x(); + coord_t min_x = pp[0].x(), max_x = pp[0].x(); std::vector xx; for (Points::const_iterator p = pp.begin(); p != pp.end(); ++p) { if (min_x > p->x()) min_x = p->x(); diff --git a/src/libslic3r/Fill/Fill3DHoneycomb.cpp b/src/libslic3r/Fill/Fill3DHoneycomb.cpp index bb4958320..4546f8ec2 100644 --- a/src/libslic3r/Fill/Fill3DHoneycomb.cpp +++ b/src/libslic3r/Fill/Fill3DHoneycomb.cpp @@ -153,9 +153,10 @@ void Fill3DHoneycomb::_fill_surface_single( Polylines polylines = makeGrid( scale_(this->z), distance, - ceil(bb.size()(0) / distance) + 1, - ceil(bb.size()(1) / distance) + 1, - ((this->layer_id/thickness_layers) % 2) + 1); + ceil(bb.size().x() / distance) + 1, + ceil(bb.size().y() / distance) + 1, + size_t((this->layer_id / thickness_layers) % 2) + 1); + //makeGrid(coord_t z, coord_t gridSize, size_t gridWidth, size_t gridHeight, size_t curveType) // move pattern in place for (Polylines::iterator it = polylines.begin(); it != polylines.end(); ++ it) diff --git a/src/libslic3r/Fill/FillBase.cpp b/src/libslic3r/Fill/FillBase.cpp index b7abb4f96..3bf729b9e 100644 --- a/src/libslic3r/Fill/FillBase.cpp +++ b/src/libslic3r/Fill/FillBase.cpp @@ -197,7 +197,7 @@ void Fill::fill_surface_extrusion(const Surface *surface, const FillParams ¶ good_role, params.flow->mm3_per_mm() * params.flow_mult * multFlow, params.flow->width * params.flow_mult * multFlow, - params.flow->height); + (float)params.flow->height); } diff --git a/src/libslic3r/Fill/FillRectilinear.hpp b/src/libslic3r/Fill/FillRectilinear.hpp index 1be85f755..c55a4c020 100644 --- a/src/libslic3r/Fill/FillRectilinear.hpp +++ b/src/libslic3r/Fill/FillRectilinear.hpp @@ -55,7 +55,7 @@ protected: virtual bool _can_connect(coord_t dist_X, coord_t dist_Y) { - coord_t TOLERANCE = 10 * SCALED_EPSILON; + double TOLERANCE = 10 * SCALED_EPSILON; return (dist_X >= (this->_line_spacing - this->_line_oscillation) - TOLERANCE) && (dist_X <= (this->_line_spacing + this->_line_oscillation) + TOLERANCE) && (dist_Y <= this->_diagonal_distance); diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 64386b972..78a01b9de 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1692,11 +1692,11 @@ void GCode::process_layer( for (ObjectByExtruder &object_by_extruder : objects_by_extruder_it->second) { const size_t layer_id = &object_by_extruder - objects_by_extruder_it->second.data(); - std::cout << "Writing gcode for layer at " << layers[layer_id].print_z() << ", " << ((this->m_layer_index *100 )/ this->m_layer_count) << "%" << std::endl; const PrintObject *print_object = layers[layer_id].object(); - if (print_object == nullptr) - // This layer is empty for this particular object, it has neither object extrusions nor support extrusions at this print_z. - continue; + if (print_object == nullptr) + // This layer is empty for this particular object, it has neither object extrusions nor support extrusions at this print_z. + continue; + std::cout << "Writing gcode for layer at " << layers[layer_id].print_z() << ", " << ((this->m_layer_index * 100) / this->m_layer_count) << "%" << std::endl; m_config.apply(print_object->config(), true); m_layer = layers[layer_id].layer(); diff --git a/src/libslic3r/Point.hpp b/src/libslic3r/Point.hpp index a411c6271..7554e576e 100644 --- a/src/libslic3r/Point.hpp +++ b/src/libslic3r/Point.hpp @@ -133,8 +133,8 @@ public: double distance_to(const Point &point) const { return (point - *this).cast().norm(); } double distance_to_square(const Point &point) const { - double dx = (point.x() - this->x()); - double dy = (point.y() - this->y()); + double dx = double(point.x() - this->x()); + double dy = double(point.y() - this->y()); return dx*dx + dy*dy; } double distance_to(const Line &line) const; diff --git a/src/test/inputs/test_denseinfill/10mm_notchstl.stl b/src/test/inputs/test_denseinfill/10mm_notchstl.stl new file mode 100644 index 000000000..5eb34baae --- /dev/null +++ b/src/test/inputs/test_denseinfill/10mm_notchstl.stl @@ -0,0 +1,170 @@ +solid OpenSCAD_Model + facet normal -1 0 0 + outer loop + vertex 0 30 0 + vertex 0 10 5 + vertex 0 30 10 + endloop + endfacet + facet normal -1 0 0 + outer loop + vertex 0 0 0 + vertex 0 10 5 + vertex 0 30 0 + endloop + endfacet + facet normal -1 -0 0 + outer loop + vertex 0 10 5 + vertex 0 0 0 + vertex 0 0 5 + endloop + endfacet + facet normal -1 -0 0 + outer loop + vertex 0 30 10 + vertex 0 10 5 + vertex 0 10 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 30 30 10 + vertex 10 10 10 + vertex 30 0 10 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 0 30 10 + vertex 10 10 10 + vertex 30 30 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 10 10 10 + vertex 0 30 10 + vertex 0 10 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 30 0 10 + vertex 10 10 10 + vertex 10 0 10 + endloop + endfacet + facet normal 1 -0 0 + outer loop + vertex 30 0 10 + vertex 30 30 0 + vertex 30 30 10 + endloop + endfacet + facet normal 1 0 0 + outer loop + vertex 30 30 0 + vertex 30 0 10 + vertex 30 0 0 + endloop + endfacet + facet normal 0 1 -0 + outer loop + vertex 30 30 0 + vertex 0 30 10 + vertex 30 30 10 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex 0 30 10 + vertex 30 30 0 + vertex 0 30 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 0 0 0 + vertex 30 30 0 + vertex 30 0 0 + endloop + endfacet + facet normal -0 0 -1 + outer loop + vertex 30 30 0 + vertex 0 0 0 + vertex 0 30 0 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 0 0 5 + vertex 0 0 0 + vertex 10 0 5 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 10 0 5 + vertex 30 0 10 + vertex 10 0 10 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 30 0 0 + vertex 10 0 5 + vertex 0 0 0 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 10 0 5 + vertex 30 0 0 + vertex 30 0 10 + endloop + endfacet + facet normal -1 0 0 + outer loop + vertex 10 0 5 + vertex 10 10 10 + vertex 10 10 5 + endloop + endfacet + facet normal -1 -0 0 + outer loop + vertex 10 10 10 + vertex 10 0 5 + vertex 10 0 10 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 0 10 5 + vertex 10 10 10 + vertex 0 10 10 + endloop + endfacet + facet normal 0 -1 -0 + outer loop + vertex 10 10 10 + vertex 0 10 5 + vertex 10 10 5 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 0 10 5 + vertex 10 0 5 + vertex 10 10 5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 10 0 5 + vertex 0 10 5 + vertex 0 0 5 + endloop + endfacet +endsolid OpenSCAD_Model diff --git a/src/test/inputs/test_denseinfill/20mm_notch.stl b/src/test/inputs/test_denseinfill/20mm_notch.stl new file mode 100644 index 000000000..e9425e5a8 --- /dev/null +++ b/src/test/inputs/test_denseinfill/20mm_notch.stl @@ -0,0 +1,170 @@ +solid OpenSCAD_Model + facet normal -1 0 0 + outer loop + vertex 0 30 0 + vertex 0 20 5 + vertex 0 30 10 + endloop + endfacet + facet normal -1 0 0 + outer loop + vertex 0 0 0 + vertex 0 20 5 + vertex 0 30 0 + endloop + endfacet + facet normal -1 -0 0 + outer loop + vertex 0 20 5 + vertex 0 0 0 + vertex 0 0 5 + endloop + endfacet + facet normal -1 -0 0 + outer loop + vertex 0 30 10 + vertex 0 20 5 + vertex 0 20 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 30 30 10 + vertex 20 20 10 + vertex 30 0 10 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 0 30 10 + vertex 20 20 10 + vertex 30 30 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 20 20 10 + vertex 0 30 10 + vertex 0 20 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 30 0 10 + vertex 20 20 10 + vertex 20 0 10 + endloop + endfacet + facet normal 1 -0 0 + outer loop + vertex 30 0 10 + vertex 30 30 0 + vertex 30 30 10 + endloop + endfacet + facet normal 1 0 0 + outer loop + vertex 30 30 0 + vertex 30 0 10 + vertex 30 0 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 0 0 0 + vertex 30 30 0 + vertex 30 0 0 + endloop + endfacet + facet normal -0 0 -1 + outer loop + vertex 30 30 0 + vertex 0 0 0 + vertex 0 30 0 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 0 0 5 + vertex 0 0 0 + vertex 20 0 5 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 20 0 5 + vertex 30 0 10 + vertex 20 0 10 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 20 0 5 + vertex 30 0 0 + vertex 30 0 10 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 30 0 0 + vertex 20 0 5 + vertex 0 0 0 + endloop + endfacet + facet normal 0 1 -0 + outer loop + vertex 30 30 0 + vertex 0 30 10 + vertex 30 30 10 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex 0 30 10 + vertex 30 30 0 + vertex 0 30 0 + endloop + endfacet + facet normal -1 0 0 + outer loop + vertex 20 0 5 + vertex 20 20 10 + vertex 20 20 5 + endloop + endfacet + facet normal -1 -0 0 + outer loop + vertex 20 20 10 + vertex 20 0 5 + vertex 20 0 10 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 0 20 5 + vertex 20 0 5 + vertex 20 20 5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 20 0 5 + vertex 0 20 5 + vertex 0 0 5 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 0 20 5 + vertex 20 20 10 + vertex 0 20 10 + endloop + endfacet + facet normal 0 -1 -0 + outer loop + vertex 20 20 10 + vertex 0 20 5 + vertex 20 20 5 + endloop + endfacet +endsolid OpenSCAD_Model diff --git a/src/test/inputs/test_denseinfill/25mm_notch.stl b/src/test/inputs/test_denseinfill/25mm_notch.stl new file mode 100644 index 000000000..bf97335d6 --- /dev/null +++ b/src/test/inputs/test_denseinfill/25mm_notch.stl @@ -0,0 +1,170 @@ +solid OpenSCAD_Model + facet normal -1 0 0 + outer loop + vertex 0 30 0 + vertex 0 25 5 + vertex 0 30 10 + endloop + endfacet + facet normal -1 0 0 + outer loop + vertex 0 0 0 + vertex 0 25 5 + vertex 0 30 0 + endloop + endfacet + facet normal -1 -0 0 + outer loop + vertex 0 25 5 + vertex 0 0 0 + vertex 0 0 5 + endloop + endfacet + facet normal -1 -0 0 + outer loop + vertex 0 30 10 + vertex 0 25 5 + vertex 0 25 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 30 30 10 + vertex 25 25 10 + vertex 30 0 10 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 0 30 10 + vertex 25 25 10 + vertex 30 30 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 25 25 10 + vertex 0 30 10 + vertex 0 25 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 30 0 10 + vertex 25 25 10 + vertex 25 0 10 + endloop + endfacet + facet normal 1 -0 0 + outer loop + vertex 30 0 10 + vertex 30 30 0 + vertex 30 30 10 + endloop + endfacet + facet normal 1 0 0 + outer loop + vertex 30 30 0 + vertex 30 0 10 + vertex 30 0 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 0 0 0 + vertex 30 30 0 + vertex 30 0 0 + endloop + endfacet + facet normal -0 0 -1 + outer loop + vertex 30 30 0 + vertex 0 0 0 + vertex 0 30 0 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 0 0 5 + vertex 0 0 0 + vertex 25 0 5 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 25 0 5 + vertex 30 0 10 + vertex 25 0 10 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 25 0 5 + vertex 30 0 0 + vertex 30 0 10 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 30 0 0 + vertex 25 0 5 + vertex 0 0 0 + endloop + endfacet + facet normal 0 1 -0 + outer loop + vertex 30 30 0 + vertex 0 30 10 + vertex 30 30 10 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex 0 30 10 + vertex 30 30 0 + vertex 0 30 0 + endloop + endfacet + facet normal -1 0 0 + outer loop + vertex 25 0 5 + vertex 25 25 10 + vertex 25 25 5 + endloop + endfacet + facet normal -1 -0 0 + outer loop + vertex 25 25 10 + vertex 25 0 5 + vertex 25 0 10 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 0 25 5 + vertex 25 25 10 + vertex 0 25 10 + endloop + endfacet + facet normal 0 -1 -0 + outer loop + vertex 25 25 10 + vertex 0 25 5 + vertex 25 25 5 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 0 25 5 + vertex 25 0 5 + vertex 25 25 5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 25 0 5 + vertex 0 25 5 + vertex 0 0 5 + endloop + endfacet +endsolid OpenSCAD_Model diff --git a/src/test/inputs/test_denseinfill/5mm_center_notch.stl b/src/test/inputs/test_denseinfill/5mm_center_notch.stl new file mode 100644 index 000000000..90d1f7306 --- /dev/null +++ b/src/test/inputs/test_denseinfill/5mm_center_notch.stl @@ -0,0 +1,198 @@ +solid OpenSCAD_Model + facet normal -1 0 0 + outer loop + vertex 0 0 0 + vertex 0 30 10 + vertex 0 30 0 + endloop + endfacet + facet normal -1 -0 0 + outer loop + vertex 0 30 10 + vertex 0 0 0 + vertex 0 0 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 18 13 10 + vertex 30 30 10 + vertex 18 18 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 30 30 10 + vertex 13 18 10 + vertex 18 18 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 13 18 10 + vertex 0 30 10 + vertex 13 13 10 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 0 30 10 + vertex 13 18 10 + vertex 30 30 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 30 30 10 + vertex 18 13 10 + vertex 30 0 10 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 13 13 10 + vertex 30 0 10 + vertex 18 13 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 13 13 10 + vertex 0 0 10 + vertex 30 0 10 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 0 0 10 + vertex 13 13 10 + vertex 0 30 10 + endloop + endfacet + facet normal 1 -0 0 + outer loop + vertex 30 0 10 + vertex 30 30 0 + vertex 30 30 10 + endloop + endfacet + facet normal 1 0 0 + outer loop + vertex 30 30 0 + vertex 30 0 10 + vertex 30 0 0 + endloop + endfacet + facet normal 0 1 -0 + outer loop + vertex 30 30 0 + vertex 0 30 10 + vertex 30 30 10 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex 0 30 10 + vertex 30 30 0 + vertex 0 30 0 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex 0 0 0 + vertex 30 30 0 + vertex 30 0 0 + endloop + endfacet + facet normal -0 0 -1 + outer loop + vertex 30 30 0 + vertex 0 0 0 + vertex 0 30 0 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 0 0 0 + vertex 30 0 10 + vertex 0 0 10 + endloop + endfacet + facet normal 0 -1 -0 + outer loop + vertex 30 0 10 + vertex 0 0 0 + vertex 30 0 0 + endloop + endfacet + facet normal 1 -0 0 + outer loop + vertex 13 13 10 + vertex 13 18 5 + vertex 13 18 10 + endloop + endfacet + facet normal 1 0 0 + outer loop + vertex 13 18 5 + vertex 13 13 10 + vertex 13 13 5 + endloop + endfacet + facet normal -1 0 0 + outer loop + vertex 18 13 5 + vertex 18 18 10 + vertex 18 18 5 + endloop + endfacet + facet normal -1 -0 0 + outer loop + vertex 18 18 10 + vertex 18 13 5 + vertex 18 13 10 + endloop + endfacet + facet normal -0 0 1 + outer loop + vertex 13 18 5 + vertex 18 13 5 + vertex 18 18 5 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex 18 13 5 + vertex 13 18 5 + vertex 13 13 5 + endloop + endfacet + facet normal 0 1 -0 + outer loop + vertex 18 13 5 + vertex 13 13 10 + vertex 18 13 10 + endloop + endfacet + facet normal 0 1 0 + outer loop + vertex 13 13 10 + vertex 18 13 5 + vertex 13 13 5 + endloop + endfacet + facet normal 0 -1 0 + outer loop + vertex 13 18 5 + vertex 18 18 10 + vertex 13 18 10 + endloop + endfacet + facet normal 0 -1 -0 + outer loop + vertex 18 18 10 + vertex 13 18 5 + vertex 18 18 5 + endloop + endfacet +endsolid OpenSCAD_Model