diff options
author | 2015-04-08 15:13:38 +0200 | |
---|---|---|
committer | 2015-04-08 15:13:38 +0200 | |
commit | d4a431f0ea75957702de88dd1b074bd9a22ef6d2 (patch) | |
tree | 7af8ada5b3b1b9b34eae232f03a6d9044da1ed2a /3rdparty/bgfx/tools/geometryc/geometryc.cpp | |
parent | 5a33ceba7536d45a84b0f0238c21e391f6e6abbc (diff) |
latest BGFX (nw)
Diffstat (limited to '3rdparty/bgfx/tools/geometryc/geometryc.cpp')
-rw-r--r-- | 3rdparty/bgfx/tools/geometryc/geometryc.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/3rdparty/bgfx/tools/geometryc/geometryc.cpp b/3rdparty/bgfx/tools/geometryc/geometryc.cpp index f748e5c797a..ccf6a580b80 100644 --- a/3rdparty/bgfx/tools/geometryc/geometryc.cpp +++ b/3rdparty/bgfx/tools/geometryc/geometryc.cpp @@ -724,9 +724,9 @@ int main(int _argc, const char* _argv[]) { hasTexcoord = true; - for (Index3Map::iterator it = indexMap.begin(), itEnd = indexMap.end(); it != itEnd; ++it) + for (Index3Map::iterator jt = indexMap.begin(), jtEnd = indexMap.end(); jt != jtEnd; ++jt) { - it->second.m_texcoord = it->second.m_position; + jt->second.m_texcoord = jt->second.m_position; } } @@ -735,9 +735,9 @@ int main(int _argc, const char* _argv[]) { hasNormal = true; - for (Index3Map::iterator it = indexMap.begin(), itEnd = indexMap.end(); it != itEnd; ++it) + for (Index3Map::iterator jt = indexMap.begin(), jtEnd = indexMap.end(); jt != jtEnd; ++jt) { - it->second.m_normal = it->second.m_position; + jt->second.m_normal = jt->second.m_position; } } } @@ -848,14 +848,14 @@ int main(int _argc, const char* _argv[]) triReorderElapsed -= bx::getHPCounter(); for (PrimitiveArray::const_iterator primIt = primitives.begin(); primIt != primitives.end(); ++primIt) { - const Primitive& prim = *primIt; - triangleReorder(indexData + prim.m_startIndex, prim.m_numIndices, numVertices, 32); + const Primitive& prim1 = *primIt; + triangleReorder(indexData + prim1.m_startIndex, prim1.m_numIndices, numVertices, 32); if (compress) { triangleCompress(&memWriter - , indexData + prim.m_startIndex - , prim.m_numIndices - , vertexData + prim.m_startVertex + , indexData + prim1.m_startIndex + , prim1.m_numIndices + , vertexData + prim1.m_startVertex , numVertices , stride ); @@ -968,14 +968,14 @@ int main(int _argc, const char* _argv[]) triReorderElapsed -= bx::getHPCounter(); for (PrimitiveArray::const_iterator primIt = primitives.begin(); primIt != primitives.end(); ++primIt) { - const Primitive& prim = *primIt; - triangleReorder(indexData + prim.m_startIndex, prim.m_numIndices, numVertices, 32); + const Primitive& prim1 = *primIt; + triangleReorder(indexData + prim1.m_startIndex, prim1.m_numIndices, numVertices, 32); if (compress) { triangleCompress(&memWriter - , indexData + prim.m_startIndex - , prim.m_numIndices - , vertexData + prim.m_startVertex + , indexData + prim1.m_startIndex + , prim1.m_numIndices + , vertexData + prim1.m_startVertex , numVertices , stride ); |