FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

warning fixes

Browse Source
This commit is contained in:
torsten
2009-08-20 09:17:01 +00:00
committed by Tim Moore
parent f043f3d4f9
commit a92955eade
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
simgear/scene/model/ModelRegistry.cxx
View File

@@ -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));

2
simgear/scene/model/ModelRegistry.hxx
View File

@@ -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,

2
simgear/scene/model/animation.cxx
View File

@@ -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);
}
};

2
simgear/scene/model/shadanim.cxx
View File

@@ -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,