diff --git a/examples/osganalysis/osganalysis.cpp b/examples/osganalysis/osganalysis.cpp index 1a0d238dc..9c81bf37c 100644 --- a/examples/osganalysis/osganalysis.cpp +++ b/examples/osganalysis/osganalysis.cpp @@ -104,9 +104,9 @@ public: { if (!stateset) return; - for(unsigned int i=0; igetNumTextureAttributeLists(); ++i) + for(unsigned int ti=0; tigetNumTextureAttributeLists(); ++ti) { - osg::StateAttribute* sa = stateset->getTextureAttribute(i, osg::StateAttribute::TEXTURE); + osg::StateAttribute* sa = stateset->getTextureAttribute(ti, osg::StateAttribute::TEXTURE); osg::Texture* texture = dynamic_cast(sa); if (texture) { @@ -782,8 +782,8 @@ int main(int argc, char** argv) modelIndextimeBetweenMerges) { - std::string filename = fileNames[modelIndex++]; - std::string outputFilename = outputPostfix.empty() ? std::string() : osgDB::getStrippedName(filename)+outputPostfix; + filename = fileNames[modelIndex++]; + outputFilename = outputPostfix.empty() ? std::string() : osgDB::getStrippedName(filename)+outputPostfix; databasePagingOperation = new DatabasePagingOperation( filename, diff --git a/examples/osgcatch/osgcatch.cpp b/examples/osgcatch/osgcatch.cpp index 19cd48248..8108ed3fc 100644 --- a/examples/osgcatch/osgcatch.cpp +++ b/examples/osgcatch/osgcatch.cpp @@ -107,10 +107,10 @@ Character::Character(): } -void Character::setCharacter(const std::string& filename, const std::string& name, const osg::Vec3& origin, const osg::Vec3& width, const osg::Vec3& catchPos, float positionRatio) +void Character::setCharacter(const std::string& filename, const std::string& name, const osg::Vec3& origin, const osg::Vec3& cwidth, const osg::Vec3& catchPos, float positionRatio) { _origin = origin; - _width = width; + _width = cwidth; _positionRatio = positionRatio; _numLives = 3; _numCatches = 0;