changed glPointCloud to a unique pointer to avoid memory leakage, because GLObject does not define a copy operator.

Author: MEpping

include/pointcloud.h

@@ -3,6 +3,7 @@
 #include "glpointcloud.h"
 #include <QVector3D>
 #include <QOpenGLFunctions_4_3_Core>
+#include <memory>
 
 class PointCloud
 {
@@ -13,7 +14,7 @@ class PointCloud
 
 	int pointcloudId_;
 	bool isVisible_;
-	GLPointCloud glPointCloud_;
+	std::unique_ptr<GLPointCloud> glPointCloud_;
 	QImage colorscheme;				// Color scheme of the point cloud. The line from texture coordinates (0,0) to (1,1) defines color(intensity)
 
 private:

src/glwidget.cpp

@@ -192,8 +192,8 @@ GLWidget::paintGL()
             RenderObject(object);
     }
 
-	if (pointcloud_.isVisible_) {
-		RenderObject(&pointcloud_.glPointCloud_);
+	if (pointcloud_.isVisible_ && pointcloud_.glPointCloud_ != nullptr) {
+		RenderObject(pointcloud_.glPointCloud_.get());
 	}
 
     foreach (GLObject* object, simulationObjects_)

src/pointcloud.cpp

@@ -4,10 +4,8 @@ PointCloud::PointCloud(int id, QOpenGLFunctions_4_3_Core* functions, const QStri
 	: pointcloudId_(id),
 	  isVisible_(true),
 	  functions_(functions),
-	  srcPath_(srcPath),
-	  glPointCloud_(functions, srcPath)
+	  srcPath_(srcPath)
 {
-	glPointCloud_.id_ = "point_cloud_"+QString::number(id);
 	if (!colorscheme.load(srcPath + "Resources/Images/PointCloudColors.png")) {
 		qDebug() << "Failed to open point cloud color scheme (" << srcPath << "Resources/Images/PointCloudColors.png)";
 	}
@@ -17,17 +15,17 @@ PointCloud::PointCloud(int id, QOpenGLFunctions_4_3_Core* functions, const QStri
 void
 PointCloud::UpdatePointCloud(const QVector<PointStruct>& pm)
 {
-	glPointCloud_ = GLPointCloud(functions_, srcPath_);
-	glPointCloud_.id_ = "point_cloud_" + QString::number(pointcloudId_);
+	glPointCloud_ = std::make_unique<GLPointCloud>(functions_, srcPath_);
+	glPointCloud_->id_ = "point_cloud_" + QString::number(pointcloudId_);
 	// Copy data from pm to glPointCloud_
 	for (const PointStruct& p : pm) {
-		glPointCloud_.vertices_.append(p.position);
-		glPointCloud_.texCoords_.append(QVector2D(p.color, p.color));
+		glPointCloud_->vertices_.append(p.position);
+		glPointCloud_->texCoords_.append(QVector2D(p.color, p.color));
 	}
 	// set up the globject
-	glPointCloud_.Init();
-	glPointCloud_.SetColor(Qt::white);
-	glPointCloud_.SetTexture(colorscheme, false, GL_CLAMP_TO_EDGE);
-	glPointCloud_.SetObjectType(ObjectType::None);
-	glPointCloud_.UpdateVertexBuffer();
+	glPointCloud_->Init();
+	glPointCloud_->SetColor(Qt::white);
+	glPointCloud_->SetTexture(colorscheme, false, GL_CLAMP_TO_EDGE);
+	glPointCloud_->SetObjectType(ObjectType::None);
+	glPointCloud_->UpdateVertexBuffer();
 }