Move Render aspect into the Qt3DRender namespace

Updated examples and tests accordingly.

Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

11 files changed, 50 insertions, 50 deletions

diff --git a/examples/qt3d/materials-cpp/barrel.cpp b/examples/qt3d/materials-cpp/barrel.cpp
index 069732254..c89b58d52 100644
--- a/examples/qt3d/materials-cpp/barrel.cpp
+++ b/examples/qt3d/materials-cpp/barrel.cpp
@@ -62,13 +62,13 @@ Barrel::Barrel(Qt3D::QNode *parent)
     , m_bumps(NoBumps)
     , m_diffuseColor(Red)
     , m_specularColor(None)
-    , m_material(new Qt3D::QNormalDiffuseSpecularMapMaterial())
+    , m_material(new Qt3DRender::QNormalDiffuseSpecularMapMaterial())
     , m_diffuseTexture(m_material->diffuse())
     , m_normalTexture(m_material->normal())
     , m_specularTexture(m_material->specular())
-    , m_diffuseTextureImage(new Qt3D::QTextureImage())
-    , m_normalTextureImage(new Qt3D::QTextureImage())
-    , m_specularTextureImage(new Qt3D::QTextureImage())
+    , m_diffuseTextureImage(new Qt3DRender::QTextureImage())
+    , m_normalTextureImage(new Qt3DRender::QTextureImage())
+    , m_specularTextureImage(new Qt3DRender::QTextureImage())
 {
     mesh()->setSource(QUrl(QStringLiteral("qrc:/assets/metalbarrel/metal_barrel.obj")));
     scaleTransform()->setScale(0.03f);
diff --git a/examples/qt3d/materials-cpp/barrel.h b/examples/qt3d/materials-cpp/barrel.h
index 8ff1c32df..0a8b81bde 100644
--- a/examples/qt3d/materials-cpp/barrel.h
+++ b/examples/qt3d/materials-cpp/barrel.h
@@ -82,13 +82,13 @@ private:
     Bumps m_bumps;
     DiffuseColor m_diffuseColor;
     SpecularColor m_specularColor;
-    Qt3D::QNormalDiffuseSpecularMapMaterial *m_material;
-    Qt3D::QAbstractTextureProvider *m_diffuseTexture;
-    Qt3D::QAbstractTextureProvider *m_normalTexture;
-    Qt3D::QAbstractTextureProvider *m_specularTexture;
-    Qt3D::QTextureImage *m_diffuseTextureImage;
-    Qt3D::QTextureImage *m_normalTextureImage;
-    Qt3D::QTextureImage *m_specularTextureImage;
+    Qt3DRender::QNormalDiffuseSpecularMapMaterial *m_material;
+    Qt3DRender::QAbstractTextureProvider *m_diffuseTexture;
+    Qt3DRender::QAbstractTextureProvider *m_normalTexture;
+    Qt3DRender::QAbstractTextureProvider *m_specularTexture;
+    Qt3DRender::QTextureImage *m_diffuseTextureImage;
+    Qt3DRender::QTextureImage *m_normalTextureImage;
+    Qt3DRender::QTextureImage *m_specularTextureImage;
 
     void setNormalTextureSource();
     void setDiffuseTextureSource();
diff --git a/examples/qt3d/materials-cpp/houseplant.cpp b/examples/qt3d/materials-cpp/houseplant.cpp
index c1bea7ecd..df1384486 100644
--- a/examples/qt3d/materials-cpp/houseplant.cpp
+++ b/examples/qt3d/materials-cpp/houseplant.cpp
@@ -58,16 +58,16 @@ HousePlant::HousePlant(Qt3D::QNode *parent)
     , m_pot(new RenderableEntity(this))
     , m_plant(new RenderableEntity(m_pot))
     , m_cover(new RenderableEntity(m_pot))
-    , m_potMaterial(new Qt3D::QNormalDiffuseMapMaterial())
-    , m_plantMaterial(new Qt3D::QNormalDiffuseMapAlphaMaterial())
-    , m_coverMaterial(new Qt3D::QNormalDiffuseMapMaterial())
-    , m_potImage(new Qt3D::QTextureImage())
-
-    , m_potNormalImage(new Qt3D::QTextureImage())
-    , m_plantImage(new Qt3D::QTextureImage())
-    , m_plantNormalImage(new Qt3D::QTextureImage())
-    , m_coverImage(new Qt3D::QTextureImage())
-    , m_coverNormalImage(new Qt3D::QTextureImage())
+    , m_potMaterial(new Qt3DRender::QNormalDiffuseMapMaterial())
+    , m_plantMaterial(new Qt3DRender::QNormalDiffuseMapAlphaMaterial())
+    , m_coverMaterial(new Qt3DRender::QNormalDiffuseMapMaterial())
+    , m_potImage(new Qt3DRender::QTextureImage())
+
+    , m_potNormalImage(new Qt3DRender::QTextureImage())
+    , m_plantImage(new Qt3DRender::QTextureImage())
+    , m_plantNormalImage(new Qt3DRender::QTextureImage())
+    , m_coverImage(new Qt3DRender::QTextureImage())
+    , m_coverNormalImage(new Qt3DRender::QTextureImage())
     , m_plantType(Bamboo)
     , m_potShape(Cross)
 {
diff --git a/examples/qt3d/materials-cpp/houseplant.h b/examples/qt3d/materials-cpp/houseplant.h
index 150984f59..36cb6ca23 100644
--- a/examples/qt3d/materials-cpp/houseplant.h
+++ b/examples/qt3d/materials-cpp/houseplant.h
@@ -86,16 +86,16 @@ private:
     RenderableEntity *m_plant;
     RenderableEntity *m_cover;
 
-    Qt3D::QNormalDiffuseMapMaterial *m_potMaterial;
-    Qt3D::QNormalDiffuseMapAlphaMaterial *m_plantMaterial;
-    Qt3D::QNormalDiffuseMapMaterial *m_coverMaterial;
+    Qt3DRender::QNormalDiffuseMapMaterial *m_potMaterial;
+    Qt3DRender::QNormalDiffuseMapAlphaMaterial *m_plantMaterial;
+    Qt3DRender::QNormalDiffuseMapMaterial *m_coverMaterial;
 
-    Qt3D::QTextureImage *m_potImage;
-    Qt3D::QTextureImage *m_potNormalImage;
-    Qt3D::QTextureImage *m_plantImage;
-    Qt3D::QTextureImage *m_plantNormalImage;
-    Qt3D::QTextureImage *m_coverImage;
-    Qt3D::QTextureImage *m_coverNormalImage;
+    Qt3DRender::QTextureImage *m_potImage;
+    Qt3DRender::QTextureImage *m_potNormalImage;
+    Qt3DRender::QTextureImage *m_plantImage;
+    Qt3DRender::QTextureImage *m_plantNormalImage;
+    Qt3DRender::QTextureImage *m_coverImage;
+    Qt3DRender::QTextureImage *m_coverNormalImage;
 
     Plant m_plantType;
     PotShape m_potShape;
diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp
index 0ea77c728..f18f1f32a 100644
--- a/examples/qt3d/materials-cpp/main.cpp
+++ b/examples/qt3d/materials-cpp/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char* argv[])
 
     Window view;
     Qt3D::QAspectEngine engine;
-    engine.registerAspect(new Qt3D::QRenderAspect());
+    engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
     engine.initialize();
@@ -84,8 +84,8 @@ int main(int argc, char* argv[])
     input->setCamera(basicCamera);
 
     // Forward Renderer FrameGraph
-    Qt3D::QFrameGraph *frameGraphComponent = new Qt3D::QFrameGraph(sceneRoot);
-    Qt3D::QForwardRenderer *forwardRenderer = new Qt3D::QForwardRenderer();
+    Qt3DRender::QFrameGraph *frameGraphComponent = new Qt3DRender::QFrameGraph(sceneRoot);
+    Qt3DRender::QForwardRenderer *forwardRenderer = new Qt3DRender::QForwardRenderer();
     forwardRenderer->setCamera(basicCamera);
     frameGraphComponent->setActiveFrameGraph(forwardRenderer);
     sceneRoot->addComponent(frameGraphComponent);
@@ -96,20 +96,20 @@ int main(int argc, char* argv[])
     planeEntity->mesh()->setWidth(100.0f);
     planeEntity->mesh()->setMeshResolution(QSize(20, 20));
 
-    Qt3D::QNormalDiffuseSpecularMapMaterial *normalDiffuseSpecularMapMaterial = new Qt3D::QNormalDiffuseSpecularMapMaterial();
+    Qt3DRender::QNormalDiffuseSpecularMapMaterial *normalDiffuseSpecularMapMaterial = new Qt3DRender::QNormalDiffuseSpecularMapMaterial();
     normalDiffuseSpecularMapMaterial->setTextureScale(10.0f);
     normalDiffuseSpecularMapMaterial->setShininess(80.0f);
     normalDiffuseSpecularMapMaterial->setAmbient(QColor::fromRgbF(0.2f, 0.2f, 0.2f, 1.0f));
 
-    Qt3D::QTextureImage *diffuseImage = new Qt3D::QTextureImage();
+    Qt3DRender::QTextureImage *diffuseImage = new Qt3DRender::QTextureImage();
     diffuseImage->setSource(QUrl(QStringLiteral("qrc:/assets/textures/pattern_09/diffuse.webp")));
     normalDiffuseSpecularMapMaterial->diffuse()->addTextureImage(diffuseImage);
 
-    Qt3D::QTextureImage *specularImage = new Qt3D::QTextureImage();
+    Qt3DRender::QTextureImage *specularImage = new Qt3DRender::QTextureImage();
     specularImage->setSource(QUrl(QStringLiteral("qrc:/assets/textures/pattern_09/specular.webp")));
     normalDiffuseSpecularMapMaterial->specular()->addTextureImage(specularImage);
 
-    Qt3D::QTextureImage *normalImage = new Qt3D::QTextureImage();
+    Qt3DRender::QTextureImage *normalImage = new Qt3DRender::QTextureImage();
     normalImage->setSource(QUrl((QStringLiteral("qrc:/assets/textures/pattern_09/normal.webp"))));
     normalDiffuseSpecularMapMaterial->normal()->addTextureImage(normalImage);
 
@@ -119,11 +119,11 @@ int main(int argc, char* argv[])
     RenderableEntity *chest = new RenderableEntity(sceneRoot);
     chest->scaleTransform()->setScale(0.03f);
     chest->mesh()->setSource(QUrl(QStringLiteral("qrc:/assets/chest/Chest.obj")));
-    Qt3D::QDiffuseMapMaterial *diffuseMapMaterial = new Qt3D::QDiffuseMapMaterial();
+    Qt3DRender::QDiffuseMapMaterial *diffuseMapMaterial = new Qt3DRender::QDiffuseMapMaterial();
     diffuseMapMaterial->setSpecular(QColor::fromRgbF(0.2f, 0.2f, 0.2f, 1.0f));
     diffuseMapMaterial->setShininess(2.0f);
 
-    Qt3D::QTextureImage *chestDiffuseImage = new Qt3D::QTextureImage();
+    Qt3DRender::QTextureImage *chestDiffuseImage = new Qt3DRender::QTextureImage();
     chestDiffuseImage->setSource(QUrl(QStringLiteral("qrc:/assets/chest/diffuse.webp")));
     diffuseMapMaterial->diffuse()->addTextureImage(chestDiffuseImage);
 
@@ -134,7 +134,7 @@ int main(int argc, char* argv[])
     RotatingTrefoilKnot *trefoil = new RotatingTrefoilKnot(sceneRoot);
     trefoil->translateTransform()->setDy(3.5);
     trefoil->scaleTransform()->setScale(0.5f);
-    Qt3D::QPhongMaterial *phongMaterial = new Qt3D::QPhongMaterial();
+    Qt3DRender::QPhongMaterial *phongMaterial = new Qt3DRender::QPhongMaterial();
     phongMaterial->setDiffuse(QColor(204, 205, 75)); // Safari Yellow #cccd4b
     phongMaterial->setSpecular(Qt::white);
     trefoil->addComponent(phongMaterial);
diff --git a/examples/qt3d/materials-cpp/planeentity.cpp b/examples/qt3d/materials-cpp/planeentity.cpp
index 9854e8ace..3a06bded7 100644
--- a/examples/qt3d/materials-cpp/planeentity.cpp
+++ b/examples/qt3d/materials-cpp/planeentity.cpp
@@ -43,7 +43,7 @@
 
 PlaneEntity::PlaneEntity(Qt3D::QNode *parent)
     : Qt3D::QEntity(new Qt3D::QEntity(parent))
-    , m_mesh(new Qt3D::QPlaneMesh())
+    , m_mesh(new Qt3DRender::QPlaneMesh())
     , m_transform(new Qt3D::QTransform())
     , m_scaleTransform(new Qt3D::QScaleTransform())
     , m_translateTransform(new Qt3D::QTranslateTransform())
@@ -68,7 +68,7 @@ Qt3D::QTranslateTransform *PlaneEntity::translateTransform() const
     return m_translateTransform;
 }
 
