Prepare and implement reinit methods for instruments

[flightgear.git] / src / Model / model_panel.cxx

diff --git a/src/Model/model_panel.cxx b/src/Model/model_panel.cxx
index ea24a2fa2e0c6fb0d503b0b83cf387388fc004ee..ac2ab88b1c3bbd9194f2db62a32e079586bf4b22 100644 (file)
--- a/src/Model/model_panel.cxx
+++ b/src/Model/model_panel.cxx
@@ -16,31 +16,23 @@
 #include <simgear/scene/util/SGNodeMasks.hxx>
 
 #include "panelnode.hxx"
-
 #include "model_panel.hxx"
 
-SG_USING_STD(vector);
+using std::vector;
 
 using namespace simgear;
-
-static
-osg::Node* load_panel(SGPropertyNode *n)
-{
-    osg::Geode* geode = new osg::Geode;
-    geode->addDrawable(new FGPanelNode(n));
-    return geode;
-}
-
 \f
 ////////////////////////////////////////////////////////////////////////
 // Global functions.
 ////////////////////////////////////////////////////////////////////////
 
 osg::Node *
-fgLoad3DModelPanel(const string &path, SGPropertyNode *prop_root)
+fgLoad3DModelPanel(const std::string &path, SGPropertyNode *prop_root)
 {
-    osg::Node* node = SGModelLib::loadModel(path, prop_root, load_panel);
-    node->setNodeMask(~SG_NODEMASK_TERRAIN_BIT);
+    bool loadPanels = true;
+    osg::Node* node = SGModelLib::loadModel(path, prop_root, NULL, loadPanels);
+    if (node)
+        node->setNodeMask(~SG_NODEMASK_TERRAIN_BIT);
     return node;
 }