X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2Fmodel_panel.cxx;h=ac2ab88b1c3bbd9194f2db62a32e079586bf4b22;hb=977cfb77b5e7530014b03572a4ffaef3562d6712;hp=8a581d2f49deedbb35107220dfce1d9f5ab272a6;hpb=971833856089b9ce260dd4dc5a8f2d1de1c251d7;p=flightgear.git diff --git a/src/Model/model_panel.cxx b/src/Model/model_panel.cxx index 8a581d2f4..ac2ab88b1 100644 --- a/src/Model/model_panel.cxx +++ b/src/Model/model_panel.cxx @@ -14,7 +14,6 @@ #include #include #include -#include #include "panelnode.hxx" #include "model_panel.hxx" @@ -22,24 +21,16 @@ 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; -} - //////////////////////////////////////////////////////////////////////// // 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); + bool loadPanels = true; + osg::Node* node = SGModelLib::loadModel(path, prop_root, NULL, loadPanels); if (node) node->setNodeMask(~SG_NODEMASK_TERRAIN_BIT); return node;