summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-01-16 12:55:46 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-01-18 15:31:19 +0100
commitffb1b315eaad393049b96595e4f755458f72b57b (patch)
treea6f520dc36bbf31a9e7321098abff06314a46d72 /examples
parent57f6378bb469924a70cb23c0caf2ce08a78be8a5 (diff)
use the default ForwardRenderer in the examples
Change-Id: Iade146d9d63ba9d8b33953467e67d5864d0469b9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/bigmodel-qml/ForwardRenderer.qml73
-rw-r--r--examples/bigmodel-qml/bigmodel-qml.pro3
-rw-r--r--examples/bigmodel-qml/bigmodel-qml.qrc1
-rw-r--r--examples/cylinder-qml/ForwardRenderer.qml73
-rw-r--r--examples/cylinder-qml/cylinder-qml.pro3
-rw-r--r--examples/cylinder-qml/cylinder-qml.qrc1
-rw-r--r--examples/cylinder-qml/main.qml1
-rw-r--r--examples/keyboardinput-qml/main.qml15
-rw-r--r--examples/loader-qml/main.qml15
-rw-r--r--examples/rollerball/ForwardRenderer.qml70
-rw-r--r--examples/rollerball/main.qml1
-rw-r--r--examples/rollerball/rollerball.pro3
-rw-r--r--examples/rollerball/rollerball.qrc1
-rw-r--r--examples/simple-qml/main.qml14
-rw-r--r--examples/tessellation-modes/ForwardRenderer.qml70
-rw-r--r--examples/tessellation-modes/main.qml1
-rw-r--r--examples/tessellation-modes/tessellation-modes.pro1
-rw-r--r--examples/tessellation-modes/tessellation-modes.qrc1
-rw-r--r--examples/torus-qml/ForwardRenderer.qml73
-rw-r--r--examples/torus-qml/main.qml1
-rw-r--r--examples/torus-qml/torus-qml.pro3
-rw-r--r--examples/torus-qml/torus-qml.qrc1
-rw-r--r--examples/wireframe/ForwardRenderer.qml68
-rw-r--r--examples/wireframe/TrefoilKnot.qml2
-rw-r--r--examples/wireframe/wireframe.pro1
-rw-r--r--examples/wireframe/wireframe.qrc1
26 files changed, 15 insertions, 482 deletions
diff --git a/examples/bigmodel-qml/ForwardRenderer.qml b/examples/bigmodel-qml/ForwardRenderer.qml
deleted file mode 100644
index 160850d71..000000000
--- a/examples/bigmodel-qml/ForwardRenderer.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import Qt3D 2.0
-import Qt3D.Render 2.0
-
-TechniqueFilter {
- id: root
-
- // Expose the viewport rect and camera. This allows users of this
- // forward rendering framegraph to decide which camera in the
- // scene renders to a given viewport region.
- //
- // Using this as a building block for a larger framegraph would
- // allow a scene to be rendered multiple times f.i. to different
- // viewports using different cameras
- property alias viewportRect: viewport.rect
- property alias camera: cameraSelector.camera
-
- criteria : [
- Annotation { name : "RenderingStyle"; value : "forward"}
- ]
-
- Viewport {
- id: viewport
- rect: Qt.rect(0.0, 0.0, 1.0, 1.0) // From Top Left
-
- ClearBuffer {
- buffers : ClearBuffer.ColorDepthBuffer
- CameraSelector {
- id : cameraSelector
- }
- }
- }
-}
diff --git a/examples/bigmodel-qml/bigmodel-qml.pro b/examples/bigmodel-qml/bigmodel-qml.pro
index fd598c3ed..76b9b972d 100644
--- a/examples/bigmodel-qml/bigmodel-qml.pro
+++ b/examples/bigmodel-qml/bigmodel-qml.pro
@@ -6,8 +6,7 @@ SOURCES += \
main.cpp
OTHER_FILES += \
- main.qml \
- ForwardRenderer.qml
+ main.qml
RESOURCES += \
bigmodel-qml.qrc
diff --git a/examples/bigmodel-qml/bigmodel-qml.qrc b/examples/bigmodel-qml/bigmodel-qml.qrc
index fedae75c1..5f6483ac3 100644
--- a/examples/bigmodel-qml/bigmodel-qml.qrc
+++ b/examples/bigmodel-qml/bigmodel-qml.qrc
@@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/">
<file>main.qml</file>
- <file>ForwardRenderer.qml</file>
</qresource>
</RCC>
diff --git a/examples/cylinder-qml/ForwardRenderer.qml b/examples/cylinder-qml/ForwardRenderer.qml
deleted file mode 100644
index ec72b44ca..000000000
--- a/examples/cylinder-qml/ForwardRenderer.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import Qt3D 2.0
-import Qt3D.Render 2.0
-
-TechniqueFilter {
- id: root
-
- // Expose the viewport rect and camera. This allows users of this
- // forward rendering framegraph to decide which camera in the
- // scene renders to a given viewport region.
- //
- // Using this as a building block for a larger framegraph would
- // allow a scene to be rendered multiple times f.i. to different
- // viewports using different cameras
- property alias viewportRect: viewport.rect
- property alias camera: cameraSelector.camera
-
- requires : [
- Annotation { name : "RenderingStyle"; value : "forward"}
- ]
-
- Viewport {
- id: viewport
- rect: Qt.rect(0.0, 0.0, 1.0, 1.0) // From Top Left
-
- ClearBuffer {
- buffers : ClearBuffer.ColorDepthBuffer
- CameraSelector {
- id : cameraSelector
- }
- }
- }
-}
diff --git a/examples/cylinder-qml/cylinder-qml.pro b/examples/cylinder-qml/cylinder-qml.pro
index 8392eaa7e..85392449b 100644
--- a/examples/cylinder-qml/cylinder-qml.pro
+++ b/examples/cylinder-qml/cylinder-qml.pro
@@ -6,8 +6,7 @@ SOURCES += \
main.cpp
OTHER_FILES += \
- main.qml \
- ForwardRenderer.qml
+ main.qml
RESOURCES += \
cylinder-qml.qrc
diff --git a/examples/cylinder-qml/cylinder-qml.qrc b/examples/cylinder-qml/cylinder-qml.qrc
index fedae75c1..5f6483ac3 100644
--- a/examples/cylinder-qml/cylinder-qml.qrc
+++ b/examples/cylinder-qml/cylinder-qml.qrc
@@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/">
<file>main.qml</file>
- <file>ForwardRenderer.qml</file>
</qresource>
</RCC>
diff --git a/examples/cylinder-qml/main.qml b/examples/cylinder-qml/main.qml
index 0b8665d9d..ef5a6a1a5 100644
--- a/examples/cylinder-qml/main.qml
+++ b/examples/cylinder-qml/main.qml
@@ -65,6 +65,7 @@ Entity {
id : external_forward_renderer
activeFrameGraph : ForwardRenderer {
camera: camera
+ clearColor: "black"
}
}
diff --git a/examples/keyboardinput-qml/main.qml b/examples/keyboardinput-qml/main.qml
index b36c9eaa9..42c01288b 100644
--- a/examples/keyboardinput-qml/main.qml
+++ b/examples/keyboardinput-qml/main.qml
@@ -61,19 +61,8 @@ Entity {
Configuration { controlledCamera: camera }
components: FrameGraph {
- activeFrameGraph: Viewport {
- id: viewport
- rect: Qt.rect(0.0, 0.0, 1.0, 1.0) // From Top Left
- clearColor: Qt.rgba(0.2, 0.2, 0.2, 1)
-
- CameraSelector {
- id : cameraSelector
- camera: camera
-
- ClearBuffer {
- buffers : ClearBuffer.ColorDepthBuffer
- }
- }
+ activeFrameGraph: ForwardRenderer {
+ camera: camera
}
}
diff --git a/examples/loader-qml/main.qml b/examples/loader-qml/main.qml
index 15b2971c5..710bae413 100644
--- a/examples/loader-qml/main.qml
+++ b/examples/loader-qml/main.qml
@@ -64,19 +64,8 @@ Entity {
components: [
FrameGraph {
- activeFrameGraph: Viewport {
- id: viewport
- rect: Qt.rect(0.0, 0.0, 1.0, 1.0) // From Top Left
- clearColor: Qt.rgba(0, 0.5, 1, 1)
-
- CameraSelector {
- id : cameraSelector
- camera: camera
-
- ClearBuffer {
- buffers : ClearBuffer.ColorDepthBuffer
- }
- }
+ activeFrameGraph: ForwardRenderer {
+ camera: camera
}
}
]
diff --git a/examples/rollerball/ForwardRenderer.qml b/examples/rollerball/ForwardRenderer.qml
deleted file mode 100644
index 7732f8827..000000000
--- a/examples/rollerball/ForwardRenderer.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import Qt3D 2.0
-import Qt3D.Render 2.0
-
-TechniqueFilter {
- id: root
- objectName : "techniqueFilter"
-
- // Expose camera to allow user to choose which camera to use for rendering
- property alias camera: cameraSelector.camera
-
- // Select the forward rendering Technique of any used Effect
- requires: [ Annotation { name: "renderingStyle"; value: "forward" } ]
-
- // Use the whole viewport
- Viewport {
- id: viewport
- objectName : "viewport"
- rect: Qt.rect(0.0, 0.0, 1.0, 1.0)
-
- // Use the specified camera
- CameraSelector {
- id : cameraSelector
- objectName : "cameraSelector"
- ClearBuffer {
- buffers : ClearBuffer.ColorDepthBuffer
- }
- }
- }
-}
diff --git a/examples/rollerball/main.qml b/examples/rollerball/main.qml
index 7c88a11a2..02ed076a5 100644
--- a/examples/rollerball/main.qml
+++ b/examples/rollerball/main.qml
@@ -53,6 +53,7 @@ Entity {
activeFrameGraph: ForwardRenderer {
id: renderer
camera: mainCamera
+ clearColor: "black"
}
}
]
diff --git a/examples/rollerball/rollerball.pro b/examples/rollerball/rollerball.pro
index ec3071736..e7c906f97 100644
--- a/examples/rollerball/rollerball.pro
+++ b/examples/rollerball/rollerball.pro
@@ -13,8 +13,7 @@ OTHER_FILES += \
main.qml \
AdsEffect.qml \
Renderable.qml \
- SimpleEffect.qml \
- ForwardRenderer.qml
+ SimpleEffect.qml
RESOURCES += \
rollerball.qrc
diff --git a/examples/rollerball/rollerball.qrc b/examples/rollerball/rollerball.qrc
index dee4c6cfb..ce83428c2 100644
--- a/examples/rollerball/rollerball.qrc
+++ b/examples/rollerball/rollerball.qrc
@@ -2,7 +2,6 @@
<qresource prefix="/">
<file>main.qml</file>
<file>AdsEffect.qml</file>
- <file>ForwardRenderer.qml</file>
<file>BasicCamera.qml</file>
<file>AdsMaterial.qml</file>
<file>BallEntity.qml</file>
diff --git a/examples/simple-qml/main.qml b/examples/simple-qml/main.qml
index 7109512bd..79be3867d 100644
--- a/examples/simple-qml/main.qml
+++ b/examples/simple-qml/main.qml
@@ -64,19 +64,9 @@ Entity {
components: [
FrameGraph {
- activeFrameGraph: Viewport {
- id: viewport
- rect: Qt.rect(0.0, 0.0, 1.0, 1.0) // From Top Left
+ activeFrameGraph: ForwardRenderer {
clearColor: Qt.rgba(0, 0.5, 1, 1)
-
- CameraSelector {
- id : cameraSelector
- camera: camera
-
- ClearBuffer {
- buffers : ClearBuffer.ColorDepthBuffer
- }
- }
+ camera: camera
}
}
]
diff --git a/examples/tessellation-modes/ForwardRenderer.qml b/examples/tessellation-modes/ForwardRenderer.qml
deleted file mode 100644
index 7732f8827..000000000
--- a/examples/tessellation-modes/ForwardRenderer.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import Qt3D 2.0
-import Qt3D.Render 2.0
-
-TechniqueFilter {
- id: root
- objectName : "techniqueFilter"
-
- // Expose camera to allow user to choose which camera to use for rendering
- property alias camera: cameraSelector.camera
-
- // Select the forward rendering Technique of any used Effect
- requires: [ Annotation { name: "renderingStyle"; value: "forward" } ]
-
- // Use the whole viewport
- Viewport {
- id: viewport
- objectName : "viewport"
- rect: Qt.rect(0.0, 0.0, 1.0, 1.0)
-
- // Use the specified camera
- CameraSelector {
- id : cameraSelector
- objectName : "cameraSelector"
- ClearBuffer {
- buffers : ClearBuffer.ColorDepthBuffer
- }
- }
- }
-}
diff --git a/examples/tessellation-modes/main.qml b/examples/tessellation-modes/main.qml
index fd3158d54..ae543789c 100644
--- a/examples/tessellation-modes/main.qml
+++ b/examples/tessellation-modes/main.qml
@@ -54,6 +54,7 @@ Entity {
activeFrameGraph: ForwardRenderer {
id: renderer
camera: mainCamera
+ clearColor: "black"
}
}
]
diff --git a/examples/tessellation-modes/tessellation-modes.pro b/examples/tessellation-modes/tessellation-modes.pro
index ab4ca80f5..b95545243 100644
--- a/examples/tessellation-modes/tessellation-modes.pro
+++ b/examples/tessellation-modes/tessellation-modes.pro
@@ -17,7 +17,6 @@ OTHER_FILES += \
TessellatedWireframeEffect.qml \
TessellatedWireframeMaterial.qml \
TessellatedQuad.qml \
- ForwardRenderer.qml \
shaders/*
RESOURCES += \
diff --git a/examples/tessellation-modes/tessellation-modes.qrc b/examples/tessellation-modes/tessellation-modes.qrc
index 705616de4..466c9307a 100644
--- a/examples/tessellation-modes/tessellation-modes.qrc
+++ b/examples/tessellation-modes/tessellation-modes.qrc
@@ -1,7 +1,6 @@
<RCC>
<qresource prefix="/">
<file>main.qml</file>
- <file>ForwardRenderer.qml</file>
<file>BasicCamera.qml</file>
<file>TessellatedWireframeEffect.qml</file>
<file>TessellatedWireframeMaterial.qml</file>
diff --git a/examples/torus-qml/ForwardRenderer.qml b/examples/torus-qml/ForwardRenderer.qml
deleted file mode 100644
index 558a7deda..000000000
--- a/examples/torus-qml/ForwardRenderer.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import Qt3D 2.0
-import Qt3D.Render 2.0
-
-TechniqueFilter {
- id: root
-
- // Expose the viewport rect and camera. This allows users of this
- // forward rendering framegraph to decide which camera in the
- // scene renders to a given viewport region.
- //
- // Using this as a building block for a larger framegraph would
- // allow a scene to be rendered multiple times f.i. to different
- // viewports using different cameras
- property alias viewportRect: viewport.rect
- property alias camera: cameraSelector.camera
-
- requires: [
- Annotation { name : "RenderingStyle"; value : "forward"}
- ]
-
- Viewport {
- id: viewport
- rect: Qt.rect(0.0, 0.0, 1.0, 1.0) // From Top Left
-
- ClearBuffer {
- buffers : ClearBuffer.ColorDepthBuffer
- CameraSelector {
- id : cameraSelector
- }
- }
- }
-}
diff --git a/examples/torus-qml/main.qml b/examples/torus-qml/main.qml
index 60304880d..80cb7fa5d 100644
--- a/examples/torus-qml/main.qml
+++ b/examples/torus-qml/main.qml
@@ -65,6 +65,7 @@ Entity {
id : external_forward_renderer
activeFrameGraph : ForwardRenderer {
camera: camera
+ clearColor: "black"
}
}
diff --git a/examples/torus-qml/torus-qml.pro b/examples/torus-qml/torus-qml.pro
index bf2f68240..cb1a88003 100644
--- a/examples/torus-qml/torus-qml.pro
+++ b/examples/torus-qml/torus-qml.pro
@@ -6,8 +6,7 @@ SOURCES += \
main.cpp
OTHER_FILES += \
- main.qml \
- ForwardRenderer.qml
+ main.qml
RESOURCES += \
torus-qml.qrc
diff --git a/examples/torus-qml/torus-qml.qrc b/examples/torus-qml/torus-qml.qrc
index fedae75c1..5f6483ac3 100644
--- a/examples/torus-qml/torus-qml.qrc
+++ b/examples/torus-qml/torus-qml.qrc
@@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/">
<file>main.qml</file>
- <file>ForwardRenderer.qml</file>
</qresource>
</RCC>
diff --git a/examples/wireframe/ForwardRenderer.qml b/examples/wireframe/ForwardRenderer.qml
deleted file mode 100644
index 80d8e5fdb..000000000
--- a/examples/wireframe/ForwardRenderer.qml
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import Qt3D 2.0
-import Qt3D.Render 2.0
-
-TechniqueFilter {
- id: root
-
- // Expose camera to allow user to choose which camera to use for rendering
- property alias camera: cameraSelector.camera
-
- // Select the forward rendering Technique of any used Effect
- requires: [ Annotation { name: "renderingStyle"; value: "forward" } ]
-
- // Use the whole viewport
- Viewport {
- id: viewport
- rect: Qt.rect(0.0, 0.0, 1.0, 1.0)
- clearColor: Qt.rgba( 1.0, 1.0, 1.0, 1.0 )
-
- // Use the specified camera
- CameraSelector {
- id : cameraSelector
- ClearBuffer {
- buffers: ClearBuffer.ColorDepthBuffer
- }
- }
- }
-}
diff --git a/examples/wireframe/TrefoilKnot.qml b/examples/wireframe/TrefoilKnot.qml
index 84a0aa373..2df1aebf1 100644
--- a/examples/wireframe/TrefoilKnot.qml
+++ b/examples/wireframe/TrefoilKnot.qml
@@ -65,6 +65,6 @@ Entity {
Mesh {
id: mesh
- source: ":/assets/obj/trefoil.obj"
+ source: "assets/obj/trefoil.obj"
}
}
diff --git a/examples/wireframe/wireframe.pro b/examples/wireframe/wireframe.pro
index b5e424934..7dc5eb255 100644
--- a/examples/wireframe/wireframe.pro
+++ b/examples/wireframe/wireframe.pro
@@ -14,7 +14,6 @@ OTHER_FILES += \
BasicCamera.qml \
WireframeEffect.qml \
WireframeMaterial.qml \
- ForwardRenderer.qml \
TrefoilKnot.qml
RESOURCES += \
diff --git a/examples/wireframe/wireframe.qrc b/examples/wireframe/wireframe.qrc
index fd4e873ac..c73c8418c 100644
--- a/examples/wireframe/wireframe.qrc
+++ b/examples/wireframe/wireframe.qrc
@@ -1,7 +1,6 @@
<RCC>
<qresource prefix="/">
<file>main.qml</file>
- <file>ForwardRenderer.qml</file>
<file>BasicCamera.qml</file>
<file>TrefoilKnot.qml</file>
<file>WireframeEffect.qml</file>