juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-26 04:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remote/main' into dev/h2d-2

Browse Source 
# Conflicts:
#	src/libslic3r/PrintConfig.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
This commit is contained in:
Noisyfox
2025-10-19 23:11:13 +08:00
parent 9e889afb53 a754387566
commit 8e0e8ce461
35 changed files with 1852 additions and 1064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libslic3r/Support/SupportSpotsGenerator.hpp
View File

@@ -5,6 +5,7 @@
#include "Line.hpp"
#include "PrintBase.hpp"
#include "PrintConfig.hpp"
#include "MaterialType.hpp"
#include <boost/log/trivial.hpp>
#include <cstddef>
#include <vector>
@@ -64,15 +65,9 @@ struct Params
return get_support_spots_adhesion_strength() * 2.0;
}
if (filament_type == "PLA") {
return 0.02 * 1e6;
} else if (filament_type == "PET" || filament_type == "PETG") {
return 0.3 * 1e6;
} else if (filament_type == "ABS" || filament_type == "ASA") {
return 0.1 * 1e6; //TODO do measurements
} else { //PLA default value - defensive approach, PLA has quite low adhesion
return 0.02 * 1e6;
}
double yield_strength = 0.02;
MaterialType::get_yield_strength(filament_type, yield_strength);
return yield_strength * 1e6;
}
double get_support_spots_adhesion_strength() const {