FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed shadows warnings

Browse Source
This commit is contained in:
Robert Osfield 2016-05-26 10:24:44 +01:00
parent 40f4cdb1ce
commit 304c048d84
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/osganalysis/osganalysis.cpp
View File

@ -104,9 +104,9 @@ public:
{
if (!stateset) return;
for(unsigned int i=0; i<stateset->getNumTextureAttributeLists(); ++i)
for(unsigned int ti=0; ti<stateset->getNumTextureAttributeLists(); ++ti)
{
osg::StateAttribute* sa = stateset->getTextureAttribute(i, osg::StateAttribute::TEXTURE);
osg::StateAttribute* sa = stateset->getTextureAttribute(ti, osg::StateAttribute::TEXTURE);
osg::Texture* texture = dynamic_cast<osg::Texture*>(sa);
if (texture)
{
@ -782,8 +782,8 @@ int main(int argc, char** argv)
modelIndex<fileNames.size() &&
(currentTime-timeOfLastMerge)>timeBetweenMerges)
{
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,

4
examples/osgcatch/osgcatch.cpp
View File

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