warning fixes

diff --git a/simgear/scene/model/ModelRegistry.cxx b/simgear/scene/model/ModelRegistry.cxx
index 7e32c8f7d4501ebf54f0ecfaf6776ee204c4b97d..9cfff559edec0c1569b0148deddc2ccb6a2e0858 100644 (file)
--- a/simgear/scene/model/ModelRegistry.cxx
+++ b/simgear/scene/model/ModelRegistry.cxx
@@ -512,7 +512,7 @@ ModelRegistry::readNode(const string& fileName,
     ScopedLock<ReentrantMutex> lock(readerMutex);
 
     // XXX Workaround for OSG plugin bug.
-    Registry* registry = Registry::instance();
+//    Registry* registry = Registry::instance();
     ReaderWriter::ReadResult res;
     CallbackMap::iterator iter
         = nodeCallbackMap.find(getFileExtension(fileName));

diff --git a/simgear/scene/model/ModelRegistry.hxx b/simgear/scene/model/ModelRegistry.hxx
index 998d2f2fca5ea17fe0476cfe3d0c43f344e1b2fe..909c9460247184d6b481d2ab86dbd06b25ee7cfe 100644 (file)
--- a/simgear/scene/model/ModelRegistry.hxx
+++ b/simgear/scene/model/ModelRegistry.hxx
@@ -77,7 +77,7 @@ public:
         using namespace osg;
         using namespace osgDB;
         using osgDB::ReaderWriter;
-        Registry* registry = Registry::instance();
+//        Registry* registry = Registry::instance();
         ref_ptr<osg::Node> optimizedNode = _cachePolicy.find(fileName, opt);
         if (!optimizedNode.valid()) {
             std::string otherFileName = _substitutePolicy.substitute(fileName,

diff --git a/simgear/scene/model/animation.cxx b/simgear/scene/model/animation.cxx
index 28f89f5e303791529744c36c835fa550e822dffd..e62c2675ccaaffe1bae02a68ec702d1adebbba55 100644 (file)
--- a/simgear/scene/model/animation.cxx
+++ b/simgear/scene/model/animation.cxx
@@ -347,7 +347,7 @@ struct DoDrawArraysVisitor : public osg::NodeVisitor {
         using namespace osg;
         using namespace std;
 
-        for (int i = 0; i < geode.getNumDrawables(); ++i)
+        for (int i = 0; i < (int)geode.getNumDrawables(); ++i)
             geode.getDrawable(i)->setUseDisplayList(false);
     }
 };

diff --git a/simgear/scene/model/shadanim.cxx b/simgear/scene/model/shadanim.cxx
index 9f94730df5687f824b82982ee260309d25258c61..6c0ad494101bd4d6075f2540d4c46c87cd16830b 100644 (file)
--- a/simgear/scene/model/shadanim.cxx
+++ b/simgear/scene/model/shadanim.cxx
@@ -132,6 +132,7 @@ private:
 
 static Mutex cubeMutex;
 
+#if 0
 static osg::TextureCubeMap*
 getOrCreateTextureCubeMap()
 {
@@ -181,6 +182,7 @@ static void create_specular_highlights(osg::Node *node)
   te->setOperand1_RGB(osg::TexEnvCombine::SRC_COLOR);
   ss->setTextureAttributeAndModes(0, te, osg::StateAttribute::OVERRIDE | osg::StateAttribute::ON);
 }
+#endif
 
 
 SGShaderAnimation::SGShaderAnimation(const SGPropertyNode* configNode,