From ac718b6abbdab3e8fcf3925ee7aeb52ba031ba8b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 15 Jan 2003 13:17:52 +0000 Subject: [PATCH] Attempts to fix more of the *stupid* errors in the VisualStudio6.0 compiler. --- src/osgUtil/TriStripVisitor.cpp | 10 +++++----- src/osgUtil/TriStrip_tri_stripper.cpp | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/osgUtil/TriStripVisitor.cpp b/src/osgUtil/TriStripVisitor.cpp index c559bcd36..a2cbec4b6 100644 --- a/src/osgUtil/TriStripVisitor.cpp +++ b/src/osgUtil/TriStripVisitor.cpp @@ -129,12 +129,12 @@ void TriStripVisitor::stripify(Geometry& geom) triangle_stripper::tri_stripper::primitives_vector outPrimitives; stripifier.Strip(&outPrimitives); - for(triangle_stripper::tri_stripper::primitives_vector::iterator itr=outPrimitives.begin(); - itr!=outPrimitives.end(); - ++itr) + for(triangle_stripper::tri_stripper::primitives_vector::iterator pitr=outPrimitives.begin(); + pitr!=outPrimitives.end(); + ++pitr) { - osg::DrawElementsUShort* elements = new osg::DrawElementsUShort(itr->m_Type); - elements->insert(elements->end(),itr->m_Indices.begin(),itr->m_Indices.end()); + osg::DrawElementsUShort* elements = new osg::DrawElementsUShort(pitr->m_Type); + elements->insert(elements->end(),pitr->m_Indices.begin(),pitr->m_Indices.end()); new_primitives.push_back(elements); } diff --git a/src/osgUtil/TriStrip_tri_stripper.cpp b/src/osgUtil/TriStrip_tri_stripper.cpp index 685bcaac0..0e78f6020 100644 --- a/src/osgUtil/TriStrip_tri_stripper.cpp +++ b/src/osgUtil/TriStrip_tri_stripper.cpp @@ -67,14 +67,15 @@ void tri_stripper::InitTriGraph() // note: setsize() completely resets the graph as well as the node markers m_Triangles.setsize(m_TriIndices.size() / 3); - for (size_t i = 0; i < m_Triangles.size(); ++i) + size_t i; + for (i = 0; i < m_Triangles.size(); ++i) m_Triangles[i] = triangle(m_TriIndices[i * 3 + 0], m_TriIndices[i * 3 + 1], m_TriIndices[i * 3 + 2]); // Build the edges lookup table triangle_edges TriInterface; TriInterface.reserve(m_Triangles.size() * 3); - for (size_t i = 0; i < m_Triangles.size(); ++i) { + for (i = 0; i < m_Triangles.size(); ++i) { TriInterface.push_back(triangle_edge(m_Triangles[i]->A(), m_Triangles[i]->B(), i)); TriInterface.push_back(triangle_edge(m_Triangles[i]->B(), m_Triangles[i]->C(), i)); TriInterface.push_back(triangle_edge(m_Triangles[i]->C(), m_Triangles[i]->A(), i)); @@ -84,7 +85,7 @@ void tri_stripper::InitTriGraph() std::sort(TriInterface.begin(), TriInterface.end(), _cmp_tri_interface_lt()); // Link neighbour triangles together using the edges lookup table - for (size_t i = 0; i < m_Triangles.size(); ++i) { + for (i = 0; i < m_Triangles.size(); ++i) { const triangle_edge EdgeBA(m_Triangles[i]->B(), m_Triangles[i]->A(), i); const triangle_edge EdgeCB(m_Triangles[i]->C(), m_Triangles[i]->B(), i);