summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/deferred-renderer-cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-10-18 09:58:19 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-10-19 10:51:25 +0000
commit18964d9ebed281a72506eccdf26319ce18be46d7 (patch)
tree9c184a8645f0d3ea72fc692f84332fc9be01bf2e /examples/qt3d/deferred-renderer-cpp
parentd9ae5577ea87ae23731fe54dd79fd80ecd1de1fa (diff)
Rename Renderer -> Render throughout
This is for consistency between the C++ namespaces and QML imports and with the other aspects. Change-Id: I73392f138b4e519b12888f52530123e3d0ba445e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/deferred-renderer-cpp')
-rw-r--r--examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro2
-rw-r--r--examples/qt3d/deferred-renderer-cpp/deferredrenderer.h14
-rw-r--r--examples/qt3d/deferred-renderer-cpp/finaleffect.cpp4
-rw-r--r--examples/qt3d/deferred-renderer-cpp/finaleffect.h4
-rw-r--r--examples/qt3d/deferred-renderer-cpp/gbuffer.h6
-rw-r--r--examples/qt3d/deferred-renderer-cpp/main.cpp18
-rw-r--r--examples/qt3d/deferred-renderer-cpp/pointlightblock.h2
-rw-r--r--examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp4
-rw-r--r--examples/qt3d/deferred-renderer-cpp/sceneeffect.h4
9 files changed, 29 insertions, 29 deletions
diff --git a/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro b/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro
index 5f26c32c9..261d893ce 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro
+++ b/examples/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro
@@ -2,7 +2,7 @@
error( "Couldn't find the examples.pri file!" )
}
-QT += 3dcore 3drenderer 3dinput
+QT += 3dcore 3drender 3dinput
HEADERS += \
gbuffer.h \
diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
index 0f75d669d..902d2654d 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
@@ -37,13 +37,13 @@
#ifndef DEFERREDRENDERER_H
#define DEFERREDRENDERER_H
-#include <Qt3DRenderer/QViewport>
-#include <Qt3DRenderer/QClearBuffer>
-#include <Qt3DRenderer/QLayerFilter>
-#include <Qt3DRenderer/QRenderPassFilter>
-#include <Qt3DRenderer/QRenderTargetSelector>
-#include <Qt3DRenderer/QCameraSelector>
-#include <Qt3DRenderer/QAnnotation>
+#include <Qt3DRender/QViewport>
+#include <Qt3DRender/QClearBuffer>
+#include <Qt3DRender/QLayerFilter>
+#include <Qt3DRender/QRenderPassFilter>
+#include <Qt3DRender/QRenderTargetSelector>
+#include <Qt3DRender/QCameraSelector>
+#include <Qt3DRender/QAnnotation>
class DeferredRenderer : public Qt3DRender::QViewport
{
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
index 9be53d6a1..fae61c78d 100644
--- a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
@@ -36,8 +36,8 @@
#include "finaleffect.h"
-#include <Qt3DRenderer/QOpenGLFilter>
-#include <Qt3DRenderer/QShaderProgram>
+#include <Qt3DRender/QOpenGLFilter>
+#include <Qt3DRender/QShaderProgram>
#include <QUrl>
FinalEffect::FinalEffect(Qt3DCore::QNode *parent)
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.h b/examples/qt3d/deferred-renderer-cpp/finaleffect.h
index e99276c1b..cdfdfaf0e 100644
--- a/examples/qt3d/deferred-renderer-cpp/finaleffect.h
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.h
@@ -37,8 +37,8 @@
#ifndef FINALEFFECT_H
#define FINALEFFECT_H
-#include <Qt3DRenderer/QEffect>
-#include <Qt3DRenderer/QTechnique>
+#include <Qt3DRender/QEffect>
+#include <Qt3DRender/QTechnique>
class FinalEffect : public Qt3DRender::QEffect
{
diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.h b/examples/qt3d/deferred-renderer-cpp/gbuffer.h
index 86412c482..3ea57da7f 100644
--- a/examples/qt3d/deferred-renderer-cpp/gbuffer.h
+++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.h
@@ -37,9 +37,9 @@
#ifndef GBUFFER_H
#define GBUFFER_H
-#include <Qt3DRenderer/QRenderTarget>
-#include <Qt3DRenderer/qtexture.h>
-#include <Qt3DRenderer/QRenderAttachment>
+#include <Qt3DRender/QRenderTarget>
+#include <Qt3DRender/qtexture.h>
+#include <Qt3DRender/QRenderAttachment>
class GBuffer : public Qt3DRender::QRenderTarget
{
diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp
index 625c320c9..086ba6677 100644
--- a/examples/qt3d/deferred-renderer-cpp/main.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/main.cpp
@@ -39,21 +39,21 @@
#include <Qt3DInput/QInputAspect>
-#include <Qt3DRenderer/QRenderAspect>
-#include <Qt3DRenderer/QFrameGraph>
-#include <Qt3DRenderer/QMaterial>
-#include <Qt3DRenderer/QSphereMesh>
-#include <Qt3DRenderer/QPlaneMesh>
-#include <Qt3DRenderer/QLayer>
-#include <Qt3DRenderer/QParameter>
+#include <Qt3DRender/QRenderAspect>
+#include <Qt3DRender/QFrameGraph>
+#include <Qt3DRender/QMaterial>
+#include <Qt3DRender/QSphereMesh>
+#include <Qt3DRender/QPlaneMesh>
+#include <Qt3DRender/QLayer>
+#include <Qt3DRender/QParameter>
#include <Qt3DCore/QCamera>
#include <Qt3DCore/QCameraLens>
#include <Qt3DCore/QTransform>
#include <Qt3DCore/QLookAtTransform>
#include <Qt3DCore/QRotateTransform>
#include <Qt3DCore/QTranslateTransform>
-#include <Qt3DRenderer/QPointLight>
-#include <Qt3DRenderer/QWindow>
+#include <Qt3DRender/QPointLight>
+#include <Qt3DRender/QWindow>
#include <Qt3DCore/qaspectengine.h>
#include <QGuiApplication>
diff --git a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
index 1364189c2..c9dd3f267 100644
--- a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
+++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
@@ -37,7 +37,7 @@
#ifndef POINTLIGHTBLOCK_H
#define POINTLIGHTBLOCK_H
-#include <Qt3DRenderer/QShaderData>
+#include <Qt3DRender/QShaderData>
class PointLightBlock : public Qt3DRender::QShaderData
{
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
index 99517c68d..64add3ef7 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
@@ -36,8 +36,8 @@
#include "sceneeffect.h"
-#include <Qt3DRenderer/QOpenGLFilter>
-#include <Qt3DRenderer/QShaderProgram>
+#include <Qt3DRender/QOpenGLFilter>
+#include <Qt3DRender/QShaderProgram>
#include <QUrl>
SceneEffect::SceneEffect(Qt3DCore::QNode *parent)
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
index 6d17c8de5..e5f0dba33 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
@@ -37,8 +37,8 @@
#ifndef SCENEEFFECT_H
#define SCENEEFFECT_H
-#include <Qt3DRenderer/QEffect>
-#include <Qt3DRenderer/QTechnique>
+#include <Qt3DRender/QEffect>
+#include <Qt3DRender/QTechnique>
class SceneEffect : public Qt3DRender::QEffect
{