iGoX/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-09-12 05:38:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Partial arrange starts to work again.

Browse Source
This commit is contained in:
tamasmeszaros
2019-07-02 15:24:40 +02:00
parent 914bf63228
commit 87c5e9bbaa
4 changed files with 123 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libnest2d/include/libnest2d/geometry_traits.hpp
+24 -2
View File
@@ -875,6 +875,28 @@ inline _Box<TPoint<S>> boundingBox(const S& sh)
return boundingBox(sh, Tag<S>() );
}
template<class P> _Box<P> boundingBox(const _Box<P>& bb1, const _Box<P>& bb2 )
{
auto& pminc = bb1.minCorner();
auto& pmaxc = bb1.maxCorner();
auto& iminc = bb2.minCorner();
auto& imaxc = bb2.maxCorner();
P minc, maxc;
setX(minc, std::min(getX(pminc), getX(iminc)));
setY(minc, std::min(getY(pminc), getY(iminc)));
setX(maxc, std::max(getX(pmaxc), getX(imaxc)));
setY(maxc, std::max(getY(pmaxc), getY(imaxc)));
return _Box<P>(minc, maxc);
}
template<class S1, class S2>
_Box<TPoint<S1>> boundingBox(const S1 &s1, const S2 &s2)
{
return boundingBox(boundingBox(s1), boundingBox(s2));
}
template<class Box>
inline double area(const Box& box, const BoxTag& )
{
@@ -1060,8 +1082,8 @@ template<class TB, class TC>
inline bool isInside(const TB& box, const TC& circ,
const BoxTag&, const CircleTag&)
{
return isInside(box.minCorner(), circ, BoxTag(), CircleTag()) &&
isInside(box.maxCorner(), circ, BoxTag(), CircleTag());
return isInside(box.minCorner(), circ, PointTag(), CircleTag()) &&
isInside(box.maxCorner(), circ, PointTag(), CircleTag());
}
template<class TBGuest, class TBHost>