diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-15 10:32:03 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-15 10:40:38 +0300 |
commit | a30c0c304e55ffe30545ab0838e4dbe11a99b8da (patch) | |
tree | ce6ccc0e4de8e350aebec466ff0a70c0fd7710bc /src/datavisualization/engine/abstract3dcontroller_p.h | |
parent | 79646ac9664745701667104c19bbae8cba8fd2e3 (diff) |
Add custom item support, part 1
Task-number: QTRD-2866
+ Added API for adding and removing custom items
+ Added custom data and custom render items
+ Added shaders for textured objects
+ Added custom item rendering draft to scatter
+ Fixed some shaders
- to be continued in part 2
Change-Id: I9735fd02fc9e86ae486cca4c06f6d7f2a4b0b7da
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3dcontroller_p.h')
-rw-r--r-- | src/datavisualization/engine/abstract3dcontroller_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index 4f597769..98df8fda 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -35,6 +35,7 @@ #include "qabstract3dinputhandler.h" #include "qabstractdataproxy.h" #include "q3dscene_p.h" +#include "customdataitem_p.h" #include <QtGui/QLinearGradient> #include <QtCore/QTime> @@ -155,6 +156,7 @@ protected: QList<QAbstract3DAxis *> m_axes; // List of all added axes Abstract3DRenderer *m_renderer; bool m_isDataDirty; + bool m_isCustomDataDirty; bool m_isSeriesVisualsDirty; bool m_renderPending; @@ -167,6 +169,8 @@ protected: QVector<QAbstract3DSeries *> m_changedSeriesList; + QList<CustomDataItem *> m_customItems; + explicit Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent = 0); public: @@ -226,6 +230,10 @@ public: void requestRender(QOpenGLFramebufferObject *fbo); + int addCustomItem(const QString &meshFile, const QVector3D &position, const QVector3D &scaling, + const QQuaternion &rotation, const QImage &textureImage); + void deleteCustomItem(int index); + void emitNeedRender(); virtual void clearSelection() = 0; |