Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-07 01:02:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix _spaceWidth, update docs to note only png supported, possible fix for text scrambling

Browse source
This commit is contained in:
HifiExperiments 2024-06-04 20:30:38 -07:00
parent 9c3b0b8e4f
commit 62bfab962d
4 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/EntityItemProperties.cpp
View file

@ -1328,7 +1328,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* @property {boolean} unlit=false - <code>true</code> if the entity is unaffected by lighting, <code>false</code> if it is lit
* by the key light and local lights.
* @property {string} font="" - The font to render the text with. It can be one of the following: <code>"Courier"</code>,
* <code>"Inconsolata"</code>, <code>"Roboto"</code>, <code>"Timeless"</code>, or a path to an MTSDF .arfont file generated
* <code>"Inconsolata"</code>, <code>"Roboto"</code>, <code>"Timeless"</code>, or a path to a PNG MTSDF .arfont file generated
* by the msdf-atlas-gen tool (https://github.com/Chlumsky/msdf-atlas-gen).
* @property {Entities.TextEffect} textEffect="none" - The effect that is applied to the text.
* @property {Color} textEffectColor=255,255,255 - The color of the effect.

35
libraries/render-utils/src/text/Font.cpp
View file

@ -131,7 +131,7 @@ void Font::read(QIODevice& in) {
_distanceRange = glm::vec2(arteryFont.variants[0].metrics.distanceRange);
_fontSize = arteryFont.variants[0].metrics.ascender + fabs(arteryFont.variants[0].metrics.descender);
_leading = arteryFont.variants[0].metrics.lineHeight;
_spaceWidth = 0.5f * arteryFont.variants[0].metrics.emSize;
_spaceWidth = 0.5f * arteryFont.variants[0].metrics.emSize; // We use half the emSize as a first guess for _spaceWidth
if (arteryFont.variants[0].glyphs.length() == 0) {
qDebug() << "Font" << _family << "has 0 glyphs.";
@ -151,6 +151,11 @@ void Font::read(QIODevice& in) {
glyph.size = glm::vec2(g.planeBounds.r, g.planeBounds.t) - glyph.offset;
glyph.d = g.advance.h;
glyphs.push_back(glyph);
// If we find the space character, we save its size in _spaceWidth for later
if (glyph.c == ' ') {
_spaceWidth = glyph.d;
}
}
if (arteryFont.images.length() == 0) {
@ -163,8 +168,8 @@ void Font::read(QIODevice& in) {
return;
}
if (arteryFont.images[0].encoding != artery_font::ImageEncoding::IMAGE_PNG && arteryFont.images[0].encoding != artery_font::ImageEncoding::IMAGE_BMP) {
qDebug() << "Font" << _family << "has the wrong encoding. Expected BMP (4) or PNG (8), got" << arteryFont.images[0].encoding;
if (arteryFont.images[0].encoding != artery_font::ImageEncoding::IMAGE_PNG) {
qDebug() << "Font" << _family << "has the wrong encoding. Expected PNG (8), got" << arteryFont.images[0].encoding;
return;
}
@ -180,20 +185,8 @@ void Font::read(QIODevice& in) {
// read image data
QImage image;
QString format;
switch (arteryFont.images[0].encoding) {
case artery_font::ImageEncoding::IMAGE_PNG:
format = "PNG";
break;
case artery_font::ImageEncoding::IMAGE_BMP:
format = "BMP";
break;
default:
format = "PNG";
break;
}
if (!image.loadFromData((const unsigned char*)arteryFont.images[0].data, arteryFont.images[0].data.length(), format.toStdString().c_str())) {
qDebug() << "Failed to read" << format << "image for font" << _family;
if (!image.loadFromData((const unsigned char*)arteryFont.images[0].data, arteryFont.images[0].data.length(), "PNG")) {
qDebug() << "Failed to read image for font" << _family;
return;
}
@ -229,6 +222,7 @@ void Font::read(QIODevice& in) {
_texture->setImportant(true);
_loaded = true;
_needsParamsUpdate = true;
}
static QHash<QString, Font::Pointer> LOADED_FONTS;
@ -541,8 +535,9 @@ void Font::drawString(gpu::Batch& batch, Font::DrawInfo& drawInfo, const QString
setupGPU();
if (!drawInfo.paramsBuffer || boundsChanged || drawInfo.params.color != color || drawInfo.params.effectColor != effectColor ||
drawInfo.params.effectThickness != effectThickness || drawInfo.params.effect != textEffect) {
if (!drawInfo.paramsBuffer || boundsChanged || _needsParamsUpdate || drawInfo.params.color != color ||
drawInfo.params.effectColor != effectColor || drawInfo.params.effectThickness != effectThickness ||
drawInfo.params.effect != textEffect) {
drawInfo.params.color = color;
drawInfo.params.effectColor = effectColor;
drawInfo.params.effectThickness = effectThickness;
@ -560,6 +555,8 @@ void Font::drawString(gpu::Batch& batch, Font::DrawInfo& drawInfo, const QString
drawInfo.paramsBuffer = std::make_shared<gpu::Buffer>(sizeof(DrawParams), nullptr);
}
drawInfo.paramsBuffer->setSubData(0, sizeof(DrawParams), (const gpu::Byte*)&gpuDrawParams);
_needsParamsUpdate = false;
}
batch.setPipeline(_pipelines[std::make_tuple(color.a < 1.0f, unlit, forward)]);

1
libraries/render-utils/src/text/Font.h
View file

@ -102,6 +102,7 @@ private:
TextAlignment _alignment { TextAlignment::LEFT };
bool _loaded { false };
bool _needsParamsUpdate { false };
gpu::TexturePointer _texture;
gpu::BufferStreamPointer _stream;

2
scripts/system/create/assets/data/createAppTooltips.json
View file

@ -27,7 +27,7 @@
"tooltip": "The height of each line of text. This determines the size of the text."
},
"font": {
"tooltip": "The font to render the text. Supported values: \"Courier\", \"Inconsolata\", \"Roboto\", \"Timeless\", or a URL to a MTSDF .arfont file."
"tooltip": "The font to render the text. Supported values: \"Courier\", \"Inconsolata\", \"Roboto\", \"Timeless\", or a URL to a PNG MTSDF .arfont file."
},
"textEffect": {
"tooltip": "The effect that is applied to the text."