Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-28 17:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add yet another text rendering test.

Browse Source
This commit is contained in:
Martín Lucas Golini
2026-01-24 01:01:16 -03:00
parent 409cda3ba5
commit b3748d05f2
4 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/unit_tests/assets/fontrendering/eepp-text-wrap.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

2
include/eepp/graphics/text.hpp
View File

@@ -342,6 +342,7 @@ class EE_API Text {
mutable bool mColorsNeedUpdate : 1 { false };
mutable bool mContainsColorEmoji : 1 { false };
bool mTabStops : 1 { false };
TextDirection mDirection{ TextDirection::Unspecified };
Float mCachedWidth{ 0 };
Uint32 mAlign{ TEXT_ALIGN_LEFT };
@@ -354,7 +355,6 @@ class EE_API Text {
std::vector<VertexCoords> mOutlineVertices;
std::vector<Color> mOutlineColors;
std::vector<Float> mLinesWidth;
TextDirection mDirection{ TextDirection::Unspecified };
void ensureGeometryUpdate();

4
src/eepp/graphics/text.cpp
View File

@@ -657,7 +657,7 @@ void Text::onNewString() {
mCachedWidthNeedUpdate = true;
mContainsColorEmoji = false;
mTextHints = mString.getTextHints();
if ( FontManager::instance()->getColorEmojiFont() != nullptr ) {
if ( mFontStyleConfig.Font && FontManager::instance()->getColorEmojiFont() != nullptr ) {
if ( mFontStyleConfig.Font->getType() == FontType::TTF ) {
FontTrueType* fontTrueType = static_cast<FontTrueType*>( mFontStyleConfig.Font );
if ( fontTrueType->isColorEmojiFont() || !fontTrueType->isEmojiFont() )
@@ -922,7 +922,7 @@ Float Text::getTextWidth( Font* font, const Uint32& fontSize, const StringType&
if ( TextShaperEnabled && font->getType() == FontType::TTF &&
!canSkipShaping( textDrawHints ) ) {
return TextLayout::layout( string, static_cast<FontTrueType*>( font ), fontSize, style,
tabWidth, outlineThickness, tabOffset, textDrawHints )
tabWidth, outlineThickness, tabOffset, textDrawHints, direction )
->size.getWidth();
}
#endif

58
src/tests/unit_tests/fontrendering.cpp
View File

@@ -6,6 +6,7 @@
#include <eepp/graphics/fontsprite.hpp>
#include <eepp/graphics/fonttruetype.hpp>
#include <eepp/graphics/image.hpp>
#include <eepp/graphics/primitives.hpp>
#include <eepp/graphics/renderer/renderergl.hpp>
#include <eepp/graphics/text.hpp>
#include <eepp/scene/scenemanager.hpp>
@@ -825,3 +826,60 @@ UTEST( FontRendering, UITextTest ) {
runTest();
}
}
UTEST( FontRendering, TextWrap ) {
FileSystem::changeWorkingDirectory( Sys::getProcessPath() );
std::string loremIpsum;
FileSystem::fileGet( "assets/textfiles/lorem-ipsum.uext", loremIpsum );
const auto runTest = [&]() {
UIApplication app(
WindowSettings( 512, 512, "eepp - Text Wrap", WindowStyle::Default,
WindowBackend::Default, 32, {}, 1, false, true ),
UIApplication::Settings( Sys::getProcessPath() + ".." + FileSystem::getOSSlash(), 1 ) );
FileSystem::changeWorkingDirectory( Sys::getProcessPath() );
app.getWindow()->setClearColor( RGB( 255, 255, 255 ) );
app.getWindow()->clear();
Vector2f pos{ 5, 5 };
Primitives p;
p.setColor( Color::Red );
p.drawRectangle( Rectf( pos - 1.f, { 1, 501 } ) );
p.drawRectangle( Rectf( pos - 1.f, { 501, 1 } ) );
p.drawRectangle( Rectf( { pos.x - 1.f, 500 + pos.y }, { 502, 1 } ) );
p.drawRectangle( Rectf( { 500 + pos.x, pos.y - 1.f }, { 1, 501 } ) );
Text text;
text.setFont( app.getUI()->getUIThemeManager()->getDefaultFont() );
text.setFontSize( 16 );
text.setColor( Color::Black );
text.setString( loremIpsum );
text.wrapText( 500 );
text.draw( pos.x, pos.y );
text.setAlign( TEXT_ALIGN_CENTER );
pos.y += text.getTextHeight() + 8;
text.draw( pos.x, pos.y );
pos.y += text.getTextHeight() + 8;
text.setAlign( TEXT_ALIGN_RIGHT );
text.draw( pos.x, pos.y );
compareImages( utest_state, utest_result, app.getWindow(), "eepp-text-wrap" );
};
UTEST_PRINT_STEP( "Text Shaper disabled" );
{
BoolScopedOp op( Text::TextShaperEnabled, false );
runTest();
}
UTEST_PRINT_STEP( "Text Shaper enabled" );
{
BoolScopedOp op( Text::TextShaperEnabled, true );
runTest();
UTEST_PRINT_STEP( "Text Shaper enabled w/o optimizations" );
BoolScopedOp op2( Text::TextShaperOptimizations, false );
runTest();
}
}