summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWieland Hagen <wieland.hagen@kdab.com>2016-02-17 17:09:59 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-03-09 13:19:36 +0000
commit807a25d74550faf42ed79dfe234b5f1ce3380cf4 (patch)
treeaa582c12c49d86e1164d93decd677fb9c8d94752
parent6f815a4fa51febe894d5075832ca3a071ffe728a (diff)
Removed unneeded QFrameGraph imports in examples
Change-Id: Ic5d1f04b365e43389b88862890b1d137c4f50ef9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--examples/qt3d/assimp-cpp/main.cpp1
-rw-r--r--examples/qt3d/basicshapes-cpp/main.cpp1
-rw-r--r--examples/qt3d/bigscene-cpp/main.cpp1
-rw-r--r--examples/qt3d/cpp_example/main.cpp1
-rw-r--r--examples/qt3d/custom-mesh-cpp/main.cpp1
-rw-r--r--examples/qt3d/cylinder-cpp/main.cpp1
-rw-r--r--examples/qt3d/deferred-renderer-cpp/main.cpp1
-rw-r--r--examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro2
-rw-r--r--examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp70
-rw-r--r--examples/qt3d/dynamicscene-cpp/forwardrenderer.h72
-rw-r--r--examples/qt3d/dynamicscene-cpp/main.cpp2
-rw-r--r--examples/qt3d/materials-cpp/main.cpp1
-rw-r--r--examples/qt3d/simple-cpp/main.cpp1
13 files changed, 0 insertions, 155 deletions
diff --git a/examples/qt3d/assimp-cpp/main.cpp b/examples/qt3d/assimp-cpp/main.cpp
index b465a1729..d68be9e47 100644
--- a/examples/qt3d/assimp-cpp/main.cpp
+++ b/examples/qt3d/assimp-cpp/main.cpp
@@ -55,7 +55,6 @@
#include <Qt3DCore/QEntity>
#include <Qt3DCore/QAspectEngine>
#include <Qt3DInput/QInputAspect>
-#include <Qt3DRender/QFrameGraph>
#include <Qt3DRender/QSceneLoader>
#include <Qt3DRender/QRenderAspect>
#include <Qt3DRender/QForwardRenderer>
diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp
index d75b492df..591c0cfc3 100644
--- a/examples/qt3d/basicshapes-cpp/main.cpp
+++ b/examples/qt3d/basicshapes-cpp/main.cpp
@@ -78,7 +78,6 @@
#include <Qt3DCore/qaspectengine.h>
#include <Qt3DRender/qrenderaspect.h>
-#include <Qt3DRender/qframegraph.h>
#include <Qt3DRender/qforwardrenderer.h>
#include "qt3dwindow.h"
diff --git a/examples/qt3d/bigscene-cpp/main.cpp b/examples/qt3d/bigscene-cpp/main.cpp
index 8e063af1c..15f113280 100644
--- a/examples/qt3d/bigscene-cpp/main.cpp
+++ b/examples/qt3d/bigscene-cpp/main.cpp
@@ -61,7 +61,6 @@
#include <Qt3DCore/qaspectengine.h>
#include <Qt3DInput/QInputAspect>
#include <Qt3DRender/QParameter>
-#include <Qt3DRender/QFrameGraph>
#include <Qt3DRender/QCylinderMesh>
#include <Qt3DRender/QRenderAspect>
#include <Qt3DRender/QCameraSelector>
diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp
index 4db1dead0..575be946a 100644
--- a/examples/qt3d/cpp_example/main.cpp
+++ b/examples/qt3d/cpp_example/main.cpp
@@ -71,7 +71,6 @@
#include <Qt3DRender/qtechniquefilter.h>
#include <Qt3DRender/qviewport.h>
#include <Qt3DRender/qrenderaspect.h>
-#include <Qt3DRender/qframegraph.h>
#include <Qt3DRender/qclearbuffer.h>
#include "qt3dwindow.h"
#include "qfirstpersoncameracontroller.h"
diff --git a/examples/qt3d/custom-mesh-cpp/main.cpp b/examples/qt3d/custom-mesh-cpp/main.cpp
index 6b5ba6118..0ecef24dc 100644
--- a/examples/qt3d/custom-mesh-cpp/main.cpp
+++ b/examples/qt3d/custom-mesh-cpp/main.cpp
@@ -60,7 +60,6 @@
#include <Qt3DRender/QRenderStateSet>
#include <Qt3DRender/QRenderAspect>
-#include <Qt3DRender/QFrameGraph>
#include <Qt3DRender/QForwardRenderer>
#include <Qt3DRender/QPerVertexColorMaterial>
diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp
index 82a64b5dc..96876fd7d 100644
--- a/examples/qt3d/cylinder-cpp/main.cpp
+++ b/examples/qt3d/cylinder-cpp/main.cpp
@@ -62,7 +62,6 @@
#include <Qt3DRender/qtexture.h>
#include <Qt3DRender/qrenderpass.h>
#include <Qt3DRender/qrenderaspect.h>
-#include <Qt3DRender/qframegraph.h>
#include <Qt3DRender/qforwardrenderer.h>
#include <Qt3DCore/qentity.h>
diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp
index e7b7cb9ce..739f3a903 100644
--- a/examples/qt3d/deferred-renderer-cpp/main.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/main.cpp
@@ -50,7 +50,6 @@
#include <Qt3DCore/QEntity>
-#include <Qt3DRender/QFrameGraph>
#include <Qt3DRender/QMaterial>
#include <Qt3DRender/QSphereMesh>
#include <Qt3DRender/QPlaneMesh>
diff --git a/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro b/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro
index ec8f7e624..527cc6183 100644
--- a/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro
+++ b/examples/qt3d/dynamicscene-cpp/dynamicscene-cpp.pro
@@ -7,10 +7,8 @@ QT += 3dcore 3drender 3dinput
SOURCES += \
main.cpp \
examplescene.cpp \
- forwardrenderer.cpp \
boxentity.cpp
HEADERS += \
examplescene.h \
- forwardrenderer.h \
boxentity.h
diff --git a/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp b/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp
deleted file mode 100644
index 24a4cc893..000000000
--- a/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of The Qt Company Ltd nor the names of its
-** contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "forwardrenderer.h"
-
-ForwardRenderer::ForwardRenderer(Qt3DCore::QNode *parent)
- : Qt3DRender::QFrameGraph(parent)
- , m_viewport(new Qt3DRender::QViewport())
- , m_cameraSelector(new Qt3DRender::QCameraSelector())
- , m_clearBuffer(new Qt3DRender::QClearBuffer())
-{
- m_viewport->setNormalizedRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f));
- m_viewport->setClearColor(Qt::white);
- m_clearBuffer->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer);
- m_cameraSelector->setParent(m_viewport);
- m_clearBuffer->setParent(m_cameraSelector);
- setActiveFrameGraph(m_viewport);
-}
-
-void ForwardRenderer::setCamera(Qt3DCore::QEntity *camera)
-{
- m_cameraSelector->setCamera(camera);
-}
diff --git a/examples/qt3d/dynamicscene-cpp/forwardrenderer.h b/examples/qt3d/dynamicscene-cpp/forwardrenderer.h
deleted file mode 100644
index 57b8dd976..000000000
--- a/examples/qt3d/dynamicscene-cpp/forwardrenderer.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of The Qt Company Ltd nor the names of its
-** contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef FORWARDRENDERER_H
-#define FORWARDRENDERER_H
-
-#include <Qt3DRender/QFrameGraph>
-#include <Qt3DRender/QViewport>
-#include <Qt3DRender/QCameraSelector>
-#include <Qt3DRender/QClearBuffer>
-
-class ForwardRenderer : public Qt3DRender::QFrameGraph
-{
-public:
- ForwardRenderer(Qt3DCore::QNode *parent);
-
- void setCamera(Qt3DCore::QEntity *camera);
-
-private:
- Qt3DRender::QViewport *m_viewport;
- Qt3DRender::QCameraSelector *m_cameraSelector;
- Qt3DRender::QClearBuffer *m_clearBuffer;
-};
-
-#endif // FORWARDRENDERER_H
diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp
index 36cf97df2..0ce12939c 100644
--- a/examples/qt3d/dynamicscene-cpp/main.cpp
+++ b/examples/qt3d/dynamicscene-cpp/main.cpp
@@ -56,10 +56,8 @@
#include <Qt3DInput/QInputAspect>
#include <Qt3DRender/QRenderAspect>
-#include <Qt3DRender/QFrameGraph>
#include <Qt3DRender/QForwardRenderer>
-#include "forwardrenderer.h"
#include "examplescene.h"
#include "qt3dwindow.h"
#include "qfirstpersoncameracontroller.h"
diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp
index dd9f56144..91c0ec8c2 100644
--- a/examples/qt3d/materials-cpp/main.cpp
+++ b/examples/qt3d/materials-cpp/main.cpp
@@ -60,7 +60,6 @@
#include <Qt3DRender/QPhongMaterial>
#include <Qt3DRender/QDiffuseMapMaterial>
#include <Qt3DRender/QForwardRenderer>
-#include <Qt3DRender/QFrameGraph>
#include <Qt3DRender/QTextureImage>
#include "planeentity.h"
diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp
index 1ca6551d0..38d8842ed 100644
--- a/examples/qt3d/simple-cpp/main.cpp
+++ b/examples/qt3d/simple-cpp/main.cpp
@@ -59,7 +59,6 @@
#include <Qt3DInput/QInputAspect>
#include <Qt3DRender/QRenderAspect>
-#include <Qt3DRender/QFrameGraph>
#include <Qt3DRender/QForwardRenderer>
#include <Qt3DRender/QPhongMaterial>
#include <Qt3DRender/QCylinderMesh>