summaryrefslogtreecommitdiffstats
path: root/src/render/jobs
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/jobs')
-rw-r--r--src/render/jobs/framecleanupjob.cpp2
-rw-r--r--src/render/jobs/framecleanupjob_p.h2
-rw-r--r--src/render/jobs/framepreparationjob_p.h2
-rw-r--r--src/render/jobs/loadbufferjob_p.h2
-rw-r--r--src/render/jobs/loadgeometryjob_p.h2
-rw-r--r--src/render/jobs/loadscenejob.cpp4
-rw-r--r--src/render/jobs/loadscenejob_p.h6
-rw-r--r--src/render/jobs/loadtexturedatajob.cpp2
-rw-r--r--src/render/jobs/loadtexturedatajob_p.h6
-rw-r--r--src/render/jobs/renderviewjob.cpp2
-rw-r--r--src/render/jobs/renderviewjob_p.h2
-rw-r--r--src/render/jobs/renderviewjobutils.cpp4
-rw-r--r--src/render/jobs/renderviewjobutils_p.h6
-rw-r--r--src/render/jobs/updateboundingvolumejob_p.h2
-rw-r--r--src/render/jobs/updateworldtransformjob.cpp2
-rw-r--r--src/render/jobs/updateworldtransformjob_p.h2
16 files changed, 24 insertions, 24 deletions
diff --git a/src/render/jobs/framecleanupjob.cpp b/src/render/jobs/framecleanupjob.cpp
index 7d6df11b4..7fdbb1290 100644
--- a/src/render/jobs/framecleanupjob.cpp
+++ b/src/render/jobs/framecleanupjob.cpp
@@ -58,7 +58,7 @@ FrameCleanupJob::~FrameCleanupJob()
void FrameCleanupJob::run()
{
// set each ShaderData to not need an update
- Q_FOREACH (const Qt3D::QNodeId &id, ShaderData::updatedShaderDataList()) {
+ Q_FOREACH (const Qt3DCore::QNodeId &id, ShaderData::updatedShaderDataList()) {
ShaderData *shaderData = m_renderer->shaderDataManager()->lookupResource(id);
if (shaderData != Q_NULLPTR)
shaderData->clearUpdate();
diff --git a/src/render/jobs/framecleanupjob_p.h b/src/render/jobs/framecleanupjob_p.h
index 9af01b6bd..9dddc925e 100644
--- a/src/render/jobs/framecleanupjob_p.h
+++ b/src/render/jobs/framecleanupjob_p.h
@@ -60,7 +60,7 @@ namespace Render {
class Renderer;
class Entity;
-class FrameCleanupJob : public Qt3D::QAspectJob
+class FrameCleanupJob : public Qt3DCore::QAspectJob
{
public:
explicit FrameCleanupJob(Renderer *renderer);
diff --git a/src/render/jobs/framepreparationjob_p.h b/src/render/jobs/framepreparationjob_p.h
index 3609c223f..d23969cd0 100644
--- a/src/render/jobs/framepreparationjob_p.h
+++ b/src/render/jobs/framepreparationjob_p.h
@@ -59,7 +59,7 @@ namespace Render {
class Renderer;
class Entity;
-class FramePreparationJob : public Qt3D::QAspectJob
+class FramePreparationJob : public Qt3DCore::QAspectJob
{
public:
FramePreparationJob(Entity *root);
diff --git a/src/render/jobs/loadbufferjob_p.h b/src/render/jobs/loadbufferjob_p.h
index 89d2a8d18..d6b0d2ca6 100644
--- a/src/render/jobs/loadbufferjob_p.h
+++ b/src/render/jobs/loadbufferjob_p.h
@@ -60,7 +60,7 @@ namespace Render {
class Renderer;
-class LoadBufferJob : public Qt3D::QAspectJob
+class LoadBufferJob : public Qt3DCore::QAspectJob
{
public:
explicit LoadBufferJob(const HBuffer &handle);
diff --git a/src/render/jobs/loadgeometryjob_p.h b/src/render/jobs/loadgeometryjob_p.h
index 58fb419ca..9ed4a8269 100644
--- a/src/render/jobs/loadgeometryjob_p.h
+++ b/src/render/jobs/loadgeometryjob_p.h
@@ -60,7 +60,7 @@ namespace Render {
class Renderer;
-class LoadGeometryJob : public Qt3D::QAspectJob
+class LoadGeometryJob : public Qt3DCore::QAspectJob
{
public:
explicit LoadGeometryJob(const HGeometryRenderer &handle);
diff --git a/src/render/jobs/loadscenejob.cpp b/src/render/jobs/loadscenejob.cpp
index 6ceda73da..a7dbc3dae 100644
--- a/src/render/jobs/loadscenejob.cpp
+++ b/src/render/jobs/loadscenejob.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
namespace Render {
-LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &m_sceneComponent)
+LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3DCore::QNodeId &m_sceneComponent)
: QAspectJob()
, m_renderer(Q_NULLPTR)
, m_source(source)
@@ -55,7 +55,7 @@ LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &m_sceneCompo
void LoadSceneJob::run()
{
- Qt3D::QEntity *sceneTree = m_renderer->sceneManager()->sceneTreeFromSource(m_source);
+ Qt3DCore::QEntity *sceneTree = m_renderer->sceneManager()->sceneTreeFromSource(m_source);
if (sceneTree == Q_NULLPTR) {
Q_FOREACH (AbstractSceneParser *parser, m_renderer->sceneParsers()) {
if (parser->isExtensionSupported(m_source)) {
diff --git a/src/render/jobs/loadscenejob_p.h b/src/render/jobs/loadscenejob_p.h
index 5385b9cfc..b8c4b18ed 100644
--- a/src/render/jobs/loadscenejob_p.h
+++ b/src/render/jobs/loadscenejob_p.h
@@ -61,10 +61,10 @@ namespace Render {
class Renderer;
-class LoadSceneJob : public Qt3D::QAspectJob
+class LoadSceneJob : public Qt3DCore::QAspectJob
{
public:
- explicit LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &sceneComponent);
+ explicit LoadSceneJob(const QUrl &source, const Qt3DCore::QNodeId &sceneComponent);
void setRenderer(Renderer *renderer) { m_renderer = renderer; }
protected:
@@ -73,7 +73,7 @@ protected:
private:
Renderer *m_renderer;
QUrl m_source;
- Qt3D::QNodeId m_sceneComponent;
+ Qt3DCore::QNodeId m_sceneComponent;
};
typedef QSharedPointer<LoadSceneJob> LoadSceneJobPtr;
diff --git a/src/render/jobs/loadtexturedatajob.cpp b/src/render/jobs/loadtexturedatajob.cpp
index 2dadcd69e..35ddf6cc5 100644
--- a/src/render/jobs/loadtexturedatajob.cpp
+++ b/src/render/jobs/loadtexturedatajob.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
namespace Render {
-LoadTextureDataJob::LoadTextureDataJob(const Qt3D::QNodeId &textureId)
+LoadTextureDataJob::LoadTextureDataJob(const Qt3DCore::QNodeId &textureId)
: m_textureId(textureId)
{
}
diff --git a/src/render/jobs/loadtexturedatajob_p.h b/src/render/jobs/loadtexturedatajob_p.h
index abe476000..09d5e3b5d 100644
--- a/src/render/jobs/loadtexturedatajob_p.h
+++ b/src/render/jobs/loadtexturedatajob_p.h
@@ -60,10 +60,10 @@ namespace Render {
class Renderer;
-class LoadTextureDataJob : public Qt3D::QAspectJob
+class LoadTextureDataJob : public Qt3DCore::QAspectJob
{
public:
- LoadTextureDataJob(const Qt3D::QNodeId &textureId);
+ LoadTextureDataJob(const Qt3DCore::QNodeId &textureId);
~LoadTextureDataJob();
inline void setRenderer(Renderer *renderer) { m_renderer = renderer; }
@@ -71,7 +71,7 @@ protected:
void run() Q_DECL_FINAL;
private:
- Qt3D::QNodeId m_textureId;
+ Qt3DCore::QNodeId m_textureId;
Renderer *m_renderer;
};
diff --git a/src/render/jobs/renderviewjob.cpp b/src/render/jobs/renderviewjob.cpp
index 962bcaaa7..750a2e8b7 100644
--- a/src/render/jobs/renderviewjob.cpp
+++ b/src/render/jobs/renderviewjob.cpp
@@ -53,7 +53,7 @@ void RenderViewJob::run()
// Create a RenderView object
// The RenderView are created from a QFrameAllocator stored in the current Thread local storage
- Qt3D::QFrameAllocator *currentFrameAllocator = m_renderer->currentFrameAllocator();
+ Qt3DCore::QFrameAllocator *currentFrameAllocator = m_renderer->currentFrameAllocator();
RenderView *renderView = currentFrameAllocator->allocate<RenderView>();
// RenderView should allocate heap resources using only the currentFrameAllocator
diff --git a/src/render/jobs/renderviewjob_p.h b/src/render/jobs/renderviewjob_p.h
index 670edb371..c5fecb3d8 100644
--- a/src/render/jobs/renderviewjob_p.h
+++ b/src/render/jobs/renderviewjob_p.h
@@ -62,7 +62,7 @@ namespace Render {
class Renderer;
class FrameGraphNode;
-class RenderViewJob : public Qt3D::QAspectJob
+class RenderViewJob : public Qt3DCore::QAspectJob
{
public:
RenderViewJob()
diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp
index 9cf472549..7de8e4726 100644
--- a/src/render/jobs/renderviewjobutils.cpp
+++ b/src/render/jobs/renderviewjobutils.cpp
@@ -60,7 +60,7 @@
QT_BEGIN_NAMESPACE
-using namespace Qt3D;
+using namespace Qt3DCore;
namespace Qt3DRender {
namespace Render {
@@ -324,7 +324,7 @@ ParameterInfoList::iterator findParamInfo(ParameterInfoList *params, const QStri
}
void addParametersForIds(ParameterInfoList *params, ParameterManager *manager,
- const QList<Qt3D::QNodeId> &parameterIds)
+ const QList<Qt3DCore::QNodeId> &parameterIds)
{
Q_FOREACH (const QNodeId &paramId, parameterIds) {
Parameter *param = manager->lookupResource(paramId);
diff --git a/src/render/jobs/renderviewjobutils_p.h b/src/render/jobs/renderviewjobutils_p.h
index ff6baab33..76b37a1bf 100644
--- a/src/render/jobs/renderviewjobutils_p.h
+++ b/src/render/jobs/renderviewjobutils_p.h
@@ -55,7 +55,7 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+namespace Qt3DCore {
class QFrameAllocator;
}
@@ -114,7 +114,7 @@ Q_AUTOTEST_EXPORT void parametersFromMaterialEffectTechnique(ParameterInfoList *
Technique *technique);
Q_AUTOTEST_EXPORT void addParametersForIds(ParameterInfoList *params, ParameterManager *manager,
- const QList<Qt3D::QNodeId> &parameterIds);
+ const QList<Qt3DCore::QNodeId> &parameterIds);
template<class T>
void parametersFromParametersProvider(ParameterInfoList *infoList,
@@ -129,7 +129,7 @@ Q_AUTOTEST_EXPORT ParameterInfoList::iterator findParamInfo(ParameterInfoList *i
const QString &name);
Q_AUTOTEST_EXPORT RenderStateSet *buildRenderStateSet(const QList<RenderState*> &states,
- Qt3D::QFrameAllocator *allocator);
+ Qt3DCore::QFrameAllocator *allocator);
struct Q_AUTOTEST_EXPORT UniformBlockValueBuilder
diff --git a/src/render/jobs/updateboundingvolumejob_p.h b/src/render/jobs/updateboundingvolumejob_p.h
index e14f71e36..27dc82486 100644
--- a/src/render/jobs/updateboundingvolumejob_p.h
+++ b/src/render/jobs/updateboundingvolumejob_p.h
@@ -59,7 +59,7 @@ namespace Render {
class Entity;
-class UpdateBoundingVolumeJob : public Qt3D::QAspectJob
+class UpdateBoundingVolumeJob : public Qt3DCore::QAspectJob
{
public:
explicit UpdateBoundingVolumeJob(Entity *m_node);
diff --git a/src/render/jobs/updateworldtransformjob.cpp b/src/render/jobs/updateworldtransformjob.cpp
index 20c58511c..736325560 100644
--- a/src/render/jobs/updateworldtransformjob.cpp
+++ b/src/render/jobs/updateworldtransformjob.cpp
@@ -67,7 +67,7 @@ void updateWorldTransformAndBounds(Qt3DRender::Render::Entity *node, const QMatr
}
UpdateWorldTransformJob::UpdateWorldTransformJob(Entity *node)
- : Qt3D::QAspectJob()
+ : Qt3DCore::QAspectJob()
, m_node(node)
{
}
diff --git a/src/render/jobs/updateworldtransformjob_p.h b/src/render/jobs/updateworldtransformjob_p.h
index d379cf5a3..896a02c05 100644
--- a/src/render/jobs/updateworldtransformjob_p.h
+++ b/src/render/jobs/updateworldtransformjob_p.h
@@ -59,7 +59,7 @@ namespace Render {
class Entity;
-class UpdateWorldTransformJob : public Qt3D::QAspectJob
+class UpdateWorldTransformJob : public Qt3DCore::QAspectJob
{
public:
explicit UpdateWorldTransformJob(Entity *node);
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 10:19:23 +0000