diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-05-21 13:37:11 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-05-22 08:03:06 +0300 |
commit | cb79f11be1c0c379a1eccea62606a58b73442f2f (patch) | |
tree | 0e8409d491897b4fc9d1929ea1e13e575c6b7198 /src/datavisualization/engine/selectionpointer_p.h | |
parent | 37a82fbeb7aa59260fe5f31b62228914ee4a44a3 (diff) |
Cache ObjectHelper instances
Task-number: QTRD-2792
Change-Id: I90d83bd9b73a0f337fd26f1b92000e72b3ec0607
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/selectionpointer_p.h')
-rw-r--r-- | src/datavisualization/engine/selectionpointer_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/engine/selectionpointer_p.h b/src/datavisualization/engine/selectionpointer_p.h index 03e09cca..f33cd6cd 100644 --- a/src/datavisualization/engine/selectionpointer_p.h +++ b/src/datavisualization/engine/selectionpointer_p.h @@ -53,6 +53,7 @@ public: void setPosition(const QVector3D &position); void setLabel(const QString &label); void setPointerObject(ObjectHelper *object); + void setLabelObject(ObjectHelper *object); void handleDrawerChange(); void updateBoundingRect(const QRect &rect); void updateScene(Q3DScene *scene); @@ -63,12 +64,11 @@ public: private: void initializeOpenGL(); void initShaders(); - void loadLabelMesh(); private: ShaderHelper *m_labelShader; ShaderHelper *m_pointShader; - ObjectHelper *m_labelObj; + ObjectHelper *m_labelObj; // Not owned ObjectHelper *m_pointObj; // Not owned TextureHelper *m_textureHelper; Q3DTheme *m_cachedTheme; |