3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-01 21:21:10 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Reverted some now unnecessary changes. Reverted the infill to the original perl implementation.

Browse source
This commit is contained in:
bubnikv 2016-09-12 13:26:17 +02:00
parent 9fcc8fe9ae
commit 9a83d4e8d5
12 changed files with 850 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

13
xs/Build.PL
View file

@ -40,15 +40,10 @@ if (defined $ENV{BOOST_INCLUDEDIR}) {
push @boost_include, $ENV{BOOST_DIR};
}
} else {
push @boost_include, grep { -d $_ }
qw(/opt/local/include /usr/local/include /opt/include),
qw(/usr/include C:\Boost\include);
push @boost_libs, grep { -d $_ }
qw(/opt/local/lib /usr/local/lib /opt/lib /usr/lib),
qw(C:\Boost\lib /lib);
if ($^O eq 'MSWin32') {
for my $path (glob('C:\dev\boost*'), glob ('C:\boost*'), glob ('d:\src\boost*')) {
# Boost library was not defined by the environment.
# Try to guess at some default paths.
if ($mswin) {
for my $path (glob('C:\dev\boost*\include'), glob ('C:\boost*\include')) {
push @boost_include, $path;
}
if (! @boost_include) {

8
xs/src/libslic3r/Fill/FillRectilinear2.cpp
View file

@ -17,7 +17,7 @@
#include "SVG.hpp"
#endif
#if defined(SLIC3R_DEBUG) and defined(_WIN32)
#if defined(SLIC3R_DEBUG) && defined(_WIN32)
#include <Windows.h>
#pragma comment(lib, "user32.lib")
static inline void assert_fail(const char *assertion, const char *file, unsigned line, const char *function)
@ -376,7 +376,7 @@ static inline int intersection_on_prev_vertical_line(
return intersection_on_prev_next_vertical_line(poly_with_offset, segs, iVerticalLine, iInnerContour, iIntersection, false);
}
static inline intersection_on_next_vertical_line(
static inline int intersection_on_next_vertical_line(
const ExPolygonWithOffset &poly_with_offset,
const std::vector<SegmentedIntersectionLine> &segs,
size_t iVerticalLine,
@ -415,7 +415,7 @@ static inline int intersection_unused_on_prev_next_vertical_line(
return iIntersectionOther;
}
static inline intersection_unused_on_prev_vertical_line(
static inline int intersection_unused_on_prev_vertical_line(
const ExPolygonWithOffset &poly_with_offset,
const std::vector<SegmentedIntersectionLine> &segs,
size_t iVerticalLine,
@ -425,7 +425,7 @@ static inline intersection_unused_on_prev_vertical_line(
return intersection_unused_on_prev_next_vertical_line(poly_with_offset, segs, iVerticalLine, iInnerContour, iIntersection, false);
}
static inline intersection_unused_on_next_vertical_line(
static inline int intersection_unused_on_next_vertical_line(
const ExPolygonWithOffset &poly_with_offset,
const std::vector<SegmentedIntersectionLine> &segs,
size_t iVerticalLine,