summaryrefslogtreecommitdiffstats
path: root/src/render/backend/jobs
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/backend/jobs')
-rw-r--r--src/render/backend/jobs/loadmeshdatajob.cpp2
-rw-r--r--src/render/backend/jobs/loadmeshdatajob.h6
-rw-r--r--src/render/backend/jobs/loadscenejob.cpp2
-rw-r--r--src/render/backend/jobs/loadscenejob.h6
-rw-r--r--src/render/backend/jobs/renderviewjobutils.cpp20
5 files changed, 18 insertions, 18 deletions
diff --git a/src/render/backend/jobs/loadmeshdatajob.cpp b/src/render/backend/jobs/loadmeshdatajob.cpp
index 0e79c2d90..d98a56bab 100644
--- a/src/render/backend/jobs/loadmeshdatajob.cpp
+++ b/src/render/backend/jobs/loadmeshdatajob.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3D {
namespace Render {
-LoadMeshDataJob::LoadMeshDataJob(QAbstractMeshFunctorPtr functor, const QNodeUuid &meshUuid)
+LoadMeshDataJob::LoadMeshDataJob(QAbstractMeshFunctorPtr functor, const QNodeId &meshUuid)
: QAspectJob()
, m_meshUuid(meshUuid)
, m_functor(functor)
diff --git a/src/render/backend/jobs/loadmeshdatajob.h b/src/render/backend/jobs/loadmeshdatajob.h
index c2a46e259..d59027b38 100644
--- a/src/render/backend/jobs/loadmeshdatajob.h
+++ b/src/render/backend/jobs/loadmeshdatajob.h
@@ -42,7 +42,7 @@
#ifndef QT3D_RENDER_LOADMESHDATAJOB_H
#define QT3D_RENDER_LOADMESHDATAJOB_H
-#include <Qt3DCore/qnodeuuid.h>
+#include <Qt3DCore/qnodeid.h>
#include <Qt3DCore/qaspectjob.h>
#include <Qt3DCore/qhandle.h>
#include <Qt3DRenderer/qmeshdata.h>
@@ -60,13 +60,13 @@ class Renderer;
class LoadMeshDataJob : public Qt3D::QAspectJob
{
public:
- LoadMeshDataJob(QAbstractMeshFunctorPtr functor, const QNodeUuid &meshUuid);
+ LoadMeshDataJob(QAbstractMeshFunctorPtr functor, const QNodeId &meshUuid);
void setRenderer(Renderer *renderer) { m_renderer = renderer; }
protected:
void run() Q_DECL_OVERRIDE;
private:
- QNodeUuid m_meshUuid;
+ QNodeId m_meshUuid;
QAbstractMeshFunctorPtr m_functor;
Renderer *m_renderer;
};
diff --git a/src/render/backend/jobs/loadscenejob.cpp b/src/render/backend/jobs/loadscenejob.cpp
index be399c465..6e21543da 100644
--- a/src/render/backend/jobs/loadscenejob.cpp
+++ b/src/render/backend/jobs/loadscenejob.cpp
@@ -51,7 +51,7 @@ namespace Qt3D {
namespace Render {
-LoadSceneJob::LoadSceneJob(const QString &source, const QNodeUuid &m_sceneComponent)
+LoadSceneJob::LoadSceneJob(const QString &source, const QNodeId &m_sceneComponent)
: QAspectJob()
, m_renderer(Q_NULLPTR)
, m_source(source)
diff --git a/src/render/backend/jobs/loadscenejob.h b/src/render/backend/jobs/loadscenejob.h
index 130259faa..d9a516cee 100644
--- a/src/render/backend/jobs/loadscenejob.h
+++ b/src/render/backend/jobs/loadscenejob.h
@@ -43,7 +43,7 @@
#define QT3D_RENDER_LOADSCENEJOB_H
#include <Qt3DCore/qaspectjob.h>
-#include <Qt3DCore/qnodeuuid.h>
+#include <Qt3DCore/qnodeid.h>
#include <QSharedPointer>
QT_BEGIN_NAMESPACE
@@ -57,7 +57,7 @@ class Renderer;
class LoadSceneJob : public Qt3D::QAspectJob
{
public:
- explicit LoadSceneJob(const QString &source, const QNodeUuid &sceneComponent);
+ explicit LoadSceneJob(const QString &source, const QNodeId &sceneComponent);
void setRenderer(Renderer *renderer) { m_renderer = renderer; }
protected:
@@ -66,7 +66,7 @@ protected:
private:
Renderer *m_renderer;
QString m_source;
- QNodeUuid m_sceneComponent;
+ QNodeId m_sceneComponent;
};
typedef QSharedPointer<LoadSceneJob> LoadSceneJobPtr;
diff --git a/src/render/backend/jobs/renderviewjobutils.cpp b/src/render/backend/jobs/renderviewjobutils.cpp
index f3777c3da..1e0f042ad 100644
--- a/src/render/backend/jobs/renderviewjobutils.cpp
+++ b/src/render/backend/jobs/renderviewjobutils.cpp
@@ -123,7 +123,7 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN
case FrameGraphNode::RenderTarget: {
// Can be set once and we take render target nearest to the leaf node
- QNodeUuid renderTargetUid = static_cast<const RenderTargetSelector *>(node)->renderTargetUuid();
+ QNodeId renderTargetUid = static_cast<const RenderTargetSelector *>(node)->renderTargetUuid();
HTarget renderTargetHandle = renderer->renderTargetManager()->lookupHandle(renderTargetUid);
if (rv->renderTargetHandle().isNull()) {
rv->setRenderTargetHandle(renderTargetHandle);
@@ -131,7 +131,7 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN
RenderTarget *renderTarget = renderer->renderTargetManager()->data(renderTargetHandle);
if (renderTarget) {
// Add renderTarget Handle and build renderCommand AttachmentPack
- Q_FOREACH (const QNodeUuid &attachmentId, renderTarget->renderAttachments()) {
+ Q_FOREACH (const QNodeId &attachmentId, renderTarget->renderAttachments()) {
RenderAttachment *attachment = renderer->attachmentManager()->lookupResource(attachmentId);
if (attachment)
rv->addRenderAttachment(attachment->attachment());
@@ -221,7 +221,7 @@ RenderTechnique *findTechniqueForEffect(Renderer *renderer,
return Q_NULLPTR;
// Iterate through the techniques in the effect
- Q_FOREACH (const QNodeUuid &techniqueId, effect->techniques()) {
+ Q_FOREACH (const QNodeId &techniqueId, effect->techniques()) {
RenderTechnique *technique = renderer->techniqueManager()->lookupResource(techniqueId);
if (!technique)
@@ -243,11 +243,11 @@ RenderTechnique *findTechniqueForEffect(Renderer *renderer,
// Iterate through the filter criteria and for each one search for a criteria on the
// technique that satisfies it
- Q_FOREACH (const QNodeUuid &filterAnnotationId, techniqueFilter->filters()) {
+ Q_FOREACH (const QNodeId &filterAnnotationId, techniqueFilter->filters()) {
foundMatch = false;
RenderAnnotation *filterAnnotation = renderer->criterionManager()->lookupResource(filterAnnotationId);
- Q_FOREACH (const QNodeUuid &techniqueAnnotationId, technique->annotations()) {
+ Q_FOREACH (const QNodeId &techniqueAnnotationId, technique->annotations()) {
RenderAnnotation *techniqueAnnotation = renderer->criterionManager()->lookupResource(techniqueAnnotationId);
if ((foundMatch = (*techniqueAnnotation == *filterAnnotation)))
break;
@@ -279,7 +279,7 @@ QVector<RenderRenderPass *> findRenderPassesForTechnique(Renderer *renderer,
QVector<RenderRenderPass *> passes;
passes.reserve(3); // We rarely get more than 2 or 3 passes
- Q_FOREACH (const QNodeUuid &passId, technique->renderPasses()) {
+ Q_FOREACH (const QNodeId &passId, technique->renderPasses()) {
RenderRenderPass *renderPass = renderer->renderPassManager()->lookupResource(passId);
if (renderPass) {
@@ -290,11 +290,11 @@ QVector<RenderRenderPass *> findRenderPassesForTechnique(Renderer *renderer,
if (!foundMatch && renderPass->annotations().size() >= passFilter->filters().size()) {
// Iterate through the filter criteria and look for render passes with criteria that satisfy them
- Q_FOREACH (const QNodeUuid &filterAnnotationId, passFilter->filters()) {
+ Q_FOREACH (const QNodeId &filterAnnotationId, passFilter->filters()) {
foundMatch = false;
RenderAnnotation *filterAnnotation = renderer->criterionManager()->lookupResource(filterAnnotationId);
- Q_FOREACH (const QNodeUuid &passAnnotationId, renderPass->annotations()) {
+ Q_FOREACH (const QNodeId &passAnnotationId, renderPass->annotations()) {
RenderAnnotation *passAnnotation = renderer->criterionManager()->lookupResource(passAnnotationId);
if ((foundMatch = (*passAnnotation == *filterAnnotation)))
break;
@@ -318,9 +318,9 @@ QVector<RenderRenderPass *> findRenderPassesForTechnique(Renderer *renderer,
}
static void addParametersForIds(QHash<QString, QVariant> *params, ParameterManager *manager,
- const QList<QNodeUuid> &parameterIds)
+ const QList<QNodeId> &parameterIds)
{
- Q_FOREACH (const QNodeUuid &paramId, parameterIds) {
+ Q_FOREACH (const QNodeId &paramId, parameterIds) {
RenderParameter *param = manager->lookupResource(paramId);
if (param != Q_NULLPTR)
params->insert(param->name(), param->value());
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 23:11:47 +0000