3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 17:27:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix for msvc build.

Browse source
This commit is contained in:
tamasmeszaros 2019-07-17 14:34:28 +02:00
parent 2728f41123
commit c74e6513d9
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libslic3r/Arrange.cpp
View file

@ -108,7 +108,7 @@ double fixed_overfit(const std::tuple<double, Box>& result, const Box &binbb)
double score = std::get<0>(result); double score = std::get<0>(result);
Box pilebb = std::get<1>(result); Box pilebb = std::get<1>(result);
Box fullbb = sl::boundingBox(pilebb, binbb); Box fullbb = sl::boundingBox(pilebb, binbb);
double diff = fullbb.area() - binbb.area(); auto diff = double(fullbb.area()) - binbb.area();
if(diff > 0) score += diff; if(diff > 0) score += diff;
return score; return score;
@ -138,6 +138,11 @@ protected:
Box m_pilebb; // The bounding box of the merged pile. Box m_pilebb; // The bounding box of the merged pile.
ItemGroup m_remaining; // Remaining items (m_items at the beginning) ItemGroup m_remaining; // Remaining items (m_items at the beginning)
ItemGroup m_items; // The items to be packed ItemGroup m_items; // The items to be packed
template<class T, class = ArithmeticOnly<T>> double norm(T val)
{
return double(val) / m_norm;
}
// This is "the" object function which is evaluated many times for each // This is "the" object function which is evaluated many times for each
// vertex (decimated with the accuracy parameter) of each object. // vertex (decimated with the accuracy parameter) of each object.
@ -178,9 +183,6 @@ protected:
// Density is the pack density: how big is the arranged pile // Density is the pack density: how big is the arranged pile
double density = 0; double density = 0;
const double N = m_norm;
auto norm = [N](double val) { return val / N; };
// Distinction of cases for the arrangement scene // Distinction of cases for the arrangement scene
enum e_cases { enum e_cases {
// This branch is for big items in a mixed (big and small) scene // This branch is for big items in a mixed (big and small) scene
@ -593,7 +595,7 @@ void arrange(ArrangePolygons & arrangables,
for (const ArrangePolygon &fixed: excludes) for (const ArrangePolygon &fixed: excludes)
process_arrangeable(fixed, fixeditems); process_arrangeable(fixed, fixeditems);
for (Item &itm : fixeditems) itm.inflate(-2 * SCALED_EPSILON); for (Item &itm : fixeditems) itm.inflate(scaled(-2. * EPSILON));
// Integer ceiling the min distance from the bed perimeters // Integer ceiling the min distance from the bed perimeters
coord_t md = min_obj_dist - 2 * scaled(0.1 + EPSILON); coord_t md = min_obj_dist - 2 * scaled(0.1 + EPSILON);

5
src/libslic3r/MTUtils.hpp
View file

@ -281,9 +281,8 @@ using EigenVec = Eigen::Matrix<T, N, 1, Eigen::DontAlign>;
// Conversion definition from unscaled to floating point scaled // Conversion definition from unscaled to floating point scaled
template<class Tout, template<class Tout,
class Tin, class Tin,
class = FloatingOnly<Tin>, class = FloatingOnly<Tin>>
class = FloatingOnly<Tout>> inline SLIC3R_CONSTEXPR FloatingOnly<Tout> scaled(const Tin &v) SLIC3R_NOEXCEPT
inline SLIC3R_CONSTEXPR Tout scaled(const Tin &v) SLIC3R_NOEXCEPT
{ {
return Tout(v / Tin(SCALING_FACTOR)); return Tout(v / Tin(SCALING_FACTOR));
} }