diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-05 12:00:24 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-05 12:03:16 +0300 |
commit | cfbfbea7d932f98c3f541bb4fc3e975ffb7a5658 (patch) | |
tree | bed376368e9611c751cf1dd75b85de2827d67325 /src/datavisualization/utils/objecthelper_p.h | |
parent | 8435c15d224a4e9db0920ecd33c4bea3e70d83bf (diff) | |
parent | c51e0f83ef6dd9e85db6953995585ba0cafb35d7 (diff) |
Merge branch 'develop'
Change-Id: I3d06158cec5e54f69ff3d0606b7d1dfe1a8a2f70
Diffstat (limited to 'src/datavisualization/utils/objecthelper_p.h')
-rw-r--r-- | src/datavisualization/utils/objecthelper_p.h | 24 |
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 |