Configure font in osg StatsHandler for OSG3.

OSG3 relies on "fonts/arial.ttf" being available. FG doesn't provide it -
so it's not necessarily available everywhere (not here). Use one of our
txf fonts instead.

diff --git a/src/Main/FGEventHandler.cxx b/src/Main/FGEventHandler.cxx
index 65777a623bcc1579831d7351754891ec58b0dc97..562d807918ec13dc3729d5b32c70163109d50432 100644 (file)
--- a/src/Main/FGEventHandler.cxx
+++ b/src/Main/FGEventHandler.cxx
@@ -39,7 +39,7 @@ FGEventHandler::FGEventHandler() :
     keyHandler(0),
     mouseClickHandler(0),
     mouseMotionHandler(0),
-    statsHandler(new osgViewer::StatsHandler),
+    statsHandler(new FGStatsHandler),
     statsEvent(new osgGA::GUIEventAdapter),
     statsType(osgViewer::StatsHandler::NO_STATS),
     currentModifiers(0),

diff --git a/src/Main/FGEventHandler.hxx b/src/Main/FGEventHandler.hxx
index 4be0caf2135676f0d87c62cad76a61aa2b77a529..3abea015e61d1855d6a63882b326c17a96db5b59 100644 (file)
--- a/src/Main/FGEventHandler.hxx
+++ b/src/Main/FGEventHandler.hxx
@@ -5,11 +5,26 @@
 #include <osg/Quat>
 #include <osgGA/GUIEventHandler>
 #include <osgViewer/ViewerEventHandlers>
+#include <simgear/structure/OSGVersion.hxx>
 
 #include "fg_os.hxx"
 
 namespace flightgear
 {
+    class FGStatsHandler : public osgViewer::StatsHandler
+    {
+        public:
+            FGStatsHandler()
+            {
+#if (SG_OSG_VERSION >= 30000)
+                // Adjust font type/size for >=OSG3.
+                // OSG defaults aren't working/available for FG.
+                _font = "Fonts/helvetica_medium.txf";
+                _characterSize = 12.0f;
+#endif
+            }
+    };
+
 class FGEventHandler : public osgGA::GUIEventHandler {
 public:
     FGEventHandler();
@@ -86,7 +101,7 @@ protected:
     fgKeyHandler keyHandler;
     fgMouseClickHandler mouseClickHandler;
     fgMouseMotionHandler mouseMotionHandler;
-    osg::ref_ptr<osgViewer::StatsHandler> statsHandler;
+    osg::ref_ptr<FGStatsHandler> statsHandler;
     osg::ref_ptr<osgGA::GUIEventAdapter> statsEvent;
     int statsType;
     int currentModifiers;