Changeset 11071 for code/trunk/src/libraries/tools/DebugDrawer.cc
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/tools/DebugDrawer.cc
r10262 r11071 21 21 { 22 22 DebugDrawer::DebugDrawer(Ogre::SceneManager *_sceneManager, float _fillAlpha) : 23 sceneManager(_sceneManager), fillAlpha(_fillAlpha), manualObject( 0), isEnabled(true), linesIndex(0), trianglesIndex(0)23 sceneManager(_sceneManager), fillAlpha(_fillAlpha), manualObject(nullptr), isEnabled(true), linesIndex(0), trianglesIndex(0) 24 24 { 25 25 initialise(); … … 392 392 manualObject->estimateVertexCount(lineVertices.size()); 393 393 manualObject->estimateIndexCount(lineIndices.size()); 394 for ( std::list<VertexPair>::iterator i = lineVertices.begin(); i != lineVertices.end(); i++)394 for (const VertexPair& pair : lineVertices) 395 395 { 396 manualObject->position( i->first);397 manualObject->colour( i->second);396 manualObject->position(pair.first); 397 manualObject->colour(pair.second); 398 398 } 399 for ( std::list<int>::iterator i = lineIndices.begin(); i != lineIndices.end(); i++)400 manualObject->index( *i);399 for (int lineIndex : lineIndices) 400 manualObject->index(lineIndex); 401 401 } 402 402 else … … 409 409 manualObject->estimateVertexCount(triangleVertices.size()); 410 410 manualObject->estimateIndexCount(triangleIndices.size()); 411 for ( std::list<VertexPair>::iterator i = triangleVertices.begin(); i != triangleVertices.end(); i++)411 for (const VertexPair& pair : triangleVertices) 412 412 { 413 manualObject->position( i->first);414 manualObject->colour( i->second.r, i->second.g, i->second.b, fillAlpha);413 manualObject->position(pair.first); 414 manualObject->colour(pair.second.r, pair.second.g, pair.second.b, fillAlpha); 415 415 } 416 for ( std::list<int>::iterator i = triangleIndices.begin(); i != triangleIndices.end(); i++)417 manualObject->index( *i);416 for (int triangleIndex : triangleIndices) 417 manualObject->index(triangleIndex); 418 418 } 419 419 else … … 433 433 int DebugDrawer::addLineVertex(const Ogre::Vector3& vertex, const Ogre::ColourValue& colour) 434 434 { 435 lineVertices. push_back(VertexPair(vertex, colour));435 lineVertices.emplace_back(vertex, colour); 436 436 return linesIndex++; 437 437 } … … 445 445 int DebugDrawer::addTriangleVertex(const Ogre::Vector3& vertex, const Ogre::ColourValue& colour) 446 446 { 447 triangleVertices. push_back(VertexPair(vertex, colour));447 triangleVertices.emplace_back(vertex, colour); 448 448 return trianglesIndex++; 449 449 }
Note: See TracChangeset
for help on using the changeset viewer.