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 --- .../datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml | 6 +++--- src/datavisualization/engine/q3dcamera.cpp | 10 +++++----- src/datavisualization/engine/q3dcamera.h | 10 +++++----- src/datavisualization/engine/q3dcamera_p.h | 2 +- tests/kinectsurface/surfacedata.cpp | 6 +++--- tests/multigraphs/data.cpp | 6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml index 46ff2067..9f0227ae 100644 --- a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml +++ b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml @@ -190,9 +190,9 @@ Rectangle { surfaceGraph.scene.activeCamera.cameraPreset = Camera3D.CameraPresetIsometricLeftHigh scatterGraph.scene.activeCamera.cameraPreset = Camera3D.CameraPresetIsometricLeftHigh barGraph.scene.activeCamera.cameraPreset = Camera3D.CameraPresetIsometricLeftHigh - surfaceGraph.scene.activeCamera.zoomLevel = 100 - scatterGraph.scene.activeCamera.zoomLevel = 100 - barGraph.scene.activeCamera.zoomLevel = 100 + surfaceGraph.scene.activeCamera.zoomLevel = 100.0 + scatterGraph.scene.activeCamera.zoomLevel = 100.0 + barGraph.scene.activeCamera.zoomLevel = 100.0 } function toggleMeshStyle() { 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; diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/kinectsurface/surfacedata.cpp index 14f37288..b1c173cd 100644 --- a/tests/kinectsurface/surfacedata.cpp +++ b/tests/kinectsurface/surfacedata.cpp @@ -90,7 +90,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars gradient.setColorAt(1.0, Qt::yellow); m_surface->setSelectionMode(QAbstract3DGraph::SelectionNone); m_surface->setShadowQuality(QAbstract3DGraph::ShadowQualityNone); - m_surface->scene()->activeCamera()->setCameraPosition(0.0, 90.0, 150); + m_surface->scene()->activeCamera()->setCameraPosition(0.0, 90.0, 150.0); m_surface->axisY()->setMax(255); QSurface3DSeries *series1 = new QSurface3DSeries(new QHeightMapSurfaceDataProxy()); series1->setFlatShadingEnabled(true); @@ -102,7 +102,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars m_scatter->setSelectionMode(QAbstract3DGraph::SelectionNone); m_scatter->activeTheme()->setGridEnabled(false); m_scatter->setShadowQuality(QAbstract3DGraph::ShadowQualityLow); - m_scatter->scene()->activeCamera()->setCameraPosition(0.0, 60.0, 150); + m_scatter->scene()->activeCamera()->setCameraPosition(0.0, 60.0, 150.0); QScatter3DSeries *series2 = new QScatter3DSeries; #ifdef LOW_END_DEVICE series2->setMesh(QAbstract3DSeries::MeshPoint); @@ -138,7 +138,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars m_bars->setShadowQuality(QAbstract3DGraph::ShadowQualityLow); #endif m_bars->setBarSpacing(QSizeF(0.0, 0.0)); - m_bars->scene()->activeCamera()->setCameraPosition(0.0, 65.0, 130); + m_bars->scene()->activeCamera()->setCameraPosition(0.0, 65.0, 130.0); QBar3DSeries *series3 = new QBar3DSeries; series3->setMesh(QAbstract3DSeries::MeshBar); m_bars->addSeries(series3); diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp index 9fd27b96..dc736d46 100644 --- a/tests/multigraphs/data.cpp +++ b/tests/multigraphs/data.cpp @@ -56,7 +56,7 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, m_surface->setSelectionMode(QAbstract3DGraph::SelectionNone); m_surface->activeTheme()->setGridEnabled(false); m_surface->activeTheme()->setBackgroundEnabled(false); - m_surface->scene()->activeCamera()->setCameraPosition(0.0, 90.0, 150); + m_surface->scene()->activeCamera()->setCameraPosition(0.0, 90.0, 150.0); QSurface3DSeries *series1 = new QSurface3DSeries(new QHeightMapSurfaceDataProxy()); series1->setFlatShadingEnabled(true); series1->setDrawMode(QSurface3DSeries::DrawSurface); @@ -69,7 +69,7 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, m_scatter->setSelectionMode(QAbstract3DGraph::SelectionNone); m_scatter->activeTheme()->setGridEnabled(false); m_scatter->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftLow); - m_scatter->scene()->activeCamera()->setCameraPosition(0.0, 85.0, 150); + m_scatter->scene()->activeCamera()->setCameraPosition(0.0, 85.0, 150.0); QScatter3DSeries *series2 = new QScatter3DSeries; series2->setMesh(QAbstract3DSeries::MeshPoint); m_scatter->addSeries(series2); @@ -80,7 +80,7 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, m_bars->activeTheme()->setGridEnabled(false); m_bars->setShadowQuality(QAbstract3DGraph::ShadowQualityLow); m_bars->setBarSpacing(QSizeF(0.0, 0.0)); - m_bars->scene()->activeCamera()->setCameraPosition(0.0, 75.0, 150); + m_bars->scene()->activeCamera()->setCameraPosition(0.0, 75.0, 150.0); QBar3DSeries *series3 = new QBar3DSeries; series3->setMesh(QAbstract3DSeries::MeshBar); m_bars->addSeries(series3); -- cgit v1.2.3