summaryrefslogtreecommitdiffstats
path: root/src/datavis3d/engine/scatter3drenderer_p.h
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-08-14 13:50:52 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-08-14 13:52:21 +0300
commit3b7fb533df9212df76c7c90a067ae3a3219b003a (patch)
treeeef561dcf6cdf9319a74e78d615bb210620383f3 /src/datavis3d/engine/scatter3drenderer_p.h
parent31714127f9ad60bd3f0fc4ea29531f759503241d (diff)
Enums moved to a class to be usable from QML and C++
Task-number: QTRD-2126 Change-Id: I280047cc7101292d17111babb7735c03436a40f4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavis3d/engine/scatter3drenderer_p.h')
-rw-r--r--src/datavis3d/engine/scatter3drenderer_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavis3d/engine/scatter3drenderer_p.h b/src/datavis3d/engine/scatter3drenderer_p.h
index 4d4c8a19..bae41a14 100644
--- a/src/datavis3d/engine/scatter3drenderer_p.h
+++ b/src/datavis3d/engine/scatter3drenderer_p.h
@@ -75,7 +75,7 @@ private:
// Cached state based on emitted signals from the controller
QString m_cachedObjFile;
- SelectionMode m_cachedSelectionMode;
+ QDataVis::SelectionMode m_cachedSelectionMode;
int m_cachedZoomLevel;
bool m_cachedIsGridEnabled;
bool m_cachedIsBackgroundEnabled;
@@ -137,7 +137,7 @@ public:
QRect mainViewPort();
public slots:
- void updateSelectionMode(SelectionMode newMode);
+ void updateSelectionMode(QDataVis::SelectionMode newMode);
void updateZoomLevel(int newZoomLevel);
void updateGridEnabled(bool enable);
void updateBackgroundEnabled(bool enable);
@@ -158,7 +158,7 @@ private:
virtual void initializePreOpenGL();
virtual void initializeOpenGL();
virtual void initShaders(const QString &vertexShader, const QString &fragmentShader);
- virtual void updateShadowQuality(ShadowQuality quality);
+ virtual void updateShadowQuality(QDataVis::ShadowQuality quality);
virtual void updateTextures();
void drawScene(CameraHelper *camera, const GLuint defaultFboHandle);