Overlay: TextArea - draw missing space & deprecate space_width property

OGRECave · Aug 5, 2023 · 517f74e · 517f74e
1 parent f87a07c
commit 517f74e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/Components/Overlay/src/OgreOverlayTranslator.cpp b/Components/Overlay/src/OgreOverlayTranslator.cpp
@@ -216,6 +216,9 @@ void ElementTranslator::translate(ScriptCompiler* compiler, const AbstractNodePt
                 succ = getString(prop->values.front(), &val);
             }
 
+            if(prop->name == "space_width")
+                compiler->addError(ScriptCompiler::CE_DEPRECATEDSYMBOL, prop->file, prop->line, prop->name);
+
             if(!succ || !newElement->setParameter(prop->name, val))
                 compiler->addError(ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line);
         }

diff --git a/Components/Overlay/src/OgreTextAreaOverlayElement.cpp b/Components/Overlay/src/OgreTextAreaOverlayElement.cpp
@@ -245,11 +245,6 @@ namespace Ogre {
         float left = _getDerivedLeft() * 2.0f - 1.0f;
         float top = -( (_getDerivedTop() * 2.0f ) - 1.0f );
 
-        if(!mSpaceWidth)
-        {
-            mSpaceWidth = mFont->getGlyphInfo(UNICODE_SPACE).advance * mCharHeight;
-        }
-
         // Use iterator
         auto iend = decoded.end();
         bool newLine = true;
@@ -267,7 +262,7 @@ namespace Ogre {
                     {
                         break;
                     }
-                    else if (character == UNICODE_SPACE) // space
+                    else if (character == UNICODE_SPACE && mSpaceWidth) // space
                     {
                         len += mSpaceWidth * 2.0f * mViewportAspectCoef;
                     }
@@ -310,7 +305,7 @@ namespace Ogre {
                 }
                 continue;
             }
-            else if (character == UNICODE_SPACE) // space
+            else if (character == UNICODE_SPACE && mSpaceWidth) // space
             {
                 // Just leave a gap, no tris
                 left += mSpaceWidth * 2.0f * mViewportAspectCoef;
@@ -323,6 +318,15 @@ namespace Ogre {
             Real horiz_height = glyphInfo.aspectRatio * mViewportAspectCoef ;
             const Font::UVRect& uvRect = glyphInfo.uvRect;
 
+            if(uvRect.isNull())
+            {
+                // Just leave a gap, no tris
+                left += glyphInfo.advance * mCharHeight * 2.0f * mViewportAspectCoef;
+                // Also reduce tri count
+                mRenderOp.vertexData->vertexCount -= 6;
+                continue;
+            }
+
             left += glyphInfo.bearing * mCharHeight * 2 * mViewportAspectCoef;
 
             // each vert is (x, y, z, u, v)

diff --git a/Media/packs/SdkTrays.zip b/Media/packs/SdkTrays.zip