Changeset 10918 for code/branches/cpp11_v2/src/libraries/tools

Timestamp:

Dec 5, 2015, 7:10:56 PM (9 years ago)

Author:

muemart

Message:

Use emplace_back instead of push_back if beneficial

Location:

code/branches/cpp11_v2/src/libraries/tools

Files:

• DebugDrawer.cc (modified) (2 diffs)
• DynamicLines.cc (modified) (1 diff)
• IcoSphere.cc (modified) (5 diffs)

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

@@ -433 +433 @@
     int DebugDrawer::addLineVertex(const Ogre::Vector3& vertex, const Ogre::ColourValue& colour)
     {
-        lineVertices.push_back(VertexPair(vertex, colour));
+        lineVertices.emplace_back(vertex, colour);
         return linesIndex++;
     }
@@ -445 +445 @@
     int DebugDrawer::addTriangleVertex(const Ogre::Vector3& vertex, const Ogre::ColourValue& colour)
     {
-        triangleVertices.push_back(VertexPair(vertex, colour));
+        triangleVertices.emplace_back(vertex, colour);
         return trianglesIndex++;
     }

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

@@ -69 +69 @@
     void DynamicLines::addPoint(Real x, Real y, Real z)
     {
-        mPoints.push_back(Vector3(x,y,z));
+        mPoints.emplace_back(x,y,z);
         mDirty = true;
     }

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

@@ -126 +126 @@
                 removeLineIndices(f.v3, f.v1);
 
-                faces2.push_back(TriangleIndices(f.v1, a, c));
-                faces2.push_back(TriangleIndices(f.v2, b, a));
-                faces2.push_back(TriangleIndices(f.v3, c, b));
-                faces2.push_back(TriangleIndices(a, b, c));
+                faces2.emplace_back(f.v1, a, c);
+                faces2.emplace_back(f.v2, b, a);
+                faces2.emplace_back(f.v3, c, b);
+                faces2.emplace_back(a, b, c);
 
                 addTriangleLines(f.v1, a, c);
@@ -142 +142 @@
     void IcoSphere::addLineIndices(int index0, int index1)
     {
-        lineIndices.push_back(LineIndices(index0, index1));
+        lineIndices.emplace_back(index0, index1);
     }
 
@@ -163 +163 @@
     {
         Ogre::Real length = vertex.length();
-        vertices.push_back(Ogre::Vector3(vertex.x / length, vertex.y / length, vertex.z / length));
+        vertices.emplace_back(vertex.x / length, vertex.y / length, vertex.z / length);
         return index++;
     }
@@ -188 +188 @@
     void IcoSphere::addFace(int index0, int index1, int index2)
     {
-        faces.push_back(TriangleIndices(index0, index1, index2));
+        faces.emplace_back(index0, index1, index2);
     }
 
@@ -217 +217 @@
 
         for (const Ogre::Vector3& vertex : vertices)
-            target->push_back(VertexPair(transform * vertex, colour));
+            target->emplace_back(transform * vertex, colour);
 
         return vertices.size();