3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into fs_emboss

Browse source 
# Conflicts:
#	src/slic3r/GUI/GUI_App.cpp
#	tests/libslic3r/test_indexed_triangle_set.cpp
This commit is contained in:
Filip Sykala 2021-12-01 14:35:42 +01:00
commit d698df2c31
117 changed files with 22758 additions and 9292 deletions
src/libslic3r
Emboss.cpp

2
src/libslic3r/Emboss.cpp
View file

@ -116,6 +116,7 @@ std::optional<Emboss::Glyph> Private::get_glyph(
Emboss::Glyphs & cache,
std::optional<stbtt_fontinfo> &font_info_opt)
{
const double RESOLUTION = 0.0125; // TODO: read from printer configuration
auto glyph_item = cache.find(unicode);
if (glyph_item != cache.end())
return glyph_item->second;
@ -125,7 +126,6 @@ std::optional<Emboss::Glyph> Private::get_glyph(
// can load font info?
if (!font_info_opt.has_value()) return {};
}
float flatness = static_cast<float>(
font.ascent * RESOLUTION / font_prop.size_in_mm);
std::optional<Emboss::Glyph> glyph_opt =