diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-16 11:49:13 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-10-17 21:16:10 +0200 |
| commit | c95de0fe0f73fec6cec90efe72e7290a77af2049 (patch) | |
| tree | 0fd314aedbc41c723d2c4e3334368fdcdba48913 /src/render/backend/framegraph | |
| parent | 5b5c93f8979d3d7c5d5bee46c6108861066e2a6d (diff) | |
Moved most of the managers into a single header file
Makes the project smaller and easier to understand.
Change-Id: I2ee5f8c88a61c70b2173c2d69d62a1cd9a646141
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend/framegraph')
4 files changed, 7 insertions, 6 deletions
diff --git a/src/render/backend/framegraph/framegraphnode.cpp b/src/render/backend/framegraph/framegraphnode.cpp index 5f9a0eb76..2817ebd3e 100644 --- a/src/render/backend/framegraph/framegraphnode.cpp +++ b/src/render/backend/framegraph/framegraphnode.cpp @@ -41,7 +41,6 @@ #include "framegraphnode_p.h" #include <Qt3DRenderer/private/renderer_p.h> -#include <Qt3DRenderer/private/framegraphmanager_p.h> #include <Qt3DRenderer/qframegraph.h> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/framegraph/framegraphnode_p.h b/src/render/backend/framegraph/framegraphnode_p.h index 4c0ca615b..2c69f9a71 100644 --- a/src/render/backend/framegraph/framegraphnode_p.h +++ b/src/render/backend/framegraph/framegraphnode_p.h @@ -44,9 +44,9 @@ #include <Qt3DCore/qhandle.h> #include <Qt3DCore/qnode.h> -#include <Qt3DRenderer/qframegraphitem.h> #include <Qt3DCore/qbackendnode.h> -#include <Qt3DRenderer/private/framegraphmanager_p.h> +#include <Qt3DRenderer/qframegraphitem.h> +#include <Qt3DRenderer/private/managers_p.h> #include <qglobal.h> #include <QVector> #include <QUuid> @@ -60,7 +60,9 @@ class QHandle; namespace Render { -class Renderer; +class FrameGraphNode; + +typedef QHandle<FrameGraphNode *, 8> HFrameGraphNode; class FrameGraphNode : public QBackendNode { diff --git a/src/render/backend/framegraph/sortcriterion.cpp b/src/render/backend/framegraph/sortcriterion.cpp index eba492a2d..c9cfecb8e 100644 --- a/src/render/backend/framegraph/sortcriterion.cpp +++ b/src/render/backend/framegraph/sortcriterion.cpp @@ -41,7 +41,7 @@ #include "sortcriterion_p.h" #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DRenderer/private/sortcriterionmanager_p.h> +#include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/framegraph/techniquefilternode.cpp b/src/render/backend/framegraph/techniquefilternode.cpp index eb0f91a49..7bf7cf320 100644 --- a/src/render/backend/framegraph/techniquefilternode.cpp +++ b/src/render/backend/framegraph/techniquefilternode.cpp @@ -42,7 +42,7 @@ #include "techniquefilternode_p.h" #include "qcriterion.h" #include "qtechniquefilter.h" -#include <Qt3DRenderer/private/criterionmanager_p.h> +#include <Qt3DRenderer/private/managers_p.h> #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE |