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

Tryfix for Mac build...

Browse source
This commit is contained in:
tamasmeszaros 2018-07-03 15:15:53 +02:00
parent 16ec625483
commit b4666e8174
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
xs/src/libnest2d/libnest2d/clipper_backend/clipper_backend.hpp
View file

@ -12,12 +12,10 @@
#include <clipper.hpp> #include <clipper.hpp>
namespace libnest2d { namespace ClipperLib {
using PointImpl = IntPoint;
// Aliases for convinience using PolygonImpl = PolyNode;
using PointImpl = ClipperLib::IntPoint; using PathImpl = Path;
using PolygonImpl = ClipperLib::PolyNode;
using PathImpl = ClipperLib::Path;
inline PointImpl& operator +=(PointImpl& p, const PointImpl& pa ) { inline PointImpl& operator +=(PointImpl& p, const PointImpl& pa ) {
// This could be done with SIMD // This could be done with SIMD
@ -50,6 +48,14 @@ inline PointImpl operator-(const PointImpl& p1, const PointImpl& p2) {
ret -= p2; ret -= p2;
return ret; return ret;
} }
}
namespace libnest2d {
// Aliases for convinience
using PointImpl = ClipperLib::IntPoint;
using PolygonImpl = ClipperLib::PolyNode;
using PathImpl = ClipperLib::Path;
//extern HoleCache holeCache; //extern HoleCache holeCache;

3
xs/src/libnest2d/libnest2d/geometry_traits.hpp
View file

@ -7,6 +7,7 @@
#include <vector> #include <vector>
#include <numeric> #include <numeric>
#include <limits> #include <limits>
#include <cmath>
#include "common.hpp" #include "common.hpp"
@ -260,7 +261,7 @@ void setY(RawPoint& p, const TCoord<RawPoint>& val)
template<class RawPoint> template<class RawPoint>
inline Radians _Segment<RawPoint>::angleToXaxis() const inline Radians _Segment<RawPoint>::angleToXaxis() const
{ {
if(std::isnan(angletox_)) { if(std::isnan(static_cast<double>(angletox_))) {
TCoord<RawPoint> dx = getX(second()) - getX(first()); TCoord<RawPoint> dx = getX(second()) - getX(first());
TCoord<RawPoint> dy = getY(second()) - getY(first()); TCoord<RawPoint> dy = getY(second()) - getY(first());