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

canvas::Text: Make font resolution user configurable

Browse Source
This commit is contained in:
Thomas Geymayer 2013-06-16 10:49:46 +02:00
parent 02babbe340
commit ece743342a
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
simgear/canvas/elements/CanvasText.cxx
View File

@ -34,7 +34,7 @@ namespace canvas
TextOSG(canvas::Text* text); TextOSG(canvas::Text* text);
void setCharacterSize(float height); void setFontResolution(int res);
void setCharacterAspect(float aspect); void setCharacterAspect(float aspect);
void setFill(const std::string& fill); void setFill(const std::string& fill);
void setBackgroundColor(const std::string& fill); void setBackgroundColor(const std::string& fill);
@ -58,27 +58,15 @@ namespace canvas
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void Text::TextOSG::setCharacterSize(float height) void Text::TextOSG::setFontResolution(int res)
{ {
TextBase::setCharacterSize(height); TextBase::setFontResolution(res, res);
unsigned int res = 32;
CanvasPtr canvas = _text_element->_canvas.lock();
if( canvas )
{
float factor = canvas->getSizeY() / canvas->getViewHeight();
res = height * factor;
}
// TODO different vertical/horizontal resolution?
// TODO configurable?
setFontResolution(res, res);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void Text::TextOSG::setCharacterAspect(float aspect) void Text::TextOSG::setCharacterAspect(float aspect)
{ {
TextBase::setCharacterSize(getCharacterHeight(), aspect); setCharacterSize(getCharacterHeight(), aspect);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -294,6 +282,7 @@ namespace canvas
addStyle("character-aspect-ratio", addStyle("character-aspect-ratio",
"numeric", "numeric",
&TextOSG::setCharacterAspect, text); &TextOSG::setCharacterAspect, text);
addStyle("font-resolution", "numeric", &TextOSG::setFontResolution, text);
addStyle("padding", "numeric", &TextOSG::setBoundingBoxMargin, text); addStyle("padding", "numeric", &TextOSG::setBoundingBoxMargin, text);
// TEXT = 1 default // TEXT = 1 default
// BOUNDINGBOX = 2 // BOUNDINGBOX = 2