Move billboard state into LabelDrawableSettings
This commit is contained in:
@@ -68,8 +68,8 @@ namespace OpenVulkano::Scene
|
||||
}
|
||||
}
|
||||
|
||||
LabelDrawable::LabelDrawable(const std::shared_ptr<AtlasData>& atlasData, const LabelDrawableSettings& settings, const bool isBillboard)
|
||||
: Drawable(DrawEncoder::GetDrawEncoder<LabelDrawable>(), DrawPhase::MAIN), m_atlasData(atlasData), m_isBillboard(isBillboard)
|
||||
LabelDrawable::LabelDrawable(const std::shared_ptr<AtlasData>& atlasData, const LabelDrawableSettings& settings)
|
||||
: Drawable(DrawEncoder::GetDrawEncoder<LabelDrawable>(), DrawPhase::MAIN), m_atlasData(atlasData)
|
||||
{
|
||||
if (atlasData->glyphs.empty() || !atlasData->texture.size)
|
||||
{
|
||||
@@ -99,7 +99,7 @@ namespace OpenVulkano::Scene
|
||||
textDrawable.GetConfig().backgroundColor.a = 0; // do not render glyph's background
|
||||
double lineHeight = m_atlasData->meta.lineHeight;
|
||||
textDrawable.GenerateText(text, m_position);
|
||||
textDrawable.SetShader(GetTextShader(m_atlasData->meta.atlasType, m_isBillboard));
|
||||
textDrawable.SetShader(GetTextShader(m_atlasData->meta.atlasType, IsBillboard()));
|
||||
m_bbox.Grow(textDrawable.GetBoundingBox());
|
||||
// update position for next text entry
|
||||
m_position.y = m_bbox.GetMin().y - lineHeight;
|
||||
|
||||
Reference in New Issue
Block a user