diff --git a/src/osgWrappers/deprecated-dotosg/osg/Camera.cpp b/src/osgWrappers/deprecated-dotosg/osg/Camera.cpp index 63072d176..457bb5a1b 100644 --- a/src/osgWrappers/deprecated-dotosg/osg/Camera.cpp +++ b/src/osgWrappers/deprecated-dotosg/osg/Camera.cpp @@ -70,14 +70,14 @@ bool Camera_readLocalData(Object& obj, Input& fr) iteratorAdvanced = true; } - osg::ref_ptr attribute; - while((attribute=fr.readStateAttribute())!=NULL) + osg::ref_ptr stateAttribute; + while((stateAttribute=fr.readStateAttribute())!=NULL) { - osg::Viewport* viewport = dynamic_cast(attribute.get()); + osg::Viewport* viewport = dynamic_cast(stateAttribute.get()); if (viewport) camera.setViewport(viewport); else { - osg::ColorMask* colormask = dynamic_cast(attribute.get()); + osg::ColorMask* colormask = dynamic_cast(stateAttribute.get()); camera.setColorMask(colormask); } } diff --git a/src/osgWrappers/deprecated-dotosg/osg/Geometry.cpp b/src/osgWrappers/deprecated-dotosg/osg/Geometry.cpp index b82b92078..fe1e2bb8d 100644 --- a/src/osgWrappers/deprecated-dotosg/osg/Geometry.cpp +++ b/src/osgWrappers/deprecated-dotosg/osg/Geometry.cpp @@ -813,7 +813,6 @@ bool Array_writeLocalData(const Array& array,Output& fw) } else { - std::string uniqueID; fw.createUniqueIDForObject(&array,uniqueID); fw.registerUniqueIDForObject(&array,uniqueID); fw << "UniqueID " << uniqueID << " "; diff --git a/src/osgWrappers/deprecated-dotosg/osg/PagedLOD.cpp b/src/osgWrappers/deprecated-dotosg/osg/PagedLOD.cpp index e40532908..a302e017f 100644 --- a/src/osgWrappers/deprecated-dotosg/osg/PagedLOD.cpp +++ b/src/osgWrappers/deprecated-dotosg/osg/PagedLOD.cpp @@ -28,10 +28,10 @@ bool PagedLOD_readLocalData(Object& obj, Input& fr) PagedLOD& lod = static_cast(obj); - std::string path; - if (fr.read("DatabasePath",path)) + std::string databasePath; + if (fr.read("DatabasePath",databasePath)) { - lod.setDatabasePath(path); + lod.setDatabasePath(databasePath); } else { diff --git a/src/osgWrappers/deprecated-dotosg/osg/StateSet.cpp b/src/osgWrappers/deprecated-dotosg/osg/StateSet.cpp index b1499798f..9dd5c5a28 100644 --- a/src/osgWrappers/deprecated-dotosg/osg/StateSet.cpp +++ b/src/osgWrappers/deprecated-dotosg/osg/StateSet.cpp @@ -412,12 +412,11 @@ bool StateSet_readLocalData(Object& obj, Input& fr) iteratorAdvanced = true; } - bool readingMode = true; - StateAttribute::GLModeValue value; - while (readingMode) + bool readingGLMode = true; + while (readingGLMode) { - - readingMode=false; + StateAttribute::GLModeValue value; + readingGLMode=false; if (fr[0].isInt()) { if (StateSet_matchModeStr(fr[1].getStr(),value)) @@ -436,7 +435,7 @@ bool StateSet_readLocalData(Object& obj, Input& fr) } fr+=2; iteratorAdvanced = true; - readingMode=true; + readingGLMode=true; } } else @@ -458,7 +457,7 @@ bool StateSet_readLocalData(Object& obj, Input& fr) } fr+=2; iteratorAdvanced = true; - readingMode=true; + readingGLMode=true; } } } @@ -474,17 +473,17 @@ bool StateSet_readLocalData(Object& obj, Input& fr) // new code using osg::Registry's list of prototypes to loaded attributes. - StateAttribute* attribute = NULL; - while((attribute=fr.readStateAttribute())!=NULL) + StateAttribute* stateAttribute = NULL; + while((stateAttribute=fr.readStateAttribute())!=NULL) { - if (attribute->isTextureAttribute()) + if (stateAttribute->isTextureAttribute()) { // remap to be a texture attribute - stateset.setTextureAttribute(0,attribute); + stateset.setTextureAttribute(0,stateAttribute); } else { - stateset.setAttribute(attribute); + stateset.setAttribute(stateAttribute); } iteratorAdvanced = true; } @@ -597,9 +596,9 @@ bool StateSet_writeLocalData(const Object& obj, Output& fw) } - const StateSet::ModeList& ml = stateset.getModeList(); - for(StateSet::ModeList::const_iterator mitr=ml.begin(); - mitr!=ml.end(); + const StateSet::ModeList& ss_ml = stateset.getModeList(); + for(StateSet::ModeList::const_iterator mitr=ss_ml.begin(); + mitr!=ss_ml.end(); ++mitr) { std::string str; @@ -622,9 +621,9 @@ bool StateSet_writeLocalData(const Object& obj, Output& fw) fw.writeObject(*(uitr->second.first)); } - const StateSet::AttributeList& sl = stateset.getAttributeList(); - for(StateSet::AttributeList::const_iterator sitr=sl.begin(); - sitr!=sl.end(); + const StateSet::AttributeList& ss_sl = stateset.getAttributeList(); + for(StateSet::AttributeList::const_iterator sitr=ss_sl.begin(); + sitr!=ss_sl.end(); ++sitr) { fw.writeObject(*(sitr->second.first)); diff --git a/src/osgWrappers/deprecated-dotosg/osgTerrain/CompositeLayer.cpp b/src/osgWrappers/deprecated-dotosg/osgTerrain/CompositeLayer.cpp index e3228ccae..f37be743f 100644 --- a/src/osgWrappers/deprecated-dotosg/osgTerrain/CompositeLayer.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/CompositeLayer.cpp @@ -50,9 +50,9 @@ bool CompositeLayer_readLocalData(osg::Object& obj, osgDB::Input &fr) { itrAdvanced = false; - osg::ref_ptr readObject = fr.readObjectOfType(osgDB::type_wrapper()); - locator = dynamic_cast(readObject.get()); - if (readObject.valid()) itrAdvanced = true; + osg::ref_ptr readLocatorObject = fr.readObjectOfType(osgDB::type_wrapper()); + locator = dynamic_cast(readLocatorObject.get()); + if (readLocatorObject.valid()) itrAdvanced = true; unsigned int minLevel=0; if (fr.read("MinLevel",minLevel)) diff --git a/src/osgWrappers/deprecated-dotosg/osgTerrain/TerrainTile.cpp b/src/osgWrappers/deprecated-dotosg/osgTerrain/TerrainTile.cpp index 4f2db1113..566c067b0 100644 --- a/src/osgWrappers/deprecated-dotosg/osgTerrain/TerrainTile.cpp +++ b/src/osgWrappers/deprecated-dotosg/osgTerrain/TerrainTile.cpp @@ -31,8 +31,8 @@ bool TerrainTile_readLocalData(osg::Object& obj, osgDB::Input &fr) bool itrAdvanced = false; - osg::ref_ptr readObject = fr.readObjectOfType(osgDB::type_wrapper()); - if (readObject.valid()) itrAdvanced = true; + osg::ref_ptr readLocatorObject = fr.readObjectOfType(osgDB::type_wrapper()); + if (readLocatorObject.valid()) itrAdvanced = true; std::string blendingPolicy; if (fr.read("BlendingPolicy",blendingPolicy)) @@ -43,8 +43,8 @@ bool TerrainTile_readLocalData(osg::Object& obj, osgDB::Input &fr) else if (blendingPolicy == "ENABLE_BLENDING_WHEN_ALPHA_PRESENT") terrainTile.setBlendingPolicy(osgTerrain::TerrainTile::ENABLE_BLENDING_WHEN_ALPHA_PRESENT); } - osgTerrain::Locator* locator = dynamic_cast(readObject.get()); - if (locator) terrainTile.setLocator(locator); + osgTerrain::Locator* tileLocator = dynamic_cast(readLocatorObject.get()); + if (tileLocator) terrainTile.setLocator(tileLocator); if (fr.matchSequence("ElevationLayer {")) { @@ -55,9 +55,9 @@ bool TerrainTile_readLocalData(osg::Object& obj, osgDB::Input &fr) { bool localAdvanced = false; - osg::ref_ptr readObject = fr.readObjectOfType(osgDB::type_wrapper()); - osgTerrain::Locator* locator = dynamic_cast(readObject.get()); - if (readObject.valid()) localAdvanced = true; + osg::ref_ptr readElevationLocatorObject = fr.readObjectOfType(osgDB::type_wrapper()); + osgTerrain::Locator* locator = dynamic_cast(readElevationLocatorObject.get()); + if (readElevationLocatorObject.valid()) localAdvanced = true; unsigned int minLevel=0; if (fr.read("MinLevel",minLevel)) @@ -125,9 +125,9 @@ bool TerrainTile_readLocalData(osg::Object& obj, osgDB::Input &fr) { bool localAdvanced = false; - osg::ref_ptr readObject = fr.readObjectOfType(osgDB::type_wrapper()); - osgTerrain::Locator* locator = dynamic_cast(readObject.get()); - if (readObject.valid()) localAdvanced = true; + osg::ref_ptr readElevationLocatorObject = fr.readObjectOfType(osgDB::type_wrapper()); + osgTerrain::Locator* locator = dynamic_cast(readElevationLocatorObject.get()); + if (readElevationLocatorObject.valid()) localAdvanced = true; unsigned int minLevel=0; if (fr.read("MinLevel",minLevel)) @@ -181,7 +181,7 @@ bool TerrainTile_readLocalData(osg::Object& obj, osgDB::Input &fr) } - readObject = fr.readObjectOfType(osgDB::type_wrapper()); + osg::ref_ptr readObject = fr.readObjectOfType(osgDB::type_wrapper()); if (readObject.valid()) { terrainTile.setTerrainTechnique(dynamic_cast(readObject.get()));