fly/flightgear
1
0
Fork 0
Code Activity

Use helper method for OSGText alignment mapAlignment

Browse source
This commit is contained in:
Richard Harrison 2022-03-10 15:06:28 +01:00
parent 4e6f9e6239
commit de41907532
1 changed files with 2 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/Cockpit/NavDisplay.cxx
View file

@ -41,6 +41,7 @@
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/misc/strutils.hxx> #include <simgear/misc/strutils.hxx>
#include <simgear/math/sg_geodesy.hxx> #include <simgear/math/sg_geodesy.hxx>
#include <simgear/structure/OSGUtils.hxx>
#include <cstdio> #include <cstdio>
#include <sstream> #include <sstream>
@ -90,37 +91,6 @@ static osg::Vec4 readColor(SGPropertyNode* colorNode, const osg::Vec4& c)
return result; return result;
} }
static osgText::Text::AlignmentType readAlignment(const std::string& t)
{
if (t == "left-top") {
return osgText::Text::LEFT_TOP;
} else if (t == "left-center") {
return osgText::Text::LEFT_CENTER;
} else if (t == "left-bottom") {
return osgText::Text::LEFT_BOTTOM;
} else if (t == "center-top") {
return osgText::Text::CENTER_TOP;
} else if (t == "center-center") {
return osgText::Text::CENTER_CENTER;
} else if (t == "center-bottom") {
return osgText::Text::CENTER_BOTTOM;
} else if (t == "right-top") {
return osgText::Text::RIGHT_TOP;
} else if (t == "right-center") {
return osgText::Text::RIGHT_CENTER;
} else if (t == "right-bottom") {
return osgText::Text::RIGHT_BOTTOM;
} else if (t == "left-baseline") {
return osgText::Text::LEFT_BASE_LINE;
} else if (t == "center-baseline") {
return osgText::Text::CENTER_BASE_LINE;
} else if (t == "right-baseline") {
return osgText::Text::RIGHT_BASE_LINE;
}
return osgText::Text::BASE_LINE;
}
static string formatPropertyValue(SGPropertyNode* nd, const string& format) static string formatPropertyValue(SGPropertyNode* nd, const string& format)
{ {
assert(nd); assert(nd);
@ -306,7 +276,7 @@ public:
hasText = false; hasText = false;
if (node->hasChild("text")) { if (node->hasChild("text")) {
hasText = true; hasText = true;
alignment = readAlignment(node->getStringValue("text-align")); alignment = simgear::osgutils::mapAlignment(node->getStringValue("text-align"));
textTemplate = node->getStringValue("text"); textTemplate = node->getStringValue("text");
textOffset.x() = node->getFloatValue("text-offset-x", 0); textOffset.x() = node->getFloatValue("text-offset-x", 0);
textOffset.y() = node->getFloatValue("text-offset-y", 0); textOffset.y() = node->getFloatValue("text-offset-y", 0);