Extract code into getAllVertices

QTProject/subdivision.cpp

@@ -1057,19 +1057,32 @@ bool Subdivision::containsVertex(QVector<Vertex> &vertices, Vertex vertex) {
     return false;
 }
 
+QVector<Vertex> Subdivision::getAllVertices(const QVector<Triangle> &triangles) {
+    QVector<Vertex> result;
+    QVectorIterator<Triangle> i(triangles);
+    while (i.hasNext()) {
+        Triangle extra_triangle = i.next();
+
+        if (!containsVertex(result, extra_triangle.u()))
+            result.push_back(extra_triangle.u());
+        if (!containsVertex(result, extra_triangle.v()))
+            result.push_back(extra_triangle.v());
+        if (!containsVertex(result, extra_triangle.w()))
+            result.push_back(extra_triangle.w());
+    }
+    return result;
+}
+
 QVector3D Subdivision::updateIrregularVertexForDraw(Vertex currentCorner, QVector<Triangle> neighboring_triangles) {
     QVector<Vertex> surroundingVertex;
 
-    QVectorIterator<Triangle> extra(neighboring_triangles);
-    while (extra.hasNext()) {
-        Triangle extra_triangle = extra.next();
-
-        if (!currentCorner.samePos(extra_triangle.u()) && !containsVertex(surroundingVertex, extra_triangle.u()))
-            surroundingVertex.push_back(extra_triangle.u());
-        if (!currentCorner.samePos(extra_triangle.v()) && !containsVertex(surroundingVertex, extra_triangle.v()))
-            surroundingVertex.push_back(extra_triangle.v());
-        if (!currentCorner.samePos(extra_triangle.w()) && !containsVertex(surroundingVertex, extra_triangle.w()))
-            surroundingVertex.push_back(extra_triangle.w());
+    surroundingVertex = getAllVertices(neighboring_triangles);
+    QMutableVectorIterator<Vertex> i(surroundingVertex);
+    while (i.hasNext()) {
+        if (currentCorner.samePos(i.next())) {
+            i.remove();
+            break;
+        }
     }
 
     QVector3D newPos(0.0, 0.0, 0.0);

QTProject/subdivision.h

@@ -72,6 +72,7 @@ private:
     void runEdgeShader(GLuint size, GLuint vb_handle, GLuint edge_indices_handle, GLuint output_handle, GLuint offset_handle);
     void updateIrregularForDraw(const QVector<Triangle> &triangles, QMap<Triangle, Triangle::Neighbors> &neighbors, Result &result);
     bool containsVertex(QVector<Vertex> &vertices, Vertex vertex);
+    QVector<Vertex> getAllVertices(const QVector<Triangle> &triangles);
     QVector3D updateIrregularVertexForDraw(Vertex currentCorner, QVector<Triangle> neighboring_triangles);
 
     QVector<unsigned int> patchIBToTriangleIB(QVector<unsigned int> ib);