From e2904862ff62240345adaac4cef5ffd55e208a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 27 Feb 2014 08:43:13 +0200 Subject: Q3DCamera doc and API update Change-Id: Id33645c7f921ad7289c2e368a656ee1c7b2d69ea Reviewed-by: Miikka Heikkinen --- src/datavisualization/engine/q3dcamera.cpp | 10 +++++----- src/datavisualization/engine/q3dcamera.h | 10 +++++----- src/datavisualization/engine/q3dcamera_p.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp index c7342aa9..50f2e319 100644 --- a/src/datavisualization/engine/q3dcamera.cpp +++ b/src/datavisualization/engine/q3dcamera.cpp @@ -403,12 +403,12 @@ void Q3DCamera::setCameraPreset(CameraPreset preset) * This property contains the the camera zoom level in percentage. \c 100.0f means there is no zoom * in or out set in the camera. */ -int Q3DCamera::zoomLevel() const +float Q3DCamera::zoomLevel() const { return d_ptr->m_zoomLevel; } -void Q3DCamera::setZoomLevel(int zoomLevel) +void Q3DCamera::setZoomLevel(float zoomLevel) { if (d_ptr->m_zoomLevel != zoomLevel) { d_ptr->m_zoomLevel = zoomLevel; @@ -479,9 +479,9 @@ Q3DCameraPrivate::Q3DCameraPrivate(Q3DCamera *q) : m_minYRotation(0.0f), m_maxXRotation(180.0f), m_maxYRotation(90.0f), + m_zoomLevel(100.0f), m_wrapXRotation(true), m_wrapYRotation(false), - m_zoomLevel(100), m_activePreset(Q3DCamera::CameraPresetNone) { } @@ -642,7 +642,7 @@ void Q3DCameraPrivate::updateViewMatrix(float zoomAdjustment) if (!m_isViewMatrixUpdateActive) return; - int zoom = m_zoomLevel * zoomAdjustment; + GLfloat zoom = m_zoomLevel * zoomAdjustment; QMatrix4x4 viewMatrix; // Apply to view matrix @@ -656,7 +656,7 @@ void Q3DCameraPrivate::updateViewMatrix(float zoomAdjustment) // y rotation is always "clean" viewMatrix.rotate(m_yRotation, 1.0f, 0.0f, 0.0f); // handle zoom by scaling - viewMatrix.scale((GLfloat)zoom / 100.0f); + viewMatrix.scale(zoom / 100.0f); // Compensate for translation (if d_ptr->m_target is off origin) viewMatrix.translate(-m_target.x(), -m_target.y(), -m_target.z()); diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h index 87602e5c..277035f4 100644 --- a/src/datavisualization/engine/q3dcamera.h +++ b/src/datavisualization/engine/q3dcamera.h @@ -31,7 +31,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DCamera : public Q3DObject Q_ENUMS(CameraPreset) Q_PROPERTY(float xRotation READ xRotation WRITE setXRotation NOTIFY xRotationChanged) Q_PROPERTY(float yRotation READ yRotation WRITE setYRotation NOTIFY yRotationChanged) - Q_PROPERTY(int zoomLevel READ zoomLevel WRITE setZoomLevel NOTIFY zoomLevelChanged) + Q_PROPERTY(float zoomLevel READ zoomLevel WRITE setZoomLevel NOTIFY zoomLevelChanged) Q_PROPERTY(CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset NOTIFY cameraPresetChanged) Q_PROPERTY(bool wrapXRotation READ wrapXRotation WRITE setWrapXRotation NOTIFY wrapXRotationChanged) Q_PROPERTY(bool wrapYRotation READ wrapYRotation WRITE setWrapYRotation NOTIFY wrapYRotationChanged) @@ -84,15 +84,15 @@ public: CameraPreset cameraPreset() const; void setCameraPreset(CameraPreset preset); - int zoomLevel() const; - void setZoomLevel(int zoomLevel); + float zoomLevel() const; + void setZoomLevel(float zoomLevel); - void setCameraPosition(float horizontal, float vertical, float distance = 100.0f); + void setCameraPosition(float horizontal, float vertical, float zoom = 100.0f); signals: void xRotationChanged(float rotation); void yRotationChanged(float rotation); - void zoomLevelChanged(int zoomLevel); + void zoomLevelChanged(float zoomLevel); void cameraPresetChanged(CameraPreset preset); void wrapXRotationChanged(bool isEnabled); void wrapYRotationChanged(bool isEnabled); diff --git a/src/datavisualization/engine/q3dcamera_p.h b/src/datavisualization/engine/q3dcamera_p.h index 884229e3..01e7a508 100644 --- a/src/datavisualization/engine/q3dcamera_p.h +++ b/src/datavisualization/engine/q3dcamera_p.h @@ -96,9 +96,9 @@ public: GLfloat m_minYRotation; GLfloat m_maxXRotation; GLfloat m_maxYRotation; + GLfloat m_zoomLevel; bool m_wrapXRotation; bool m_wrapYRotation; - int m_zoomLevel; Q3DCamera::CameraPreset m_activePreset; friend class Bars3DRenderer; -- cgit v1.2.3