iGoX/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-09-10 04:42:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change to firstfit selection because DJD needs further testing.

Browse Source
This commit is contained in:
tamasmeszaros
2018-07-16 16:07:29 +02:00
parent eefa1678db
commit 6bcd735655
31 changed files with 4317 additions and 826 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xs/src/libnest2d/libnest2d/clipper_backend/clipper_backend.cpp
+40 -94
View File
@@ -1,112 +1,58 @@
#include "clipper_backend.hpp"
#include <atomic>
//#include "clipper_backend.hpp"
//#include <atomic>
namespace libnest2d {
//namespace libnest2d {
namespace {
//namespace {
class SpinLock {
std::atomic_flag& lck_;
public:
//class SpinLock {
// std::atomic_flag& lck_;
//public:
inline SpinLock(std::atomic_flag& flg): lck_(flg) {}
// inline SpinLock(std::atomic_flag& flg): lck_(flg) {}
inline void lock() {
while(lck_.test_and_set(std::memory_order_acquire)) {}
}
// inline void lock() {
// while(lck_.test_and_set(std::memory_order_acquire)) {}
// }
inline void unlock() { lck_.clear(std::memory_order_release); }
};
// inline void unlock() { lck_.clear(std::memory_order_release); }
//};
class HoleCache {
friend struct libnest2d::ShapeLike;
//class HoleCache {
// friend struct libnest2d::ShapeLike;
std::unordered_map< const PolygonImpl*, ClipperLib::Paths> map;
// std::unordered_map< const PolygonImpl*, ClipperLib::Paths> map;
ClipperLib::Paths& _getHoles(const PolygonImpl* p) {
static std::atomic_flag flg = ATOMIC_FLAG_INIT;
SpinLock lock(flg);
// ClipperLib::Paths& _getHoles(const PolygonImpl* p) {
// static std::atomic_flag flg = ATOMIC_FLAG_INIT;
// SpinLock lock(flg);
lock.lock();
ClipperLib::Paths& paths = map[p];
lock.unlock();
// lock.lock();
// ClipperLib::Paths& paths = map[p];
// lock.unlock();
if(paths.size() != p->Childs.size()) {
paths.reserve(p->Childs.size());
// if(paths.size() != p->Childs.size()) {
// paths.reserve(p->Childs.size());
for(auto np : p->Childs) {
paths.emplace_back(np->Contour);
}
}
// for(auto np : p->Childs) {
// paths.emplace_back(np->Contour);
// }
// }
return paths;
}
// return paths;
// }
ClipperLib::Paths& getHoles(PolygonImpl& p) {
return _getHoles(&p);
}
// ClipperLib::Paths& getHoles(PolygonImpl& p) {
// return _getHoles(&p);
// }
const ClipperLib::Paths& getHoles(const PolygonImpl& p) {
return _getHoles(&p);
}
};
}
// const ClipperLib::Paths& getHoles(const PolygonImpl& p) {
// return _getHoles(&p);
// }
//};
//}
HoleCache holeCache;
//HoleCache holeCache;
template<>
std::string ShapeLike::toString(const PolygonImpl& sh)
{
std::stringstream ss;
for(auto p : sh.Contour) {
ss << p.X << " " << p.Y << "\n";
}
return ss.str();
}
template<> PolygonImpl ShapeLike::create( const PathImpl& path )
{
PolygonImpl p;
p.Contour = path;
// Expecting that the coordinate system Y axis is positive in upwards
// direction
if(ClipperLib::Orientation(p.Contour)) {
// Not clockwise then reverse the b*tch
ClipperLib::ReversePath(p.Contour);
}
return p;
}
template<> PolygonImpl ShapeLike::create( PathImpl&& path )
{
PolygonImpl p;
p.Contour.swap(path);
// Expecting that the coordinate system Y axis is positive in upwards
// direction
if(ClipperLib::Orientation(p.Contour)) {
// Not clockwise then reverse the b*tch
ClipperLib::ReversePath(p.Contour);
}
return p;
}
template<>
const THolesContainer<PolygonImpl>& ShapeLike::holes(
const PolygonImpl& sh)
{
return holeCache.getHoles(sh);
}
template<>
THolesContainer<PolygonImpl>& ShapeLike::holes(PolygonImpl& sh) {
return holeCache.getHoles(sh);
}
}
//}