diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-04-26 17:32:14 +0200 |
|---|---|---|
| committer | Franck Arrecot <franck.arrecot@gmail.com> | 2016-04-26 15:48:52 +0000 |
| commit | 900a187aee09b0a82a085979e6df9f275db2daca (patch) | |
| tree | c9e8cfc5a39e902075b7d9fbc8aba542311b451a /src/render/backend/renderview_p.h | |
| parent | 1dd56d12719bf13419c7f4f18e2d269f09baae6c (diff) | |
Moves QSortCriterion flag to QSortPolicy and remove it
Change-Id: I44f71671ead23256d5fdc621545492885ff940a5
Task-id: QTBUG-51486
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/renderview_p.h')
| -rw-r--r-- | src/render/backend/renderview_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h index ab5655a97..f47871874 100644 --- a/src/render/backend/renderview_p.h +++ b/src/render/backend/renderview_p.h @@ -58,6 +58,7 @@ #include <Qt3DRender/private/cameralens_p.h> #include <Qt3DRender/private/attachmentpack_p.h> #include <Qt3DRender/private/handle_types_p.h> +#include <Qt3DRender/private/qsortpolicy_p.h> #include <Qt3DRender/qparameter.h> #include <Qt3DCore/private/qframeallocator_p.h> @@ -242,7 +243,7 @@ public: void setRenderTargetHandle(HTarget renderTargetHandle) Q_DECL_NOEXCEPT { m_renderTarget = renderTargetHandle; } HTarget renderTargetHandle() const Q_DECL_NOEXCEPT { return m_renderTarget; } - void addSortCriteria(const QVector<Qt3DCore::QNodeId> &sortMethodUid) { m_data->m_sortingCriteria.append(sortMethodUid); } + void addSortType(const QVector<Qt3DRender::QSortPolicy::SortType> &sortTypes) { m_data->m_sortingTypes.append(sortTypes); } void setSurface(QSurface *surface) { m_surface = surface; } QSurface *surface() const { return m_surface; } @@ -265,7 +266,7 @@ public: QMatrix4x4 *m_viewProjectionMatrix; QStringList m_layers; // Only for debug QVector<int> m_layerIds; - QVector<Qt3DCore::QNodeId> m_sortingCriteria; + QVector<Qt3DRender::QSortPolicy::SortType> m_sortingTypes; QVector3D m_eyePos; UniformBlockValueBuilder m_uniformBlockBuilder; }; |