AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-28 07:32:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'no_more_ttf_spam_in_stats' into 'master'

Browse Source 
puts an end of error spam when OSG is compiled without Freetype support

See merge request OpenMW/openmw!188
This commit is contained in:
psi29a 2020-04-27 19:29:29 +00:00
commit 9ab6657d8f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/resource/stats.cpp
View File

@ -8,6 +8,8 @@
#include <osgText/Text> #include <osgText/Text>
#include <osgDB/Registry>
#include <osgViewer/Viewer> #include <osgViewer/Viewer>
#include <osgViewer/Renderer> #include <osgViewer/Renderer>
@ -32,12 +34,16 @@ StatsHandler::StatsHandler():
_resourceStatsChildNum = 0; _resourceStatsChildNum = 0;
if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf"))
_font = osgMyGUI::DataManager::getInstance().getDataPath("DejaVuLGCSansMono.ttf"); _font = osgMyGUI::DataManager::getInstance().getDataPath("DejaVuLGCSansMono.ttf");
} }
Profiler::Profiler() Profiler::Profiler()
{ {
if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf"))
_font = osgMyGUI::DataManager::getInstance().getDataPath("DejaVuLGCSansMono.ttf"); _font = osgMyGUI::DataManager::getInstance().getDataPath("DejaVuLGCSansMono.ttf");
else
_font = "";
setKeyEventTogglesOnScreenStats(osgGA::GUIEventAdapter::KEY_F3); setKeyEventTogglesOnScreenStats(osgGA::GUIEventAdapter::KEY_F3);
} }