diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-01-25 15:20:18 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-01-25 15:20:18 +0000 |
| commit | ab365ba991ec006711550511da471e4c93e01a04 (patch) | |
| tree | 9221ebfa15a59ddaa1ad5089abddb848ee837ffb /src/render/frontend/qcameralens.cpp | |
| parent | 4ae7cc93b503cc31272f0b55c84410af30aea8b9 (diff) | |
| parent | df5a63b059956e8a717db9110327cc86612cc934 (diff) | |
Merge remote-tracking branch 5.14 into 5.15
* origin/5.14:
Fix usage of C++14 features
Use animation rather than event to drive simulation
Fix for incorrect QML property names in GeometryRenderer doc
Add viewAll support for orthographic projection mode
Change-Id: I397bdee907389a6f5cabb8390a805fa9a89ed4ca
Diffstat (limited to 'src/render/frontend/qcameralens.cpp')
| -rw-r--r-- | src/render/frontend/qcameralens.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/frontend/qcameralens.cpp b/src/render/frontend/qcameralens.cpp index 1d8059f45..621b22778 100644 --- a/src/render/frontend/qcameralens.cpp +++ b/src/render/frontend/qcameralens.cpp @@ -232,7 +232,7 @@ QCameraLensPrivate::QCameraLensPrivate() void QCameraLens::viewAll(Qt3DCore::QNodeId cameraId) { Q_D(QCameraLens); - if (d->m_projectionType == PerspectiveProjection) { + if (d->m_projectionType == PerspectiveProjection || d->m_projectionType == OrthographicProjection) { d->m_pendingViewAllRequest = {Qt3DCore::QNodeId::createId(), cameraId, {}}; d->update(); } @@ -241,7 +241,7 @@ void QCameraLens::viewAll(Qt3DCore::QNodeId cameraId) void QCameraLens::viewEntity(Qt3DCore::QNodeId entityId, Qt3DCore::QNodeId cameraId) { Q_D(QCameraLens); - if (d->m_projectionType == PerspectiveProjection) { + if (d->m_projectionType == PerspectiveProjection || d->m_projectionType == OrthographicProjection) { d->m_pendingViewAllRequest = {Qt3DCore::QNodeId::createId(), cameraId, entityId}; d->update(); } |