diff options
author | Robert Brock <robert.brock@kdab.com> | 2016-05-09 12:13:53 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:45:14 +0000 |
commit | b24a2479914004d897048ab096d946677b73ff1e (patch) | |
tree | fd7d257dbb7ee6b469f0c843db8cd78b1785f282 /examples | |
parent | b4e3be3f03c00cced348cd33541ab50d71495aaf (diff) |
Moved skybox example to manual test
Part of an examples cleanup
Change-Id: I31593b7e81d261eb919f6fb3055a878bfce01fd1
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qt3d/qt3d.pro | 1 | ||||
-rw-r--r-- | examples/qt3d/skybox/Skybox.qml | 159 | ||||
-rw-r--r-- | examples/qt3d/skybox/doc/src/skybox.qdoc | 32 | ||||
-rw-r--r-- | examples/qt3d/skybox/main.cpp | 61 | ||||
-rw-r--r-- | examples/qt3d/skybox/main.qml | 98 | ||||
-rw-r--r-- | examples/qt3d/skybox/skybox.pro | 12 | ||||
-rw-r--r-- | examples/qt3d/skybox/skybox.qrc | 6 |
7 files changed, 0 insertions, 369 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index 746f7c050..1b359a4e8 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -11,7 +11,6 @@ SUBDIRS += \ wave \ materials-cpp \ scene3d \ - skybox \ controls \ anaglyph-rendering \ planets-qml \ diff --git a/examples/qt3d/skybox/Skybox.qml b/examples/qt3d/skybox/Skybox.qml deleted file mode 100644 index 84d999771..000000000 --- a/examples/qt3d/skybox/Skybox.qml +++ /dev/null @@ -1,159 +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$ -** -****************************************************************************/ - -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Extras 2.0 - -Entity { - - property alias cameraPosition: transform.translation; - property string sourceDirectory: ""; - property string extension: ".webp" - - property TextureCubeMap skyboxTexture: TextureCubeMap { - generateMipMaps: false - magnificationFilter: Texture.Linear - minificationFilter: Texture.Linear - wrapMode { - x: WrapMode.ClampToEdge - y: WrapMode.ClampToEdge - } - TextureImage { face: Texture.CubeMapPositiveX; source: sourceDirectory + "_posx" + extension } - TextureImage { face: Texture.CubeMapPositiveY; source: sourceDirectory + "_posy" + extension } - TextureImage { face: Texture.CubeMapPositiveZ; source: sourceDirectory + "_posz" + extension } - TextureImage { face: Texture.CubeMapNegativeX; source: sourceDirectory + "_negx" + extension } - TextureImage { face: Texture.CubeMapNegativeY; source: sourceDirectory + "_negy" + extension } - TextureImage { face: Texture.CubeMapNegativeZ; source: sourceDirectory + "_negz" + extension } - } - - ShaderProgram { - id: gl3SkyboxShader - vertexShaderCode: loadSource("qrc:/shaders/gl3/skybox.vert") - fragmentShaderCode: loadSource("qrc:/shaders/gl3/skybox.frag") - } - - ShaderProgram { - id: gl2es2SkyboxShader - vertexShaderCode: loadSource("qrc:/shaders/es2/skybox.vert") - fragmentShaderCode: loadSource("qrc:/shaders/es2/skybox.frag") - } - - CuboidMesh { - id: cuboidMesh - yzMeshResolution: Qt.size(2, 2) - xzMeshResolution: Qt.size(2, 2) - xyMeshResolution: Qt.size(2, 2) - } - - Transform { - id: transform - } - - Material { - id: skyboxMaterial - parameters: Parameter { name: "skyboxTexture"; value: skyboxTexture} - - effect: Effect { - techniques: [ - // GL3 Technique - Technique { - graphicsApiFilter { - api: GraphicsApiFilter.OpenGL - profile: GraphicsApiFilter.CoreProfile - majorVersion: 3 - minorVersion: 1 - } - renderPasses: RenderPass { - shaderProgram: gl3SkyboxShader - renderStates: [ - // cull front faces - CullFace { mode: CullFace.Front }, - DepthTest { depthFunction: DepthTest.LessOrEqual } - ] - } - }, - Technique { - graphicsApiFilter { - api: GraphicsApiFilter.OpenGL - profile: GraphicsApiFilter.NoProfile - majorVersion: 2 - minorVersion: 0 - } - renderPasses: RenderPass { - shaderProgram: gl2es2SkyboxShader - renderStates: [ - CullFace { mode: CullFace.Front }, - DepthTest { depthFunction: DepthTest.LessOrEqual } - ] - } - }, - Technique { - graphicsApiFilter { - api: GraphicsApiFilter.OpenGLES - profile: GraphicsApiFilter.NoProfile - majorVersion: 2 - minorVersion: 0 - } - renderPasses: RenderPass { - shaderProgram: gl2es2SkyboxShader - renderStates: [ - CullFace { mode: CullFace.Front }, - DepthTest { depthFunction: DepthTest.LessOrEqual } - ] - } - } - ] - } - } - - components: [cuboidMesh, skyboxMaterial, transform] -} - diff --git a/examples/qt3d/skybox/doc/src/skybox.qdoc b/examples/qt3d/skybox/doc/src/skybox.qdoc deleted file mode 100644 index a51c35299..000000000 --- a/examples/qt3d/skybox/doc/src/skybox.qdoc +++ /dev/null @@ -1,32 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example skybox - \title Qt 3D: Skybox QML Example - \ingroup qt3d-examples-qml -*/ diff --git a/examples/qt3d/skybox/main.cpp b/examples/qt3d/skybox/main.cpp deleted file mode 100644 index 066421e9d..000000000 --- a/examples/qt3d/skybox/main.cpp +++ /dev/null @@ -1,61 +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 <Qt3DQuickExtras/qt3dquickwindow.h> -#include <QGuiApplication> - -int main(int argc, char* argv[]) -{ - QGuiApplication app(argc, argv); - Qt3DExtras::Quick::Qt3DQuickWindow view; - view.setSource(QUrl("qrc:/main.qml")); - view.show(); - return app.exec(); -} diff --git a/examples/qt3d/skybox/main.qml b/examples/qt3d/skybox/main.qml deleted file mode 100644 index 13468906c..000000000 --- a/examples/qt3d/skybox/main.qml +++ /dev/null @@ -1,98 +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$ -** -****************************************************************************/ - -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Input 2.0 -import Qt3D.Extras 2.0 - -Entity { - id: root - - components: [ - RenderSettings { - ForwardRenderer { - camera: basicCamera - clearColor: "black" - } - }, - // Event Source will be set by the Qt3DQuickWindow - InputSettings { } - ] - - Camera { - id: basicCamera - projectionType: CameraLens.PerspectiveProjection - fieldOfView: 60 - aspectRatio: 16/9 - nearPlane: 0.01 - farPlane: 1000.0 - position: Qt.vector3d( 0.0, 0.0, 40.0 ) - viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 ) - upVector: Qt.vector3d( 0.0, 1.0, 0.0 ) - } - - // So that the camera is rendered always at the same position as the camera - SkyboxEntity { - cameraPosition: basicCamera.position - baseName: "qrc:/assets/cubemaps/miramar/miramar" - extension: ".webp" - } - - FirstPersonCameraController { camera: basicCamera } - - Entity { - components: [ - SphereMesh { radius: 5 }, - PhongMaterial { diffuse: "dodgerblue" } - ] - } -} - diff --git a/examples/qt3d/skybox/skybox.pro b/examples/qt3d/skybox/skybox.pro deleted file mode 100644 index d836f2058..000000000 --- a/examples/qt3d/skybox/skybox.pro +++ /dev/null @@ -1,12 +0,0 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} - -QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras - -RESOURCES += \ - skybox.qrc \ - ../exampleresources/cubemaps.qrc - -SOURCES += \ - main.cpp diff --git a/examples/qt3d/skybox/skybox.qrc b/examples/qt3d/skybox/skybox.qrc deleted file mode 100644 index 927dfb169..000000000 --- a/examples/qt3d/skybox/skybox.qrc +++ /dev/null @@ -1,6 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>main.qml</file> - <file>Skybox.qml</file> - </qresource> -</RCC> |