tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Use new 'SymbolTextAndIcon' program to draw icons in text

Browse Source
This commit is contained in:
Alexander Shalamov
2019-11-14 16:58:25 +02:00
parent 2c49c4374c
commit 26bf566f53
45 changed files with 1276 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/mbgl/programs/symbol_program.cpp
View File

@@ -156,6 +156,33 @@ SymbolSDFProgram<Name, PaintProperties>::layoutUniformValues(const bool isText,
);
}
SymbolTextAndIconProgram::LayoutUniformValues SymbolTextAndIconProgram::layoutUniformValues(
const bool hasVariablePacement,
const style::SymbolPropertyValues& values,
const Size& texsize,
const Size& texsize_icon,
const std::array<float, 2>& pixelsToGLUnits,
const float pixelRatio,
const bool alongLine,
const RenderTile& tile,
const TransformState& state,
const float symbolFadeChange,
const SymbolSDFPart part) {
return SymbolTextAndIconProgram::LayoutUniformValues(
SymbolSDFProgram<SymbolSDFTextProgram, style::TextPaintProperties>::layoutUniformValues(true,
hasVariablePacement,
values,
texsize,
pixelsToGLUnits,
pixelRatio,
alongLine,
tile,
state,
symbolFadeChange,
part)
.concat(gfx::UniformValues<SymbolTextAndIconProgramUniforms>(uniforms::texsize::Value(texsize_icon))));
}
template class SymbolSDFProgram<SymbolSDFIconProgram, style::IconPaintProperties>;
template class SymbolSDFProgram<SymbolSDFTextProgram, style::TextPaintProperties>;