diff options
| author | Keränen Pasi <pasi.keranen@digia.com> | 2013-08-23 16:17:29 +0300 |
|---|---|---|
| committer | Pasi Keränen <pasi.keranen@digia.com> | 2013-09-10 09:46:55 +0300 |
| commit | f3e38983d77c72f3121c33a149a58fdf9c64158c (patch) | |
| tree | d7aebaed7e6e8b4570f8d96f195d1dca42c56f03 /src/datavis3d/engine/drawer.cpp | |
| parent | a88d9cacf7465ea0a1b5eb642f6c2f9cc7ad971d (diff) | |
New 3D scene for lights and camera setup for input handlers.
Change-Id: Ib909bd818364c1646615df7c543d57b07b920a83
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavis3d/engine/drawer.cpp')
| -rw-r--r-- | src/datavis3d/engine/drawer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavis3d/engine/drawer.cpp b/src/datavis3d/engine/drawer.cpp index 284d5675..aa16205f 100644 --- a/src/datavis3d/engine/drawer.cpp +++ b/src/datavis3d/engine/drawer.cpp @@ -22,7 +22,7 @@ #include "objecthelper_p.h" #include "abstractobjecthelper_p.h" #include "surfaceobject_p.h" -#include "camerahelper_p.h" +#include "q3dcamera.h" #include "utils_p.h" #include "texturehelper_p.h" #include <QMatrix4x4> @@ -181,7 +181,7 @@ void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelIte const QVector3D &positionComp, const QVector3D &rotation, GLfloat itemHeight, QDataVis::SelectionMode mode, ShaderHelper *shader, ObjectHelper *object, - CameraHelper *camera, + const Q3DCamera *camera, bool useDepth, bool rotateAlong, LabelPosition position, Qt::AlignmentFlag alignment) { @@ -296,7 +296,7 @@ void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelIte if (useDepth && !rotateAlong) { // Apply negative camera rotations to keep labels facing camera - QPointF camRotations = camera->getCameraRotations(); + QPointF camRotations = camera->rotations(); modelMatrix.rotate(-camRotations.x(), 0.0f, 1.0f, 0.0f); modelMatrix.rotate(-camRotations.y(), 1.0f, 0.0f, 0.0f); } |