diff --git a/src/osgUtil/PerlinNoise.cpp b/src/osgUtil/PerlinNoise.cpp index 72694be6b..b917f6771 100644 --- a/src/osgUtil/PerlinNoise.cpp +++ b/src/osgUtil/PerlinNoise.cpp @@ -234,15 +234,14 @@ void PerlinNoise::initNoise(void) double PerlinNoise::PerlinNoise1D(double x,double alpha,double beta,int n) { int i; - double val,sum = 0; - double p,scale = 1; - - p = x; + double val,sum = 0.0; + double scale = 1.0; + double pv = x; for (i=0;i(_viewport->x() + _viewport->width()); int height = static_cast(_viewport->y() + _viewport->height()); int depth = 1; - osg::Camera::BufferAttachmentMap::iterator itr; - for(itr = bufferAttachments.begin(); + for(osg::Camera::BufferAttachmentMap::iterator itr = bufferAttachments.begin(); itr != bufferAttachments.end(); ++itr) { @@ -262,7 +261,7 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo) // OSG_NOTICE<<"RenderStage::runCameraSetUp computed "<apply(state); - GLenum status = ext->glCheckFramebufferStatus(GL_FRAMEBUFFER_EXT); - + status = ext->glCheckFramebufferStatus(GL_FRAMEBUFFER_EXT); if (status != GL_FRAMEBUFFER_COMPLETE_EXT) { OSG_NOTICE << "RenderStage::runCameraSetUp(), " @@ -1039,8 +1037,7 @@ void RenderStage::drawInner(osg::RenderInfo& renderInfo,RenderLeaf*& previous, b copyTexture(renderInfo); } - std::map< osg::Camera::BufferComponent, Attachment>::const_iterator itr; - for(itr = _bufferAttachmentMap.begin(); + for(std::map< osg::Camera::BufferComponent, Attachment>::const_iterator itr = _bufferAttachmentMap.begin(); itr != _bufferAttachmentMap.end(); ++itr) { diff --git a/src/osgUtil/SmoothingVisitor.cpp b/src/osgUtil/SmoothingVisitor.cpp index cf0693bfc..8448b3f6d 100644 --- a/src/osgUtil/SmoothingVisitor.cpp +++ b/src/osgUtil/SmoothingVisitor.cpp @@ -481,11 +481,11 @@ struct FindSharpEdgesFunctor Triangles::iterator titr = pv->_triangles.begin(); while(titr != pv->_triangles.end()) { - Triangle* tri = titr->get(); - osg::Vec3 normal = computeNormal(tri->_p1, tri->_p2, tri->_p3); + Triangle* pv_tri = titr->get(); + osg::Vec3 normal = computeNormal(pv_tri->_p1, pv_tri->_p2, pv_tri->_p3); Triangles associatedTriangles; - associatedTriangles.push_back(tri); + associatedTriangles.push_back(pv_tri); // remove triangle for list pv->_triangles.erase(titr); @@ -516,7 +516,7 @@ struct FindSharpEdgesFunctor // create duplicate vertex to set of associated triangles unsigned int duplicated_p = duplicateVertex(p); - // now rest the index on th triangles of the point that was duplicated + // now rest the index on the triangles of the point that was duplicated for(Triangles::iterator aitr = associatedTriangles.begin(); aitr != associatedTriangles.end(); ++aitr) diff --git a/src/osgUtil/TriStripVisitor.cpp b/src/osgUtil/TriStripVisitor.cpp index dd005de8e..c16056efe 100644 --- a/src/osgUtil/TriStripVisitor.cpp +++ b/src/osgUtil/TriStripVisitor.cpp @@ -231,8 +231,7 @@ void TriStripVisitor::stripify(Geometry& geom) unsigned int numSurfacePrimitives = 0; unsigned int numNonSurfacePrimitives = 0; Geometry::PrimitiveSetList& primitives = geom.getPrimitiveSetList(); - Geometry::PrimitiveSetList::iterator itr; - for(itr=primitives.begin(); + for(Geometry::PrimitiveSetList::iterator itr=primitives.begin(); itr!=primitives.end(); ++itr) { @@ -258,24 +257,23 @@ void TriStripVisitor::stripify(Geometry& geom) // compute duplicate vertices - typedef std::vector IndexList; unsigned int numVertices = geom.getVertexArray()->getNumElements(); - IndexList indices(numVertices); + IndexList vindices(numVertices); unsigned int i,j; for(i=0;i