-Qt3D::QPlaneMesh *PlaneEntity::mesh() const
+Qt3DRender::QPlaneMesh *PlaneEntity::mesh() const
 {
     return m_mesh;
 }
diff --git a/examples/qt3d/materials-cpp/planeentity.h b/examples/qt3d/materials-cpp/planeentity.h
index 418f3c698..48639b306 100644
--- a/examples/qt3d/materials-cpp/planeentity.h
+++ b/examples/qt3d/materials-cpp/planeentity.h
@@ -51,10 +51,10 @@ public:
 
     Qt3D::QScaleTransform *scaleTransform() const;
     Qt3D::QTranslateTransform *translateTransform() const;
-    Qt3D::QPlaneMesh *mesh() const;
+    Qt3DRender::QPlaneMesh *mesh() const;
 
 private:
-    Qt3D::QPlaneMesh *m_mesh;
+    Qt3DRender::QPlaneMesh *m_mesh;
     Qt3D::QTransform *m_transform;
     Qt3D::QScaleTransform *m_scaleTransform;
     Qt3D::QTranslateTransform *m_translateTransform;
diff --git a/examples/qt3d/materials-cpp/renderableentity.cpp b/examples/qt3d/materials-cpp/renderableentity.cpp
index 0acbdcc00..2e463a607 100644
--- a/examples/qt3d/materials-cpp/renderableentity.cpp
+++ b/examples/qt3d/materials-cpp/renderableentity.cpp
@@ -38,7 +38,7 @@
 
 RenderableEntity::RenderableEntity(Qt3D::QNode *parent)
     : Qt3D::QEntity(parent)
