From 468d6d8eeaff2959421ec93403af202f0a13aa93 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 29 Sep 2017 10:20:59 +0100 Subject: [PATCH] Added command line support for specifying "default" for osgText::DefaultFont --- examples/osgfont/osgfont.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/examples/osgfont/osgfont.cpp b/examples/osgfont/osgfont.cpp index b063325cf..f17a0ed9a 100644 --- a/examples/osgfont/osgfont.cpp +++ b/examples/osgfont/osgfont.cpp @@ -152,7 +152,11 @@ struct TextSettings { OSG_NOTICE<<"Settings::setText()"< font = osgText::readRefFontFile(fontFilename); + osg::ref_ptr font; + + if (fontFilename!="default") font = osgText::readRefFontFile(fontFilename); + + if (!font) font = osgText::Font::getDefaultFont(); font->setGlyphImageMargin(glyphImageMargin); font->setGlyphImageMarginRatio(glyphImageMarginRatio);