diff options
author | Keränen Pasi <pasi.keranen@digia.com> | 2013-12-16 16:17:07 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-17 12:52:03 +0200 |
commit | fba185e6c2fa5158aa60ba4468c1f1a70177f77a (patch) | |
tree | 4532ce4cc96fc52a32410f552e8557ea68d98267 /src/datavisualization/engine/abstract3dcontroller.cpp | |
parent | 018379d522deca3a6f7b184fbc12f122a87aaadc (diff) |
Antialiasing and direct rendering with QML.
Task-id: QTRD-2565
Change-Id: I4099c869f157361ee6a900dfc1c29301b373ac30
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3dcontroller.cpp')
-rw-r--r-- | src/datavisualization/engine/abstract3dcontroller.cpp | 109 |
1 files changed, 5 insertions, 104 deletions
diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index f2483216..7392b714 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -34,9 +34,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE -Abstract3DController::Abstract3DController(QRect boundRect, QObject *parent) : +Abstract3DController::Abstract3DController(QRect initialViewport, QObject *parent) : QObject(parent), - m_boundingRect(boundRect.x(), boundRect.y(), boundRect.width(), boundRect.height()), m_themeManager(new ThemeManager(this)), m_selectionMode(QDataVis::SelectionItem), m_shadowQuality(QDataVis::ShadowQualityMedium), @@ -54,6 +53,8 @@ Abstract3DController::Abstract3DController(QRect boundRect, QObject *parent) : // Set initial theme setTheme(new Q3DTheme(Q3DTheme::ThemeQt)); + m_scene->setViewport(initialViewport); + // Populate the scene m_scene->activeLight()->setPosition(defaultLightPos); @@ -133,17 +134,6 @@ void Abstract3DController::synchDataToRenderer() if (!m_renderer) return; - if (m_changeTracker.boundingRectChanged || m_changeTracker.sizeChanged) { - m_renderer->updateBoundingRect(m_boundingRect); - m_changeTracker.boundingRectChanged = false; - m_changeTracker.sizeChanged = false; - } - - if (m_changeTracker.positionChanged) { - m_renderer->updatePosition(m_boundingRect); - m_changeTracker.positionChanged = false; - } - m_renderer->updateScene(m_scene); m_renderer->updateTheme(m_themeManager->theme()); @@ -367,99 +357,10 @@ void Abstract3DController::wheelEvent(QWheelEvent *event) m_activeInputHandler->wheelEvent(event); } -void Abstract3DController::setSize(const int width, const int height) -{ - float devicePixelRatio = m_scene->devicePixelRatio(); - m_scene->setViewportSize(width, height); - m_boundingRect.setWidth(width * devicePixelRatio); - m_boundingRect.setHeight(height * devicePixelRatio); - - m_changeTracker.boundingRectChanged = true; - emitNeedRender(); -} - -void Abstract3DController::setBoundingRect(const QRect boundingRect) -{ - float devicePixelRatio = m_scene->devicePixelRatio(); - m_boundingRect = QRect(boundingRect.x() * devicePixelRatio, - boundingRect.y() * devicePixelRatio, - boundingRect.width() * devicePixelRatio, - boundingRect.height() * devicePixelRatio); - m_scene->setViewport(boundingRect); - - m_changeTracker.boundingRectChanged = true; - emitNeedRender(); -} - -void Abstract3DController::setWidth(const int width) -{ - m_boundingRect.setWidth(width * m_scene->devicePixelRatio()); - m_scene->setViewportSize(width, m_scene->viewport().height()); - - m_changeTracker.sizeChanged = true; - emitNeedRender(); -} - -void Abstract3DController::setHeight(const int height) -{ - m_boundingRect.setHeight(height * m_scene->devicePixelRatio()); - m_scene->setViewportSize(m_scene->viewport().width(), height); - - m_changeTracker.sizeChanged = true; - emitNeedRender(); -} - -void Abstract3DController::setX(const int x) -{ - m_boundingRect.setX(x * m_scene->devicePixelRatio()); - m_scene->setViewport( QRect(x, - m_scene->viewport().y(), - m_scene->viewport().width(), - m_scene->viewport().height())); - - m_changeTracker.positionChanged = true; - emitNeedRender(); -} - -void Abstract3DController::setY(const int y) -{ - m_boundingRect.setY(y * m_scene->devicePixelRatio()); - m_scene->setViewport( QRect(m_scene->viewport().x(), - y, - m_scene->viewport().width(), - m_scene->viewport().height())); - - m_changeTracker.positionChanged = true; - emitNeedRender(); -} - -QRect Abstract3DController::primarySubViewport() const -{ - return m_scene->primarySubViewport(); -} - -void Abstract3DController::setPrimarySubViewport(const QRect &primarySubViewport) -{ - m_scene->setPrimarySubViewport(primarySubViewport); -} - -QRect Abstract3DController::secondarySubViewport() const -{ - return m_scene->secondarySubViewport(); -} - -void Abstract3DController::setSecondarySubViewport(const QRect &secondarySubViewport) -{ - m_scene->setSecondarySubViewport(secondarySubViewport); -} - void Abstract3DController::handlePixelRatioChanged(float ratio) { - m_boundingRect.setX(ratio * m_scene->viewport().x()); - m_boundingRect.setY(ratio * m_scene->viewport().y()); - m_boundingRect.setWidth(ratio * m_scene->viewport().width()); - m_boundingRect.setHeight(ratio * m_scene->viewport().height()); - m_changeTracker.boundingRectChanged = true; + Q_UNUSED(ratio); + emitNeedRender(); } |