Cache ObjectHelper instances

Task-number: QTRD-2792
Change-Id: I90d83bd9b73a0f337fd26f1b92000e72b3ec0607
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 5 insertions, 10 deletions

diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp
index 646212f0..fe9325cf 100644
--- a/src/datavisualization/engine/selectionpointer.cpp
+++ b/src/datavisualization/engine/selectionpointer.cpp
@@ -54,7 +54,6 @@ SelectionPointer::~SelectionPointer()
 {
     delete m_labelShader;
     delete m_pointShader;
-    delete m_labelObj;
     delete m_textureHelper;
 }
 
@@ -66,7 +65,6 @@ void SelectionPointer::initializeOpenGL()
     m_drawer->initializeOpenGL();
 
     initShaders();
-    loadLabelMesh();
 }
 
 void SelectionPointer::updateScene(Q3DScene *scene)
@@ -235,6 +233,11 @@ void SelectionPointer::setPointerObject(ObjectHelper *object)
     m_pointObj = object;
 }
 
+void SelectionPointer::setLabelObject(ObjectHelper *object)
+{
+    m_labelObj = object;
+}
+
 void SelectionPointer::handleDrawerChange()
 {
     m_cachedTheme = m_drawer->theme();
@@ -269,12 +272,4 @@ void SelectionPointer::initShaders()
 
 }
 
-void SelectionPointer::loadLabelMesh()
-{
-    if (m_labelObj)
-        delete m_labelObj;
-    m_labelObj = new ObjectHelper(QStringLiteral(":/defaultMeshes/plane"));
-    m_labelObj->load();
-}
-
 QT_END_NAMESPACE_DATAVISUALIZATION