From: James Turner Date: Tue, 11 Mar 2014 16:45:47 +0000 (+0000) Subject: Reset: fix OSG stats handling X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1edffd1d10bbe30a418e88140df54791ced23649;p=flightgear.git Reset: fix OSG stats handling --- diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx index f041f9d4f..52e59c722 100644 --- a/src/Main/fg_init.cxx +++ b/src/Main/fg_init.cxx @@ -1018,6 +1018,7 @@ void fgStartNewReset() render = new FGRenderer; render->setEventHandler(eventHandler); + eventHandler->reset(); globals->set_renderer(render); render->init(); render->setViewer(viewer.get()); diff --git a/src/Viewer/FGEventHandler.cxx b/src/Viewer/FGEventHandler.cxx index 85d011202..601d5a7b8 100644 --- a/src/Viewer/FGEventHandler.cxx +++ b/src/Viewer/FGEventHandler.cxx @@ -103,6 +103,13 @@ FGEventHandler::FGEventHandler() : _print = fgGetNode("/sim/rendering/print-statistics", true); } +void FGEventHandler::reset() +{ + _display = fgGetNode("/sim/rendering/on-screen-statistics", true); + _print = fgGetNode("/sim/rendering/print-statistics", true); + statsHandler->reset(); +} + namespace { // Translate OSG modifier mask to FG modifier mask. diff --git a/src/Viewer/FGEventHandler.hxx b/src/Viewer/FGEventHandler.hxx index 934c1157f..76450cd62 100644 --- a/src/Viewer/FGEventHandler.hxx +++ b/src/Viewer/FGEventHandler.hxx @@ -98,6 +98,7 @@ public: bool getResizable() { return resizable; } void setResizable(bool _resizable) { resizable = _resizable; } + void reset(); protected: osg::ref_ptr _node; fgIdleHandler idleHandler;