diff options
author | Robert Brock <robert.brock@kdab.com> | 2016-05-09 09:29:48 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:44:36 +0000 |
commit | f26fd16f80d9f2fc921b3858cc3f763b10aefa2c (patch) | |
tree | 44c9d59e1989365f18b3443b73e06815de8e671a /examples | |
parent | e0c32ec2552c13975b191ced99176a15c51c8193 (diff) |
Moved custom-mesh-qml example to manual test
Part of an examples cleanup
Change-Id: Ic32242b2f9594546fe9a1eed5755e0771d214f15
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro | 11 | ||||
-rw-r--r-- | examples/qt3d/custom-mesh-qml/custom-mesh-qml.qrc | 5 | ||||
-rw-r--r-- | examples/qt3d/custom-mesh-qml/main.cpp | 63 | ||||
-rw-r--r-- | examples/qt3d/custom-mesh-qml/main.qml | 246 | ||||
-rw-r--r-- | examples/qt3d/qt3d.pro | 1 |
5 files changed, 0 insertions, 326 deletions
diff --git a/examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro b/examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro deleted file mode 100644 index 228cc8ed0..000000000 --- a/examples/qt3d/custom-mesh-qml/custom-mesh-qml.pro +++ /dev/null @@ -1,11 +0,0 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} - -QT += 3dcore 3drender 3dinput 3dquick quick 3dquickextras - -SOURCES += \ - main.cpp - -RESOURCES += \ - custom-mesh-qml.qrc diff --git a/examples/qt3d/custom-mesh-qml/custom-mesh-qml.qrc b/examples/qt3d/custom-mesh-qml/custom-mesh-qml.qrc deleted file mode 100644 index 5f6483ac3..000000000 --- a/examples/qt3d/custom-mesh-qml/custom-mesh-qml.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>main.qml</file> - </qresource> -</RCC> diff --git a/examples/qt3d/custom-mesh-qml/main.cpp b/examples/qt3d/custom-mesh-qml/main.cpp deleted file mode 100644 index 41d2f08a5..000000000 --- a/examples/qt3d/custom-mesh-qml/main.cpp +++ /dev/null @@ -1,63 +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/custom-mesh-qml/main.qml b/examples/qt3d/custom-mesh-qml/main.qml deleted file mode 100644 index a68bf591f..000000000 --- a/examples/qt3d/custom-mesh-qml/main.qml +++ /dev/null @@ -1,246 +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 QtQuick 2.2 as QQ2 -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Input 2.0 -import Qt3D.Extras 2.0 - -Entity { - id: sceneRoot - - Camera { - id: camera - projectionType: CameraLens.PerspectiveProjection - fieldOfView: 45 - aspectRatio: 16/9 - nearPlane : 0.1 - farPlane : 1000.0 - position: Qt.vector3d( 0.0, 0.0, 40.0 ) - upVector: Qt.vector3d( 0.0, 1.0, 0.0 ) - viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 ) - } - - OrbitCameraController { camera: camera } - - components: [ - RenderSettings { - activeFrameGraph: ForwardRenderer { - clearColor: Qt.rgba(0.5, 0.5, 1, 1) - camera: camera - } - }, - // Event Source will be set by the Qt3DQuickWindow - InputSettings { } - ] - - PerVertexColorMaterial { - id: material - } - - function buildVertexBufferData() - { - // Vertices - var v0 = Qt.vector3d(-1.0, 0.0, -1.0) - var v1 = Qt.vector3d(1.0, 0.0, -1.0) - var v2 = Qt.vector3d(0.0, 1.0, 0.0) - var v3 = Qt.vector3d(0.0, 0.0, 1.0) - - // Face Normals - function normal(v0, v1, v2) { - return v1.minus(v0).crossProduct(v2.minus(v0)).normalized(); - } - var n023 = normal(v0, v2, v3) - var n012 = normal(v0, v1, v2) - var n310 = normal(v3, v1, v0) - var n132 = normal(v1, v3, v2) - - // Vector normals - var n0 = n023.plus(n012).plus(n310).normalized() - var n1 = n132.plus(n012).plus(n310).normalized() - var n2 = n132.plus(n012).plus(n023).normalized() - var n3 = n132.plus(n310).plus(n023).normalized() - - // Colors - var red = Qt.vector3d(1.0, 0.0, 0.0) - var green = Qt.vector3d(0.0, 1.0, 0.0) - var blue = Qt.vector3d(0.0, 0.0, 1.0) - var white = Qt.vector3d(1.0, 1.0, 1.0) - - var vertices = [ - v0, n0, red, - v1, n1, blue, - v2, n2, green, - v3, n3, white - ] - - var vertexArray = new Float32Array(4 * (3 + 3 + 3)); - var i = 0; - - vertices.forEach(function(vec3) { - vertexArray[i++] = vec3.x; - vertexArray[i++] = vec3.y; - vertexArray[i++] = vec3.z; - }); - - return vertexArray; - } - - function buildIndexBufferData() - { - var indexArray = new Uint16Array(12); - - // Front - indexArray[0] = 0; - indexArray[1] = 1; - indexArray[2] = 2; - // Bottom - indexArray[3] = 3; - indexArray[4] = 1; - indexArray[5] = 0; - // Left - indexArray[6] = 0; - indexArray[7] = 2; - indexArray[8] = 3; - // Right - indexArray[9] = 1; - indexArray[10] = 3; - indexArray[11] = 2; - - return indexArray; - } - - GeometryRenderer { - id: customMesh - instanceCount: 1 - indexOffset: 0 - firstInstance: 0 - primitiveType: GeometryRenderer.Triangles - Buffer { - id: vertexBuffer - type: Buffer.VertexBuffer - data: buildVertexBufferData() - } - - Buffer { - id: indexBuffer - type: Buffer.IndexBuffer - data: buildIndexBufferData() - } - geometry: Geometry { - Attribute { - attributeType: Attribute.VertexAttribute - vertexBaseType: Attribute.Float - vertexSize: 3 - byteOffset: 0 - byteStride: 9 * 4 - count: 4 - name: defaultPositionAttributeName() - buffer: vertexBuffer - } - - Attribute { - attributeType: Attribute.VertexAttribute - vertexBaseType: Attribute.Float - vertexSize: 3 - byteOffset: 3 * 4 - byteStride: 9 * 4 - count: 4 - name: defaultNormalAttributeName() - buffer: vertexBuffer - } - - Attribute { - attributeType: Attribute.VertexAttribute - vertexBaseType: Attribute.Float - vertexSize: 3 - byteOffset: 6 * 4 - byteStride: 9 * 4 - count: 4 - name: defaultColorAttributeName() - buffer: vertexBuffer - } - - Attribute { - attributeType: Attribute.IndexAttribute - vertexBaseType: Attribute.UnsignedShort - vertexSize: 1 - byteOffset: 0 - byteStride: 0 - count: 12 - buffer: indexBuffer - } - } - } - - Transform { - id: meshTransform - property real userAngle: 0.0 - scale: 10 - rotation: fromAxisAndAngle(Qt.vector3d(0, 1, 0), userAngle) - } - - QQ2.NumberAnimation { - target: meshTransform - property: "userAngle" - duration: 10000 - from: 0 - to: 360 - - loops: QQ2.Animation.Infinite - running: true - } - - Entity { - id: sphereEntity - components: [ customMesh, material, meshTransform ] - } -} diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index b37f31b67..985adde7f 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -30,7 +30,6 @@ SUBDIRS += \ transparency-qml-scene3d \ scene3d-loader \ mouseinput-qml \ - custom-mesh-qml \ instanced-arrays-qml \ picking-qml \ transforms-qml \ |