Doing the compilers job: constant propagation.

This variable is nowhere set except to zero.

Modified Files:
	model/SGPagedLOD.cxx model/SGReaderWriterXML.cxx
	model/modellib.cxx model/modellib.hxx

diff --git a/simgear/scene/model/SGPagedLOD.cxx b/simgear/scene/model/SGPagedLOD.cxx
index 541c635085e8ad1858ad49f50fa092cb509706bc..96a0656d49917878d3dca908b0004f4db57a9c75 100644 (file)
--- a/simgear/scene/model/SGPagedLOD.cxx
+++ b/simgear/scene/model/SGPagedLOD.cxx
@@ -56,7 +56,7 @@ bool SGPagedLOD::addChild(osg::Node *child)
     {
         osg::ref_ptr<SGModelData> d = opts->getModelData();
         if(d.valid())
-            d->modelLoaded(getFileName(getNumChildren()-1), d->getProperties(),
+            d->modelLoaded(getFileName(getNumChildren()-1), 0,
                            this);
     }
     return true;

diff --git a/simgear/scene/model/SGReaderWriterXML.cxx b/simgear/scene/model/SGReaderWriterXML.cxx
index 68147571719e6c638d1dffa8cd92025a875f9076..f6189274cd9c1c4d9c01c9a418e476dcb761df87 100644 (file)
--- a/simgear/scene/model/SGReaderWriterXML.cxx
+++ b/simgear/scene/model/SGReaderWriterXML.cxx
@@ -312,7 +312,6 @@ sgLoad3DModel_internal(const string &path,
     }
 
     if (data) {
-        data->setProps(props);
         options->setModelData(data);
     }
 

diff --git a/simgear/scene/model/modellib.cxx b/simgear/scene/model/modellib.cxx
index dda15a92c5832cb7fccac67738118ad0ebac38e4..9564435156bb44d66b72a83ab8ff44cf071388b3 100644 (file)
--- a/simgear/scene/model/modellib.cxx
+++ b/simgear/scene/model/modellib.cxx
@@ -67,7 +67,7 @@ SGModelLib::loadModel(const string &path,
     opt->setModelData(data);
     osg::Node *n = readNodeFile(path, opt.get());
     if(data)
-        data->modelLoaded(path, data->getProperties(), n);
+        data->modelLoaded(path, 0, n);
     if (n && n->getName().empty())
         n->setName("Direct loaded model \"" + path + "\"");
     return n;

diff --git a/simgear/scene/model/modellib.hxx b/simgear/scene/model/modellib.hxx
index f40ba92ef24b8a29ae0adf6dc0838df083097128..7c38b10abedd6adcfcf659d601a7b5b1452145db 100644 (file)
--- a/simgear/scene/model/modellib.hxx
+++ b/simgear/scene/model/modellib.hxx
@@ -83,16 +83,8 @@ protected:
 class SGModelData : public osg::Referenced {
 public:
     virtual ~SGModelData() {}
-    virtual void modelLoaded( const string& path, SGPropertyNode *prop,
-                              osg::Node*branch) = 0;
-
-    virtual void setProps(SGPropertyNode *p)
-        { _props = p; }
-
-    SGPropertyNode *getProperties()
-        { return _props; }
-protected:
-    SGPropertyNode_ptr _props;
+    virtual void modelLoaded(const string& path, SGPropertyNode *prop,
+                             osg::Node* branch) = 0;
 };
 
 }