GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-09 03:59:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small formal fixes on the new 3d grid algorithm

Browse Source
This commit is contained in:
Lukas Matena 2019-02-18 12:47:15 +01:00
parent 5966dcb78e
commit dbfcb8b76e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libslic3r/SLA/SLAAutoSupports.cpp
View File

@ -307,7 +307,7 @@ std::vector<Vec2f> sample_expolygon_with_boundary(const ExPolygon &expoly, float
template<typename REFUSE_FUNCTION> template<typename REFUSE_FUNCTION>
static inline std::vector<Vec2f> poisson_disk_from_samples(const std::vector<Vec2f> &raw_samples, float radius, REFUSE_FUNCTION refuse_function) static inline std::vector<Vec2f> poisson_disk_from_samples(const std::vector<Vec2f> &raw_samples, float radius, REFUSE_FUNCTION refuse_function)
{ {
Vec2f corner_min(FLT_MAX, FLT_MAX); Vec2f corner_min(std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
for (const Vec2f &pt : raw_samples) { for (const Vec2f &pt : raw_samples) {
corner_min.x() = std::min(corner_min.x(), pt.x()); corner_min.x() = std::min(corner_min.x(), pt.x());
corner_min.y() = std::min(corner_min.y(), pt.y()); corner_min.y() = std::min(corner_min.y(), pt.y());
@ -342,7 +342,7 @@ static inline std::vector<Vec2f> poisson_disk_from_samples(const std::vector<Vec
}; };
struct CellIDHash { struct CellIDHash {
std::size_t operator()(const Vec2i &cell_id) { std::size_t operator()(const Vec2i &cell_id) const {
return std::hash<int>()(cell_id.x()) ^ std::hash<int>()(cell_id.y() * 593); return std::hash<int>()(cell_id.x()) ^ std::hash<int>()(cell_id.y() * 593);
} }
}; };
@ -351,9 +351,9 @@ static inline std::vector<Vec2f> poisson_disk_from_samples(const std::vector<Vec
// (We could just store the samples in hash_data. This implementation is an artifact of the reference paper, which // (We could just store the samples in hash_data. This implementation is an artifact of the reference paper, which
// is optimizing for GPU acceleration that we haven't implemented currently.) // is optimizing for GPU acceleration that we haven't implemented currently.)
typedef std::unordered_map<Vec2i, PoissonDiskGridEntry, CellIDHash> Cells; typedef std::unordered_map<Vec2i, PoissonDiskGridEntry, CellIDHash> Cells;
std::unordered_map<Vec2i, PoissonDiskGridEntry, CellIDHash> cells; Cells cells;
{ {
Cells::iterator last_cell_id_it; typename Cells::iterator last_cell_id_it;
Vec2i last_cell_id(-1, -1); Vec2i last_cell_id(-1, -1);
for (int i = 0; i < raw_samples_sorted.size(); ++ i) { for (int i = 0; i < raw_samples_sorted.size(); ++ i) {
const RawSample &sample = raw_samples_sorted[i]; const RawSample &sample = raw_samples_sorted[i];
@ -413,7 +413,7 @@ static inline std::vector<Vec2f> poisson_disk_from_samples(const std::vector<Vec
// Copy the results to the output. // Copy the results to the output.
std::vector<Vec2f> out; std::vector<Vec2f> out;
for (const auto it : cells) for (const auto& it : cells)
for (int i = 0; i < it.second.num_poisson_samples; ++ i) for (int i = 0; i < it.second.num_poisson_samples; ++ i)
out.emplace_back(it.second.poisson_samples[i]); out.emplace_back(it.second.poisson_samples[i]);
return out; return out;

2
src/libslic3r/SLA/SLAAutoSupports.hpp
View File

@ -96,7 +96,7 @@ public:
struct PointGrid3D { struct PointGrid3D {
struct GridHash { struct GridHash {
std::size_t operator()(const Vec3i &cell_id) { std::size_t operator()(const Vec3i &cell_id) const {
return std::hash<int>()(cell_id.x()) ^ std::hash<int>()(cell_id.y() * 593) ^ std::hash<int>()(cell_id.z() * 7919); return std::hash<int>()(cell_id.x()) ^ std::hash<int>()(cell_id.y() * 593) ^ std::hash<int>()(cell_id.z() * 7919);
} }
}; };