-    , m_mesh(new Qt3D::QMesh())
+    , m_mesh(new Qt3DRender::QMesh())
     , m_transform(new Qt3D::QTransform())
     , m_rotateTransform(new Qt3D::QRotateTransform())
     , m_scaleTransform(new Qt3D::QScaleTransform())
@@ -56,7 +56,7 @@ RenderableEntity::~RenderableEntity()
 
 }
 
-Qt3D::QMesh *RenderableEntity::mesh() const
+Qt3DRender::QMesh *RenderableEntity::mesh() const
 {
     return m_mesh;
 }
diff --git a/examples/qt3d/materials-cpp/renderableentity.h b/examples/qt3d/materials-cpp/renderableentity.h
index c467ffb5c..216ad843f 100644
--- a/examples/qt3d/materials-cpp/renderableentity.h
+++ b/examples/qt3d/materials-cpp/renderableentity.h
@@ -50,13 +50,13 @@ public:
     RenderableEntity(Qt3D::QNode *parent = 0);
     ~RenderableEntity();
 
-    Qt3D::QMesh *mesh() const;
+    Qt3DRender::QMesh *mesh() const;
     Qt3D::QScaleTransform *scaleTransform() const;
     Qt3D::QTranslateTransform *translateTransform() const;
     Qt3D::QRotateTransform *rotateTransform() const;
 
 private:
-    Qt3D::QMesh *m_mesh;
+    Qt3DRender::QMesh *m_mesh;
     Qt3D::QTransform *m_transform;
     Qt3D::QRotateTransform *m_rotateTransform;
     Qt3D::QScaleTransform *m_scaleTransform;
diff --git a/examples/qt3d/materials-cpp/trefoilknot.cpp b/examples/qt3d/materials-cpp/trefoilknot.cpp
index b99c090ea..d71c9944d 100644
--- a/examples/qt3d/materials-cpp/trefoilknot.cpp
+++ b/examples/qt3d/materials-cpp/trefoilknot.cpp
@@ -38,7 +38,7 @@
 
 TrefoilKnot::TrefoilKnot(Qt3D::QNode *parent)
     : Qt3D::QEntity(parent)
-    , m_mesh(new Qt3D::QMesh())
+    , m_mesh(new Qt3DRender::QMesh())
     , m_transform(new Qt3D::QTransform())
     , m_scaleTransform(new Qt3D::QScaleTransform())
     , m_xaxisRotation(new Qt3D::QRotateTransform())
diff --git a/examples/qt3d/materials-cpp/trefoilknot.h b/examples/qt3d/materials-cpp/trefoilknot.h
index a625c874e..6beda9cd1 100644
--- a/examples/qt3d/materials-cpp/trefoilknot.h
+++ b/examples/qt3d/materials-cpp/trefoilknot.h
@@ -56,7 +56,7 @@ public:
     Qt3D::QTranslateTransform *translateTransform() const;
 
 private:
-    Qt3D::QMesh *m_mesh;
+    Qt3DRender::QMesh *m_mesh;
     Qt3D::QTransform *m_transform;
     Qt3D::QScaleTransform *m_scaleTransform;
     Qt3D::QRotateTransform *m_xaxisRotation;