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

Fix bugs and non working tests

Browse source 
Fix failing tests


Try to fix build on windows


Try to fix failng tests on Mac
This commit is contained in:
tamasmeszaros 2020-06-18 13:49:35 +02:00
parent 184f64f828
commit 301a168b89
7 changed files with 132 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/libslic3r/SLA/SupportTreeBuilder.hpp
View file

@ -91,12 +91,7 @@ struct Head {
const Vec3d &direction = DOWN, // direction (normal to the dull end)
const Vec3d &offset = {0, 0, 0} // displacement
);
void transform()
{
// TODO: remove occurences
}
inline double real_width() const
{
return 2 * r_pin_mm + width_mm + 2 * r_back_mm ;
@ -119,13 +114,6 @@ struct Head {
}
};
struct Join {
enum Types {
jtPillarBrigde, jtHeadPillar, jtPillarPedestal, jtBridgePedestal,
jtPillarAnchor, jtBridgeAnchor
};
};
// A junction connecting bridges and pillars
struct Junction {
double r = 1;
@ -136,7 +124,6 @@ struct Junction {
Junction(const Vec3d &tr, double r_mm) : r(r_mm), pos(tr) {}
};
struct Pillar {
double height, r;
Vec3d endpt;
@ -162,18 +149,16 @@ struct Pillar {
}
const Vec3d& endpoint() const { return endpt; }
// Pillar& add_base(double baseheight = 3, double radius = 2);
};
// A base for pillars or bridges that end on the ground
struct Pedestal {
Vec3d pos;
double height, radius;
double height, r_bottom, r_top;
long id = ID_UNSET;
Pedestal(const Vec3d &p, double h = 3., double r = 2.)
: pos{p}, height{h}, radius{r}
Pedestal(const Vec3d &p, double h, double rbottom, double rtop)
: pos{p}, height{h}, r_bottom{rbottom}, r_top{rtop}
{}
};
@ -301,15 +286,7 @@ public:
return pillar.id;
}
void add_pillar_base(long pid, double baseheight = 3, double radius = 2)
{
std::lock_guard<Mutex> lk(m_mutex);
assert(pid >= 0 && size_t(pid) < m_pillars.size());
m_pedestals.emplace_back(m_pillars[size_t(pid)].endpt, baseheight, radius);
m_pedestals.back().id = m_pedestals.size() - 1;
m_meshcache_valid = false;
// m_pillars[size_t(pid)].add_base(baseheight, radius);
}
void add_pillar_base(long pid, double baseheight = 3, double radius = 2);
template<class...Args> const Anchor& add_anchor(Args&&...args)
{