[3d] fix inevitable crashes when terrain bounding boxes were shown

wonder-sk · wonder-sk · commit 528c8a63bf5b · 2018-11-08T09:57:31.000+01:00
The list of vertices just kept growing and growing (and we didn't even need another copy!)
diff --git a/src/3d/chunks/qgschunkboundsentity_p.cpp b/src/3d/chunks/qgschunkboundsentity_p.cpp
@@ -48,9 +48,9 @@ void LineMeshGeometry::setVertices( const QList<QVector3D> &vertices )
     rawVertexArray[idx++] = v.x();
     rawVertexArray[idx++] = v.y();
     rawVertexArray[idx++] = v.z();
-    mVertices.append( v );
   }
 
+  mVertexCount = vertices.count();
   mVertexBuffer->setData( vertexBufferData );
 }
 
diff --git a/src/3d/chunks/qgschunkboundsentity_p.h b/src/3d/chunks/qgschunkboundsentity_p.h
@@ -67,15 +67,15 @@ class LineMeshGeometry : public Qt3DRender::QGeometry
 
     int vertexCount()
     {
-      return mVertices.size();
+      return mVertexCount;
     }
 
     void setVertices( const QList<QVector3D> &vertices );
 
   private:
     Qt3DRender::QAttribute *mPositionAttribute = nullptr;
     Qt3DRender::QBuffer *mVertexBuffer = nullptr;
-    QList<QVector3D> mVertices;
+    int mVertexCount = 0;
 
 };
 

Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@ void LineMeshGeometry::setVertices( const QList<QVector3D> &vertices )`
`48`	`48`	`rawVertexArray[idx++] = v.x();`
`49`	`49`	`rawVertexArray[idx++] = v.y();`
`50`	`50`	`rawVertexArray[idx++] = v.z();`
`51`		`- mVertices.append( v );`
`52`	`51`	`}`
`53`	`52`
	`53`	`+ mVertexCount = vertices.count();`
`54`	`54`	`mVertexBuffer->setData( vertexBufferData );`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -67,15 +67,15 @@ class LineMeshGeometry : public Qt3DRender::QGeometry`
`67`	`67`
`68`	`68`	`int vertexCount()`
`69`	`69`	`{`
`70`		`- return mVertices.size();`
	`70`	`+ return mVertexCount;`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`void setVertices( const QList<QVector3D> &vertices );`
`74`	`74`
`75`	`75`	`private:`
`76`	`76`	`Qt3DRender::QAttribute *mPositionAttribute = nullptr;`
`77`	`77`	`Qt3DRender::QBuffer *mVertexBuffer = nullptr;`
`78`		`- QList<QVector3D> mVertices;`
	`78`	`+ int mVertexCount = 0;`
`79`	`79`
`80`	`80`	`};`
`81`	`81`