summaryrefslogtreecommitdiffstats
path: root/src/datavis3d/engine/surface3drenderer_p.h
diff options
context:
space:
mode:
authorMika Salmela <mika.salmela@digia.com>2013-07-03 14:12:22 +0300
committerMika Salmela <mika.salmela@digia.com>2013-07-03 14:38:17 +0300
commit28ed69c2f6ba8520dc0202b94a4a3f8260ccda7e (patch)
tree6fb61abc6ba0a84d6808882ec6cfb2fb20b0a4a3 /src/datavis3d/engine/surface3drenderer_p.h
parentb9286bfe3483f3eda2453df3bb15da4dbede594b (diff)
Rotation copied from 3dbars. MouseState enums moved to abstract.
Change-Id: Ied89bf206098a6452172ecde9231b8cd38fb82f7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavis3d/engine/surface3drenderer_p.h')
-rw-r--r--src/datavis3d/engine/surface3drenderer_p.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/datavis3d/engine/surface3drenderer_p.h b/src/datavis3d/engine/surface3drenderer_p.h
index 11cb380f..d2912c41 100644
--- a/src/datavis3d/engine/surface3drenderer_p.h
+++ b/src/datavis3d/engine/surface3drenderer_p.h
@@ -103,8 +103,6 @@ public:
ShadowQuality m_shadowQuality;
bool m_hasNegativeValues;
- CameraHelper *m_camera;
-
private:
// Data parameters
GLint m_tickYCount;
@@ -140,7 +138,7 @@ public:
~Surface3dRenderer();
void initializeOpenGL();
- void render(const GLuint defaultFboHandle = 0);
+ void render(CameraHelper *camera, const GLuint defaultFboHandle = 0);
// TODO: Not thread-safe, needs rethinking how axes create labels
Drawer *drawer() { return m_drawer; }
@@ -180,7 +178,7 @@ public:
void setXZStuff(GLint tickXCount, GLint tickZCount);
private:
- void drawScene(const GLuint defaultFboHandle);
+ void drawScene(CameraHelper *camera, const GLuint defaultFboHandle);
void calculateSceneScalingFactors();
void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader);