diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-07-08 15:11:06 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-07-09 07:40:05 +0300 |
| commit | 24275c551f0a10df022f037962d1678b7213ef09 (patch) | |
| tree | 310a339c2c1582d68618881c905fd32dd64f2f5e /src/datavis3d/engine/drawer_p.h | |
| parent | d9267977b3f5bb8ab5573c29f0721a07397e5b82 (diff) | |
Refactor data item
Data items do not need to know about rendering related stuff,
so separated that to render items. Renderer will maintain
array of render items equal to the sample space.
Change-Id: I61c0db96f115b7c667e37ea92aa5ae6b8583c61a
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavis3d/engine/drawer_p.h')
| -rw-r--r-- | src/datavis3d/engine/drawer_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavis3d/engine/drawer_p.h b/src/datavis3d/engine/drawer_p.h index e822d79f..0657da0c 100644 --- a/src/datavis3d/engine/drawer_p.h +++ b/src/datavis3d/engine/drawer_p.h @@ -56,7 +56,7 @@ #include "q3dbars.h" #include "theme_p.h" #include "labelitem_p.h" -#include "qabstractdataitem.h" +#include "abstractrenderitem_p.h" #include <QFont> QT_DATAVIS3D_BEGIN_NAMESPACE @@ -82,7 +82,7 @@ public: void drawObject(ShaderHelper *shader, ObjectHelper *object, GLuint textureId = 0, GLuint depthTextureId = 0); - void drawLabel(const QAbstractDataItem &item, const LabelItem &label, + void drawLabel(const AbstractRenderItem &item, const LabelItem &label, const QMatrix4x4 &viewmatrix, const QMatrix4x4 &projectionmatrix, const QVector3D &positionComp, const QVector3D &rotation, GLfloat maxHeight, SelectionMode mode, ShaderHelper *shader, ObjectHelper *object, @@ -91,7 +91,7 @@ public: LabelPosition position = LabelOver, Qt::AlignmentFlag alignment = Qt::AlignCenter); - void generateLabelTexture(QAbstractDataItem *item); + void generateLabelTexture(AbstractRenderItem *item); void generateLabelItem(LabelItem &item, const QString &text); Q_SIGNALS: |