mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 16:57:53 -06:00
Merge branch 'master' into tm_colldetection_upgr
This commit is contained in:
commit
05861dcacd
18 changed files with 163 additions and 89 deletions
|
@ -1204,8 +1204,8 @@ bool SLASupportTree::generate(const PointSet &points,
|
|||
// there is no need to bridge them together.
|
||||
if(pillar_dist > 2*cfg.head_back_radius_mm &&
|
||||
bridge_distance < cfg.max_bridge_length_mm)
|
||||
while(sj(Z) > pillar.endpoint(Z) &&
|
||||
ej(Z) > nextpillar.endpoint(Z))
|
||||
while(sj(Z) > pillar.endpoint(Z) + cfg.base_radius_mm &&
|
||||
ej(Z) > nextpillar.endpoint(Z) + + cfg.base_radius_mm)
|
||||
{
|
||||
if(chkd >= bridge_distance) {
|
||||
result.add_bridge(sj, ej, pillar.r);
|
||||
|
@ -1702,7 +1702,7 @@ SlicedSupports SLASupportTree::slice(float layerh, float init_layerh) const
|
|||
const Pad& pad = m_impl->pad();
|
||||
if(!pad.empty()) gndlvl -= float(get_pad_elevation(pad.cfg));
|
||||
|
||||
std::vector<float> heights = {gndlvl};
|
||||
std::vector<float> heights;
|
||||
heights.reserve(size_t(modelh/layerh) + 1);
|
||||
|
||||
for(float h = gndlvl + init_layerh; h < gndlvl + modelh; h += layerh) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue