Changeset 10916 for code/branches/cpp11_v2/src/libraries/tools/IcoSphere.cc

Timestamp:

Dec 2, 2015, 11:22:03 PM (9 years ago)

Author:

landauf

Message:

use actual types instead of 'auto'. only exception is for complicated template types, e.g. when iterating over a map

File:

• code/branches/cpp11_v2/src/libraries/tools/IcoSphere.cc (modified) (4 diffs)

code/branches/cpp11_v2/src/libraries/tools/IcoSphere.cc

@@ -116 +116 @@
             std::list<TriangleIndices> faces2;
 
-            for (auto f : faces)
+            for (const TriangleIndices& f : faces)
             {
-                
                 int a = getMiddlePoint(f.v1, f.v2);
                 int b = getMiddlePoint(f.v2, f.v3);
@@ -194 +193 @@
     void IcoSphere::addToLineIndices(int baseIndex, std::list<int>* target) const
     {
-        for (const auto & elem : lineIndices)
+        for (const LineIndices& line : lineIndices)
         {
-            target->push_back(baseIndex + (elem).v1);
-            target->push_back(baseIndex + (elem).v2);
+            target->push_back(baseIndex + line.v1);
+            target->push_back(baseIndex + line.v2);
         }
     }
@@ -203 +202 @@
     void IcoSphere::addToTriangleIndices(int baseIndex, std::list<int>* target) const
     {
-        for (const auto & elem : faces)
+        for (const TriangleIndices& triangle : faces)
         {
-            target->push_back(baseIndex + (elem).v1);
-            target->push_back(baseIndex + (elem).v2);
-            target->push_back(baseIndex + (elem).v3);
+            target->push_back(baseIndex + triangle.v1);
+            target->push_back(baseIndex + triangle.v2);
+            target->push_back(baseIndex + triangle.v3);
         }
     }
@@ -217 +216 @@
         transform.setScale(Ogre::Vector3(scale, scale, scale));
 
-        for (auto & elem : vertices)
-            target->push_back(VertexPair(transform * elem, colour));
+        for (const Ogre::Vector3& vertex : vertices)
+            target->push_back(VertexPair(transform * vertex, colour));
 
         return vertices.size();