1 files changed, 20 insertions, 4 deletions
diff --git a/src/datavisualization/utils/objecthelper_p.h b/src/datavisualization/utils/objecthelper_p.h
index 0260dd05..c84f53bd 100644
--- a/src/datavisualization/utils/objecthelper_p.h
+++ b/src/datavisualization/utils/objecthelper_p.h
@@ -31,22 +31,38 @@
 
 #include "datavisualizationglobal_p.h"
 #include "abstractobjecthelper_p.h"
-#include <QtGui/QOpenGLFunctions>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
+class Abstract3DRenderer;
+
 class ObjectHelper : public AbstractObjectHelper
 {
+private:
+    ObjectHelper(const QString &objectFile);
 public:
-    ObjectHelper(const QString &objectFile = QString());
     ~ObjectHelper();
 
-    void setObjectFile(const QString &objectFile);
+    static void resetObjectHelper(const Abstract3DRenderer *cacheId, ObjectHelper *&obj,
+                                  const QString &meshFile);
+    static void releaseObjectHelper(const Abstract3DRenderer *cacheId, ObjectHelper *&obj);
+    inline const QString &objectFile() { return m_objectFile; }
 
-    void load();
+    inline const QVector<unsigned short> &indices() const { return m_indices; }
+    inline const QVector<QVector3D> &indexedvertices() const { return m_indexedVertices; }
+    inline const QVector<QVector2D> &indexedUVs() const { return m_indexedUVs; }
+    inline const QVector<QVector3D> &indexedNormals() const { return m_indexedNormals; }
 
 private:
+    static ObjectHelper *getObjectHelper(const Abstract3DRenderer *cacheId,
+                                         const QString &objectFile);
+    void load();
+
     QString m_objectFile;
+    QVector<unsigned short> m_indices;
+    QVector<QVector3D> m_indexedVertices;
+    QVector<QVector2D> m_indexedUVs;
+    QVector<QVector3D> m_indexedNormals;
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION