summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2014-10-25 15:47:20 +0100
committerSean Harmer <sean.harmer@kdab.com>2014-10-26 10:17:26 +0100
commitc9f8f87403b767405fc640b4776b7e67739a69db (patch)
treecdae36dfabbbe7783d59d76f64ce15fa9907b65d /examples
parent0e7ac3d230879986d9353c13eed4b45038f3eee4 (diff)
Rename RendererAspect -> QRenderAspect
Change-Id: Ib16fe125e160764571775f3667cff082db921f7d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/assimp/main.cpp4
-rw-r--r--examples/bigmodel-qml/main.cpp4
-rw-r--r--examples/cpp_example/main.cpp4
-rw-r--r--examples/cylinder-cpp/main.cpp4
-rw-r--r--examples/cylinder-qml/main.cpp4
-rw-r--r--examples/deferred-renderer-cpp/main.cpp4
-rw-r--r--examples/deferred-renderer-qml/main.cpp4
-rw-r--r--examples/gltf/main.cpp4
-rw-r--r--examples/multiviewport/main.cpp4
-rw-r--r--examples/playground-qml/main.cpp4
-rw-r--r--examples/rollerball/main.cpp4
-rw-r--r--examples/shadow-map-qml/main.cpp4
-rw-r--r--examples/simple-cpp/main.cpp4
-rw-r--r--examples/simple-qml/main.cpp4
-rw-r--r--examples/tessellation-modes/main.cpp4
-rw-r--r--examples/torus-cpp/main.cpp4
-rw-r--r--examples/torus-qml/main.cpp4
-rw-r--r--examples/wireframe/main.cpp4
18 files changed, 36 insertions, 36 deletions
diff --git a/examples/assimp/main.cpp b/examples/assimp/main.cpp
index 2e21db9e7..b2b18e508 100644
--- a/examples/assimp/main.cpp
+++ b/examples/assimp/main.cpp
@@ -42,7 +42,7 @@
#include <exampleresources.h>
#include <Qt3DQuick/quickwindow.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <QGuiApplication>
#include <QtQml>
@@ -54,7 +54,7 @@ int main(int argc, char* argv[])
initializeAssetResources("../exampleresources/example-assets.qrb");
Qt3D::Quick::QuickWindow view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
view.setSource(QUrl("qrc:/main.qml"));
view.show();
diff --git a/examples/bigmodel-qml/main.cpp b/examples/bigmodel-qml/main.cpp
index 0d7338078..74b70db1d 100644
--- a/examples/bigmodel-qml/main.cpp
+++ b/examples/bigmodel-qml/main.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <Qt3DQuick/quickwindow.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <QGuiApplication>
#include <QtQml>
@@ -62,7 +62,7 @@ int main(int argc, char* argv[])
}
Qt3D::Quick::QuickWindow view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
// There should be some synchronising mechanism to make sure
// the source is set after alll aspects have been completely initialized
// Otherwise we might encounter cases where an Aspect's QML elements have
diff --git a/examples/cpp_example/main.cpp b/examples/cpp_example/main.cpp
index e7c7cf9ce..bb4f8f595 100644
--- a/examples/cpp_example/main.cpp
+++ b/examples/cpp_example/main.cpp
@@ -67,7 +67,7 @@
#include <Qt3DRenderer/qrenderpassfilter.h>
#include <Qt3DRenderer/qtechniquefilter.h>
#include <Qt3DRenderer/qviewport.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <Qt3DRenderer/qframegraph.h>
#include <Qt3DRenderer/qclearbuffer.h>
@@ -78,7 +78,7 @@ int main(int ac, char **av)
initializeAssetResources("../exampleresources/example-assets.qrb");
Qt3D::Window view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
// Root entity
Qt3D::QEntity *rootEntity = new Qt3D::QEntity();
diff --git a/examples/cylinder-cpp/main.cpp b/examples/cylinder-cpp/main.cpp
index c169f33aa..a123dd5a8 100644
--- a/examples/cylinder-cpp/main.cpp
+++ b/examples/cylinder-cpp/main.cpp
@@ -63,7 +63,7 @@
#include <Qt3DRenderer/qrenderpassfilter.h>
#include <Qt3DRenderer/qtechniquefilter.h>
#include <Qt3DRenderer/qviewport.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <Qt3DRenderer/qframegraph.h>
#include <Qt3DRenderer/qclearbuffer.h>
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
QGuiApplication app(argc, argv);
Qt3D::Window view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
// Root entity
Qt3D::QEntity *rootEntity = new Qt3D::QEntity();
diff --git a/examples/cylinder-qml/main.cpp b/examples/cylinder-qml/main.cpp
index 1efee589c..9e80a8936 100644
--- a/examples/cylinder-qml/main.cpp
+++ b/examples/cylinder-qml/main.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <Qt3DQuick/quickwindow.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <QGuiApplication>
@@ -51,7 +51,7 @@ int main(int argc, char* argv[])
QGuiApplication app(argc, argv);
Qt3D::Quick::QuickWindow view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
// There should be some synchronising mechanism to make sure
// the source is set after alll aspects have been completely initialized
// Otherwise we might encounter cases where an Aspect's QML elements have
diff --git a/examples/deferred-renderer-cpp/main.cpp b/examples/deferred-renderer-cpp/main.cpp
index 9f114955a..8473538b6 100644
--- a/examples/deferred-renderer-cpp/main.cpp
+++ b/examples/deferred-renderer-cpp/main.cpp
@@ -41,7 +41,7 @@
#include <Qt3DCore/QEntity>
#include <Qt3DCore/Window>
-#include <Qt3DRenderer/RendererAspect>
+#include <Qt3DRenderer/QRenderAspect>
#include <Qt3DRenderer/QFrameGraph>
#include <Qt3DRenderer/QMaterial>
#include <Qt3DRenderer/QSphereMesh>
@@ -68,7 +68,7 @@ int main(int ac, char **av)
QGuiApplication app(ac, av);
Qt3D::Window view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
// Root entity
Qt3D::QEntity *rootEntity = new Qt3D::QEntity();
diff --git a/examples/deferred-renderer-qml/main.cpp b/examples/deferred-renderer-qml/main.cpp
index 17d6b5183..41fe13fab 100644
--- a/examples/deferred-renderer-qml/main.cpp
+++ b/examples/deferred-renderer-qml/main.cpp
@@ -41,7 +41,7 @@
****************************************************************************/
#include <Qt3DQuick/quickwindow.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <exampleresources.h>
@@ -55,7 +55,7 @@ int main(int argc, char* argv[])
initializeAssetResources("../exampleresources/example-assets.qrb");
Qt3D::Quick::QuickWindow view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
view.setSource(QUrl("qrc:/main.qml"));
view.show();
diff --git a/examples/gltf/main.cpp b/examples/gltf/main.cpp
index 0d85da46f..2a464daaa 100644
--- a/examples/gltf/main.cpp
+++ b/examples/gltf/main.cpp
@@ -41,7 +41,7 @@
#include <exampleresources.h>
#include <Qt3DQuick/quickwindow.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <QGuiApplication>
#include <QtQml>
@@ -53,7 +53,7 @@ int main(int argc, char* argv[])
initializeAssetResources("../exampleresources/example-assets.qrb");
Qt3D::Quick::QuickWindow view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
view.setSource(QUrl("qrc:/main.qml"));
view.show();
diff --git a/examples/multiviewport/main.cpp b/examples/multiviewport/main.cpp
index da179b92c..3da7c22b4 100644
--- a/examples/multiviewport/main.cpp
+++ b/examples/multiviewport/main.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <Qt3DQuick/quickwindow.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <exampleresources.h>
@@ -52,7 +52,7 @@ int main(int ac, char **av)
Qt3D::Quick::QuickWindow win;
initializeAssetResources("../exampleresources/example-assets.qrb");
- win.registerAspect(new Qt3D::RendererAspect);
+ win.registerAspect(new Qt3D::QRenderAspect);
win.setSource(QUrl("qrc:/main.qml"));
win.show();
diff --git a/examples/playground-qml/main.cpp b/examples/playground-qml/main.cpp
index f6d4168f1..b81c83642 100644
--- a/examples/playground-qml/main.cpp
+++ b/examples/playground-qml/main.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <Qt3DQuick/quickwindow.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <exampleresources.h>
@@ -54,7 +54,7 @@ int main(int argc, char* argv[])
initializeAssetResources("../exampleresources/example-assets.qrb");
Qt3D::Quick::QuickWindow view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
// There should be some synchronising mechanism to make sure
// the source is set after alll aspects have been completely initialized
// Otherwise we might encounter cases where an Aspect's QML elements have
diff --git a/examples/rollerball/main.cpp b/examples/rollerball/main.cpp
index a10d6f5bb..c991411ad 100644
--- a/examples/rollerball/main.cpp
+++ b/examples/rollerball/main.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <Qt3DQuick/quickwindow.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <Qt3DBulletPhysics/bulletphysicsaspect.h>
#include <exampleresources.h>
@@ -55,7 +55,7 @@ int main(int argc, char* argv[])
initializeAssetResources("../exampleresources/example-assets.qrb");
Qt3D::Quick::QuickWindow view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
view.registerAspect(new Qt3D::BulletPhysicsAspect());
// Expose the window as a context property so we can set the aspect ratio
diff --git a/examples/shadow-map-qml/main.cpp b/examples/shadow-map-qml/main.cpp
index cc99941b6..175ee0be9 100644
--- a/examples/shadow-map-qml/main.cpp
+++ b/examples/shadow-map-qml/main.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <Qt3DQuick/quickwindow.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <QGuiApplication>
#include <QQmlContext>
@@ -55,7 +55,7 @@ int main(int argc, char* argv[])
initializeAssetResources("../exampleresources/example-assets.qrb");
Qt3D::Quick::QuickWindow view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
view.show();
view.resize(1600, 800);
diff --git a/examples/simple-cpp/main.cpp b/examples/simple-cpp/main.cpp
index 347119472..2a18d0e9d 100644
--- a/examples/simple-cpp/main.cpp
+++ b/examples/simple-cpp/main.cpp
@@ -51,7 +51,7 @@
#include <Qt3DCore/QRotateTransform>
#include <Qt3DCore/QTranslateTransform>
-#include <Qt3DRenderer/RendererAspect>
+#include <Qt3DRenderer/QRenderAspect>
#include <Qt3DRenderer/QFrameGraph>
#include <Qt3DRenderer/QViewport>
#include <Qt3DRenderer/QCameraSelector>
@@ -70,7 +70,7 @@ int main(int argc, char* argv[])
QGuiApplication app(argc, argv);
Qt3D::Window view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
// Root entity
diff --git a/examples/simple-qml/main.cpp b/examples/simple-qml/main.cpp
index c51c32e32..6083519c1 100644
--- a/examples/simple-qml/main.cpp
+++ b/examples/simple-qml/main.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <Qt3DQuick/quickwindow.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <QGuiApplication>
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
QGuiApplication app(argc, argv);
Qt3D::Quick::QuickWindow view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
view.setSource(QUrl("qrc:/main.qml"));
view.show();
diff --git a/examples/tessellation-modes/main.cpp b/examples/tessellation-modes/main.cpp
index c543bdbf9..8eb2950cb 100644
--- a/examples/tessellation-modes/main.cpp
+++ b/examples/tessellation-modes/main.cpp
@@ -42,7 +42,7 @@
#include "tessellatedquadmesh.h"
#include <Qt3DQuick/quickwindow.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <exampleresources.h>
@@ -56,7 +56,7 @@ int main(int argc, char* argv[])
initializeAssetResources("../exampleresources/example-assets.qrb");
Qt3D::Quick::QuickWindow view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
// Register our custom types
qmlRegisterType<TessellatedQuadMesh>("Qt3D.Examples", 1, 0, "TessellatedQuadMesh");
diff --git a/examples/torus-cpp/main.cpp b/examples/torus-cpp/main.cpp
index b59c3620f..934ac77b5 100644
--- a/examples/torus-cpp/main.cpp
+++ b/examples/torus-cpp/main.cpp
@@ -64,7 +64,7 @@
#include <Qt3DRenderer/qrenderpassfilter.h>
#include <Qt3DRenderer/qtechniquefilter.h>
#include <Qt3DRenderer/qviewport.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <Qt3DRenderer/qframegraph.h>
#include <Qt3DRenderer/qclearbuffer.h>
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
QGuiApplication app(argc, argv);
Qt3D::Window view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
// Root entity
Qt3D::QEntity *rootEntity = new Qt3D::QEntity();
diff --git a/examples/torus-qml/main.cpp b/examples/torus-qml/main.cpp
index 1efee589c..9e80a8936 100644
--- a/examples/torus-qml/main.cpp
+++ b/examples/torus-qml/main.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <Qt3DQuick/quickwindow.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <QGuiApplication>
@@ -51,7 +51,7 @@ int main(int argc, char* argv[])
QGuiApplication app(argc, argv);
Qt3D::Quick::QuickWindow view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
// There should be some synchronising mechanism to make sure
// the source is set after alll aspects have been completely initialized
// Otherwise we might encounter cases where an Aspect's QML elements have
diff --git a/examples/wireframe/main.cpp b/examples/wireframe/main.cpp
index a55b9f394..435ab09dd 100644
--- a/examples/wireframe/main.cpp
+++ b/examples/wireframe/main.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <Qt3DQuick/quickwindow.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
#include <exampleresources.h>
@@ -54,7 +54,7 @@ int main(int argc, char* argv[])
initializeAssetResources("../exampleresources/example-assets.qrb");
Qt3D::Quick::QuickWindow view;
- view.registerAspect(new Qt3D::RendererAspect());
+ view.registerAspect(new Qt3D::QRenderAspect());
// Expose the window as a context property so we can set the aspect ratio
view.engine()->rootContext()->setContextProperty("_window", &view);