variablelab/ofxVariableLab
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add lineHeight

Browse source
This commit is contained in:
jrkb 2023-05-03 14:58:16 +02:00
parent dfe0f4872b
commit e1746e5ab6
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/GPUFontAtlasLayerCombo.cpp
View file

@ -208,7 +208,8 @@ void GPUFontAtlasLayerCombo::draw(int width, int height){
font->collectBoundingBoxes(layer->getVariationText(), font->collectBoundingBoxes(layer->getVariationText(),
layer->getVariationTextAppearance(), layer->getVariationTextAppearance(),
bb, bbs, advanceY, bb, bbs, advanceY,
true, layer->getProps().fontSize_px); true, layer->getProps().fontSize_px,
layer->getProps().lineHeight);
glm::vec4 transformOrigin; glm::vec4 transformOrigin;
getAndApplyTransformOrigin(transformOrigin, getAndApplyTransformOrigin(transformOrigin,
layer->getOuterNode(), layer->getOuterNode(),

1
src/Layer.h
View file

@ -32,6 +32,7 @@ class Layer {
float rotation = 0; float rotation = 0;
float fontSize_px = 42; float fontSize_px = 42;
float letterSpacing = 0; float letterSpacing = 0;
float lineHeight = 1;
std::array <float, 4> color = {0, 0, 0, 1}; std::array <float, 4> color = {0, 0, 0, 1};
bool mirror_x = false; bool mirror_x = false;
float mirror_x_distance = 0; float mirror_x_distance = 0;