FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use helper method for OSGText alignment

Browse Source
This commit is contained in:
Richard Harrison
2022-03-10 20:13:25 +01:00
parent 92c4ea9f45
commit 30736ea057
1 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/SGText.cxx
+4 -31
View File
@@ -36,6 +36,7 @@
#include <simgear/scene/material/EffectGeode.hxx> #include <simgear/scene/material/EffectGeode.hxx>
#include <simgear/scene/util/SGReaderWriterOptions.hxx> #include <simgear/scene/util/SGReaderWriterOptions.hxx>
#include <simgear/debug/ErrorReportingCallback.hxx> #include <simgear/debug/ErrorReportingCallback.hxx>
#include <simgear/structure/OSGUtils.hxx>
using std::string; using std::string;
@@ -113,7 +114,7 @@ osg::Node * SGText::appendText(const SGPropertyNode* configNode,
} else { } else {
simgear::reportFailure(simgear::LoadFailure::NotFound, simgear::reportFailure(simgear::LoadFailure::NotFound,
simgear::ErrorCode::LoadingTexture, simgear::ErrorCode::LoadingTexture,
"SGText: couldn;t find font:" + requestedFont); "SGText: couldn't find font:" + requestedFont);
} }
text->setCharacterSize(configNode->getDoubleValue("character-size", 1.0 ), text->setCharacterSize(configNode->getDoubleValue("character-size", 1.0 ),
@@ -169,36 +170,8 @@ osg::Node * SGText::appendText(const SGPropertyNode* configNode,
text->setDrawMode( drawMode ); text->setDrawMode( drawMode );
if( (p = configNode->getNode( "alignment" )) != NULL ) { if( (p = configNode->getNode( "alignment" )) != NULL ) {
string alignment = p->getStringValue();
if( alignment.compare( "left-top" ) == 0 ) { text->setAlignment(simgear::osgutils::mapAlignment(p->getStringValue()));
text->setAlignment( osgText::Text::LEFT_TOP );
} else if( alignment.compare( "left-center" ) == 0 ) {
text->setAlignment( osgText::Text::LEFT_CENTER );
} else if( alignment.compare( "left-bottom" ) == 0 ) {
text->setAlignment( osgText::Text::LEFT_BOTTOM );
} else if( alignment.compare( "center-top" ) == 0 ) {
text->setAlignment( osgText::Text::CENTER_TOP );
} else if( alignment.compare( "center-center" ) == 0 ) {
text->setAlignment( osgText::Text::CENTER_CENTER );
} else if( alignment.compare( "center-bottom" ) == 0 ) {
text->setAlignment( osgText::Text::CENTER_BOTTOM );
} else if( alignment.compare( "right-top" ) == 0 ) {
text->setAlignment( osgText::Text::RIGHT_TOP );
} else if( alignment.compare( "right-center" ) == 0 ) {
text->setAlignment( osgText::Text::RIGHT_CENTER );
} else if( alignment.compare( "right-bottom" ) == 0 ) {
text->setAlignment( osgText::Text::RIGHT_BOTTOM );
} else if( alignment.compare( "left-baseline" ) == 0 ) {
text->setAlignment( osgText::Text::LEFT_BASE_LINE );
} else if( alignment.compare( "center-baseline" ) == 0 ) {
text->setAlignment( osgText::Text::CENTER_BASE_LINE );
} else if( alignment.compare( "right-baseline" ) == 0 ) {
text->setAlignment( osgText::Text::RIGHT_BASE_LINE );
} else if( alignment.compare( "baseline" ) == 0 ) {
text->setAlignment( osgText::Text::BASE_LINE );
} else {
SG_LOG(SG_GENERAL, SG_ALERT, "ignoring unknown text-alignment '" << alignment <<"'." );
}
} }
if( (p = configNode->getNode( "layout" )) != NULL ) { if( (p = configNode->getNode( "layout" )) != NULL ) {