diff options
Diffstat (limited to 'src/render/framegraph')
30 files changed, 68 insertions, 170 deletions
diff --git a/src/render/framegraph/blitframebuffer.cpp b/src/render/framegraph/blitframebuffer.cpp index 61bb28754..0398abe81 100644 --- a/src/render/framegraph/blitframebuffer.cpp +++ b/src/render/framegraph/blitframebuffer.cpp @@ -6,11 +6,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + BlitFramebuffer::BlitFramebuffer() : FrameGraphNode(FrameGraphNode::BlitFramebuffer) , m_sourceRenderTargetId(Qt3DCore::QNodeId()) diff --git a/src/render/framegraph/cameraselectornode.cpp b/src/render/framegraph/cameraselectornode.cpp index 57210d277..19b986fc4 100644 --- a/src/render/framegraph/cameraselectornode.cpp +++ b/src/render/framegraph/cameraselectornode.cpp @@ -10,11 +10,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + CameraSelector::CameraSelector() : FrameGraphNode(FrameGraphNode::CameraSelector) { diff --git a/src/render/framegraph/clearbuffers.cpp b/src/render/framegraph/clearbuffers.cpp index 61e91b9e5..c279f67d9 100644 --- a/src/render/framegraph/clearbuffers.cpp +++ b/src/render/framegraph/clearbuffers.cpp @@ -6,11 +6,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + static QVector4D vec4dFromColor(const QColor &color) { if (!color.isValid()) diff --git a/src/render/framegraph/framegraph.pri b/src/render/framegraph/framegraph.pri deleted file mode 100644 index 61a75cae0..000000000 --- a/src/render/framegraph/framegraph.pri +++ /dev/null @@ -1,124 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/cameraselectornode_p.h \ - $$PWD/clearbuffers_p.h \ - $$PWD/framegraphnode_p.h \ - $$PWD/framegraphvisitor_p.h \ - $$PWD/layerfilternode_p.h \ - $$PWD/nodraw_p.h \ - $$PWD/qcameraselector.h \ - $$PWD/qcameraselector_p.h \ - $$PWD/qclearbuffers.h \ - $$PWD/qclearbuffers_p.h \ - $$PWD/qframegraphnode.h \ - $$PWD/qframegraphnode_p.h \ - $$PWD/qlayerfilter.h \ - $$PWD/qlayerfilter_p.h \ - $$PWD/qnodraw.h \ - $$PWD/qrenderpassfilter.h \ - $$PWD/qrenderpassfilter_p.h \ - $$PWD/qrendertargetselector.h \ - $$PWD/qrendertargetselector_p.h \ - $$PWD/qsortpolicy.h \ - $$PWD/qsortpolicy_p.h \ - $$PWD/qrenderstateset.h \ - $$PWD/qrenderstateset_p.h \ - $$PWD/qtechniquefilter.h \ - $$PWD/qtechniquefilter_p.h \ - $$PWD/qviewport.h \ - $$PWD/qviewport_p.h \ - $$PWD/renderpassfilternode_p.h \ - $$PWD/rendertargetselectornode_p.h \ - $$PWD/sortpolicy_p.h \ - $$PWD/statesetnode_p.h \ - $$PWD/techniquefilternode_p.h \ - $$PWD/viewportnode_p.h \ - $$PWD/qfrustumculling.h \ - $$PWD/frustumculling_p.h \ - $$PWD/qdispatchcompute.h \ - $$PWD/dispatchcompute_p.h \ - $$PWD/qrendersurfaceselector.h \ - $$PWD/qrendersurfaceselector_p.h \ - $$PWD/rendersurfaceselector_p.h \ - $$PWD/qdispatchcompute_p.h \ - $$PWD/qrendercapture.h \ - $$PWD/qrendercapture_p.h \ - $$PWD/rendercapture_p.h \ - $$PWD/qbuffercapture.h \ - $$PWD/qbuffercapture_p.h \ - $$PWD/buffercapture_p.h \ - $$PWD/qmemorybarrier.h \ - $$PWD/qmemorybarrier_p.h \ - $$PWD/memorybarrier_p.h \ - $$PWD/qproximityfilter.h \ - $$PWD/qproximityfilter_p.h \ - $$PWD/proximityfilter_p.h \ - $$PWD/qblitframebuffer.h \ - $$PWD/qblitframebuffer_p.h \ - $$PWD/blitframebuffer_p.h \ - $$PWD/qsetfence.h \ - $$PWD/qwaitfence.h \ - $$PWD/qwaitfence_p.h \ - $$PWD/qsetfence_p.h \ - $$PWD/setfence_p.h \ - $$PWD/waitfence_p.h \ - $$PWD/qnopicking.h \ - $$PWD/nopicking_p.h \ - $$PWD/qsubtreeenabler.h \ - $$PWD/qsubtreeenabler_p.h \ - $$PWD/subtreeenabler_p.h \ - $$PWD/qdebugoverlay.h \ - $$PWD/qdebugoverlay_p.h \ - $$PWD/debugoverlay_p.h - -SOURCES += \ - $$PWD/cameraselectornode.cpp \ - $$PWD/clearbuffers.cpp \ - $$PWD/framegraphnode.cpp \ - $$PWD/framegraphvisitor.cpp \ - $$PWD/layerfilternode.cpp \ - $$PWD/nodraw.cpp \ - $$PWD/qcameraselector.cpp \ - $$PWD/qclearbuffers.cpp \ - $$PWD/qframegraphnode.cpp \ - $$PWD/qlayerfilter.cpp \ - $$PWD/qnodraw.cpp \ - $$PWD/qrenderpassfilter.cpp \ - $$PWD/qrendertargetselector.cpp \ - $$PWD/qsortpolicy.cpp \ - $$PWD/qrenderstateset.cpp \ - $$PWD/qtechniquefilter.cpp \ - $$PWD/qviewport.cpp \ - $$PWD/renderpassfilternode.cpp \ - $$PWD/rendertargetselectornode.cpp \ - $$PWD/sortpolicy.cpp \ - $$PWD/statesetnode.cpp \ - $$PWD/techniquefilternode.cpp \ - $$PWD/viewportnode.cpp \ - $$PWD/qfrustumculling.cpp \ - $$PWD/frustumculling.cpp \ - $$PWD/qdispatchcompute.cpp \ - $$PWD/dispatchcompute.cpp \ - $$PWD/qrendersurfaceselector.cpp \ - $$PWD/rendersurfaceselector.cpp \ - $$PWD/qrendercapture.cpp \ - $$PWD/rendercapture.cpp \ - $$PWD/qbuffercapture.cpp \ - $$PWD/buffercapture.cpp \ - $$PWD/qmemorybarrier.cpp \ - $$PWD/memorybarrier.cpp \ - $$PWD/qproximityfilter.cpp \ - $$PWD/proximityfilter.cpp \ - $$PWD/qblitframebuffer.cpp \ - $$PWD/blitframebuffer.cpp \ - $$PWD/qsetfence.cpp \ - $$PWD/qwaitfence.cpp \ - $$PWD/setfence.cpp \ - $$PWD/waitfence.cpp \ - $$PWD/qnopicking.cpp \ - $$PWD/nopicking.cpp \ - $$PWD/qsubtreeenabler.cpp \ - $$PWD/subtreeenabler.cpp \ - $$PWD/qdebugoverlay.cpp \ - $$PWD/debugoverlay.cpp diff --git a/src/render/framegraph/framegraphvisitor.cpp b/src/render/framegraph/framegraphvisitor.cpp index 16847128d..f49441033 100644 --- a/src/render/framegraph/framegraphvisitor.cpp +++ b/src/render/framegraph/framegraphvisitor.cpp @@ -12,11 +12,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + FrameGraphVisitor::FrameGraphVisitor(const FrameGraphManager *manager) : m_manager(manager) { diff --git a/src/render/framegraph/layerfilternode.cpp b/src/render/framegraph/layerfilternode.cpp index b8d439f99..ae7fe5f9d 100644 --- a/src/render/framegraph/layerfilternode.cpp +++ b/src/render/framegraph/layerfilternode.cpp @@ -8,11 +8,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + LayerFilterNode::LayerFilterNode() : FrameGraphNode(FrameGraphNode::LayerFilter) , m_filterMode(QLayerFilter::AcceptAnyMatchingLayers) diff --git a/src/render/framegraph/nodraw.cpp b/src/render/framegraph/nodraw.cpp index 321834910..211ca7582 100644 --- a/src/render/framegraph/nodraw.cpp +++ b/src/render/framegraph/nodraw.cpp @@ -6,11 +6,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + NoDraw::NoDraw() : FrameGraphNode(FrameGraphNode::NoDraw) { diff --git a/src/render/framegraph/nopicking.cpp b/src/render/framegraph/nopicking.cpp index 3e062e7c4..d91b855a0 100644 --- a/src/render/framegraph/nopicking.cpp +++ b/src/render/framegraph/nopicking.cpp @@ -5,11 +5,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + NoPicking::NoPicking() : FrameGraphNode(FrameGraphNode::NoPicking) { diff --git a/src/render/framegraph/qclearbuffers.cpp b/src/render/framegraph/qclearbuffers.cpp index 512604267..d2dfcf7a6 100644 --- a/src/render/framegraph/qclearbuffers.cpp +++ b/src/render/framegraph/qclearbuffers.cpp @@ -31,7 +31,7 @@ namespace Qt3DRender { */ /*! - \enum QClearBuffers::BufferType + \enum Qt3DRender::QClearBuffers::BufferType This enum type describes types of buffer to be cleared. \value None No buffers will be cleared diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp index 5319abb5f..2d9946df9 100644 --- a/src/render/framegraph/qframegraphnode.cpp +++ b/src/render/framegraph/qframegraphnode.cpp @@ -11,7 +11,6 @@ #include <QList> #include <QQueue> -using namespace Qt3DCore; QT_BEGIN_NAMESPACE @@ -34,7 +33,7 @@ QString dumpNodeFilters(const Qt3DRender::QFrameGraphNode *n, const QList<Qt3DRe QStringList kv; for (auto filter: filters) kv.push_back(QString(QLatin1String("%1: %2")).arg(filter->name(), filter->value().toString())); - if (kv.size()) + if (!kv.empty()) res += QString(QLatin1String(" <%1>")).arg(kv.join(QLatin1String(", "))); return res; @@ -120,7 +119,7 @@ void dumpFGPaths(const Qt3DRender::QFrameGraphNode *n, QStringList &result) parents.prepend(dumpNode(fgNode)); fgNode = fgNode->parentFrameGraphNode(); } - if (parents.size()) { + if (!parents.empty()) { result << QString(QLatin1String("%1 [ %2 ]")).arg(QString::number(rv), parents.join(QLatin1String(", "))); ++rv; } @@ -154,7 +153,7 @@ void dumpFGFilterState(const Qt3DRender::QFrameGraphNode *n, QStringList &result fgNode = fgNode->parentFrameGraphNode(); } if (parents) { - if (filters.size()) + if (!filters.empty()) result << QString(QLatin1String("%1 [ %2 ]")).arg(QString::number(rv), filters.join(QLatin1String(", "))); else result << QString(QObject::tr("%1 [ No Filters ]")).arg(rv); @@ -340,6 +339,8 @@ QFrameGraphNode *QFrameGraphNode::parentFrameGraphNode() const */ QList<QFrameGraphNode *> QFrameGraphNodePrivate::childFrameGraphNodes() const { + using namespace Qt3DCore; + Q_Q(const QFrameGraphNode); QList<QFrameGraphNode *> result; QQueue<QNode *> queue; diff --git a/src/render/framegraph/qlayerfilter.cpp b/src/render/framegraph/qlayerfilter.cpp index 5a4c4795a..755dcf8be 100644 --- a/src/render/framegraph/qlayerfilter.cpp +++ b/src/render/framegraph/qlayerfilter.cpp @@ -41,7 +41,7 @@ QLayerFilterPrivate::QLayerFilterPrivate() */ /*! - \enum QLayerFilter::FilterMode + \enum Qt3DRender::QLayerFilter::FilterMode Specifies the rules for selecting entities to draw. @@ -104,7 +104,7 @@ QLayerFilterPrivate::QLayerFilterPrivate() */ /*! - \qmlproperty enumeration Qt3DRender::LayerFilter::filterMode + \qmlproperty enumeration Qt3D.Render::LayerFilter::filterMode Holds the filter mode specifying the entities to select for drawing. diff --git a/src/render/framegraph/qmemorybarrier.cpp b/src/render/framegraph/qmemorybarrier.cpp index 00d53c21c..8b9354aa9 100644 --- a/src/render/framegraph/qmemorybarrier.cpp +++ b/src/render/framegraph/qmemorybarrier.cpp @@ -60,7 +60,7 @@ namespace Qt3DRender { */ /*! - \enum QMemoryBarrier::Operation + \enum Qt3DRender::QMemoryBarrier::Operation This enum type describes types of buffer to be cleared. \value None diff --git a/src/render/framegraph/qrendercapture.cpp b/src/render/framegraph/qrendercapture.cpp index 4c3baf60b..91c431564 100644 --- a/src/render/framegraph/qrendercapture.cpp +++ b/src/render/framegraph/qrendercapture.cpp @@ -133,7 +133,7 @@ QRenderCaptureReply::QRenderCaptureReply(QObject *parent) } /*! - * \property QRenderCaptureReply::image + * \property Qt3DRender::QRenderCaptureReply::image * * Holds the image, which was produced as a result of render capture. */ @@ -144,7 +144,7 @@ QImage QRenderCaptureReply::image() const } /*! - * \property QRenderCaptureReply::captureId + * \property Qt3DRender::QRenderCaptureReply::captureId * * Holds the captureId, which was passed to the renderCapture. */ @@ -155,7 +155,7 @@ int QRenderCaptureReply::captureId() const } /*! - * \property QRenderCaptureReply::complete + * \property Qt3DRender::QRenderCaptureReply::complete * * Holds the complete state of the render capture. */ diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp index d66ff43d9..dec5170cd 100644 --- a/src/render/framegraph/qrenderpassfilter.cpp +++ b/src/render/framegraph/qrenderpassfilter.cpp @@ -9,10 +9,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + /*! \class Qt3DRender::QRenderPassFilter \inmodule Qt3DRender diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp index fc998668e..140735746 100644 --- a/src/render/framegraph/qrenderstateset.cpp +++ b/src/render/framegraph/qrenderstateset.cpp @@ -8,10 +8,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + QRenderStateSetPrivate::QRenderStateSetPrivate() : QFrameGraphNodePrivate() { diff --git a/src/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp index 0f0339b8f..72794e43e 100644 --- a/src/render/framegraph/qrendersurfaceselector.cpp +++ b/src/render/framegraph/qrendersurfaceselector.cpp @@ -67,16 +67,16 @@ namespace Qt3DRender { */ /*! - \property QRenderSurfaceSelector::surface + \property Qt3DRender::QRenderSurfaceSelector::surface Holds the surface */ /*! - \property QRenderSurfaceSelector::externalRenderTargetSize + \property Qt3DRender::QRenderSurfaceSelector::externalRenderTargetSize Holds the size of the external render target. */ -/*! \property QRenderSurfaceSelector::surfacePixelRatio +/*! \property Qt3DRender::QRenderSurfaceSelector::surfacePixelRatio Holds the surfacePixelRatio of the surface. */ @@ -214,13 +214,13 @@ void QRenderSurfaceSelector::setSurface(QObject *surfaceObject) d->m_surfaceEventFilter->setSurface(window); if (window) { - d->m_widthConn = QObject::connect(window, &QWindow::widthChanged, [=] (int) { + d->m_widthConn = QObject::connect(window, &QWindow::widthChanged, this, [d]() { d->update(); }); - d->m_heightConn = QObject::connect(window, &QWindow::heightChanged, [=] (int) { + d->m_heightConn = QObject::connect(window, &QWindow::heightChanged, this, [d]() { d->update(); }); - d->m_screenConn = QObject::connect(window, &QWindow::screenChanged, [this] (QScreen *screen) { + d->m_screenConn = QObject::connect(window, &QWindow::screenChanged, this, [this] (QScreen *screen) { if (screen && !qFuzzyCompare(surfacePixelRatio(), float(screen->devicePixelRatio()))) setSurfacePixelRatio(float(screen->devicePixelRatio())); }); diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp index 64a05fce5..c65d5631d 100644 --- a/src/render/framegraph/qrendertargetselector.cpp +++ b/src/render/framegraph/qrendertargetselector.cpp @@ -8,9 +8,10 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + /*! \class Qt3DRender::QRenderTargetSelector \inmodule Qt3DRender @@ -57,7 +58,7 @@ QRenderTargetSelector::~QRenderTargetSelector() } /*! - \property QRenderTargetSelector::target + \property Qt3DRender::QRenderTargetSelector::target Holds the current render target */ diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp index 4f115cd00..aa5bf1fe4 100644 --- a/src/render/framegraph/qsortpolicy.cpp +++ b/src/render/framegraph/qsortpolicy.cpp @@ -5,10 +5,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + QSortPolicyPrivate::QSortPolicyPrivate() : QFrameGraphNodePrivate() { @@ -47,7 +48,7 @@ QSortPolicyPrivate::QSortPolicyPrivate() */ /*! - \enum QSortPolicy::SortType + \enum Qt3DRender::QSortPolicy::SortType This enum type describes the available sort types. @@ -70,7 +71,7 @@ QSortPolicyPrivate::QSortPolicyPrivate() */ /*! - \property QSortPolicy::sortTypes + \property Qt3DRender::QSortPolicy::sortTypes Specifies the sorting types to be used. */ diff --git a/src/render/framegraph/qsubtreeenabler.cpp b/src/render/framegraph/qsubtreeenabler.cpp index fbf27189b..47263721d 100644 --- a/src/render/framegraph/qsubtreeenabler.cpp +++ b/src/render/framegraph/qsubtreeenabler.cpp @@ -72,7 +72,7 @@ QSubtreeEnabler::~QSubtreeEnabler() } /*! - \enum QSubtreeEnabler::Enablement + \enum Qt3DRender::QSubtreeEnabler::Enablement Specifies whether subtree enablement is persistent or transient. diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp index a94bad2c4..e71a18b3a 100644 --- a/src/render/framegraph/qtechniquefilter.cpp +++ b/src/render/framegraph/qtechniquefilter.cpp @@ -8,10 +8,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + QTechniqueFilterPrivate::QTechniqueFilterPrivate() : QFrameGraphNodePrivate() { diff --git a/src/render/framegraph/qviewport.cpp b/src/render/framegraph/qviewport.cpp index 50ddee7bf..fbe0e2498 100644 --- a/src/render/framegraph/qviewport.cpp +++ b/src/render/framegraph/qviewport.cpp @@ -88,7 +88,7 @@ float QViewport::gamma() const } /*! - \property QViewport::normalizedRect + \property Qt3DRender::QViewport::normalizedRect Specifies the normalised rectangle for the viewport, i.e. the viewport rectangle is specified relative to the render surface size. Whole surface sized viewport @@ -104,7 +104,7 @@ void QViewport::setNormalizedRect(const QRectF &normalizedRect) } /*! - \property QViewport::gamma + \property Qt3DRender::QViewport::gamma Specifies the gamma factor for the viewport. The default is 2.2 which should give proper result on most screens. */ diff --git a/src/render/framegraph/rendercapture.cpp b/src/render/framegraph/rendercapture.cpp index 4f92f3221..bb277f4e7 100644 --- a/src/render/framegraph/rendercapture.cpp +++ b/src/render/framegraph/rendercapture.cpp @@ -6,6 +6,8 @@ #include <Qt3DCore/private/qaspectmanager_p.h> #include <Qt3DCore/private/qaspectjobmanager_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE namespace Qt3DRender { @@ -28,7 +30,7 @@ void RenderCapture::requestCapture(const QRenderCaptureRequest &request) bool RenderCapture::wasCaptureRequested() const { QMutexLocker lock(&m_mutex); - return m_requestedCaptures.size() > 0 && isEnabled(); + return !m_requestedCaptures.empty() && isEnabled(); } // called by render view initializer job @@ -48,7 +50,7 @@ void RenderCapture::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool first const QRenderCapturePrivate *d = static_cast<const QRenderCapturePrivate *>(QFrameGraphNodePrivate::get(node)); const auto newPendingsCaptures = Qt3DCore::moveAndClear(d->m_pendingRequests); - if (newPendingsCaptures.size() > 0) { + if (!newPendingsCaptures.empty()) { m_requestedCaptures.append(newPendingsCaptures); markDirty(AbstractRenderer::FrameGraphDirty); } diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp index 2975affe9..39fc20967 100644 --- a/src/render/framegraph/renderpassfilternode.cpp +++ b/src/render/framegraph/renderpassfilternode.cpp @@ -9,11 +9,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + RenderPassFilter::RenderPassFilter() : FrameGraphNode(FrameGraphNode::RenderPassFilter) { diff --git a/src/render/framegraph/rendersurfaceselector.cpp b/src/render/framegraph/rendersurfaceselector.cpp index 8e6dfa5eb..0da57fd0c 100644 --- a/src/render/framegraph/rendersurfaceselector.cpp +++ b/src/render/framegraph/rendersurfaceselector.cpp @@ -10,7 +10,6 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace { @@ -33,6 +32,8 @@ QSurface *surfaceFromQObject(QObject *o) namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + RenderSurfaceSelector::RenderSurfaceSelector() : FrameGraphNode(FrameGraphNode::Surface) , m_surfaceObj(nullptr) diff --git a/src/render/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp index 4abf3d484..9f6f6fb03 100644 --- a/src/render/framegraph/rendertargetselectornode.cpp +++ b/src/render/framegraph/rendertargetselectornode.cpp @@ -11,11 +11,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + RenderTargetSelector::RenderTargetSelector() : FrameGraphNode(FrameGraphNode::RenderTarget) { diff --git a/src/render/framegraph/sortcriterion.cpp b/src/render/framegraph/sortcriterion.cpp index 0a672381b..c575e759a 100644 --- a/src/render/framegraph/sortcriterion.cpp +++ b/src/render/framegraph/sortcriterion.cpp @@ -7,11 +7,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + SortCriterion::SortCriterion() : BackendNode() , m_type(QSortCriterion::StateChangeCost) diff --git a/src/render/framegraph/sortpolicy.cpp b/src/render/framegraph/sortpolicy.cpp index 9c4936c8d..059f68a7f 100644 --- a/src/render/framegraph/sortpolicy.cpp +++ b/src/render/framegraph/sortpolicy.cpp @@ -6,11 +6,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + SortPolicy::SortPolicy() : FrameGraphNode(FrameGraphNode::SortMethod) { diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp index 4f7804c8c..1c8f98620 100644 --- a/src/render/framegraph/statesetnode.cpp +++ b/src/render/framegraph/statesetnode.cpp @@ -11,11 +11,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + StateSetNode::StateSetNode() : FrameGraphNode(FrameGraphNode::StateSet) { diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp index 1884939ef..61037c7f5 100644 --- a/src/render/framegraph/techniquefilternode.cpp +++ b/src/render/framegraph/techniquefilternode.cpp @@ -10,11 +10,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + TechniqueFilter::TechniqueFilter() : FrameGraphNode(FrameGraphNode::TechniqueFilter) { diff --git a/src/render/framegraph/viewportnode.cpp b/src/render/framegraph/viewportnode.cpp index 735dee77f..660d836d8 100644 --- a/src/render/framegraph/viewportnode.cpp +++ b/src/render/framegraph/viewportnode.cpp @@ -7,11 +7,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + ViewportNode::ViewportNode() : FrameGraphNode(FrameGraphNode::Viewport) , m_xMin(0.0f) |