diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-08-09 11:34:45 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-08-09 11:51:25 +0000 |
commit | c089032f9f86bae15310e43f7941d78f233ee126 (patch) | |
tree | 161cdfefa6df23c30cd22fbe4d3e89fa2821cd26 | |
parent | 21d15733e25bb6263314aca86bafa03f5c866e3a (diff) |
bigscene-instanced-qml example demonstrating instancing
Change-Id: Ie556d85a837ebefbf1d6e053f7985bf791ffdcfb
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.pro | 12 | ||||
-rw-r--r-- | examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.qrc | 7 | ||||
-rw-r--r-- | examples/qt3d/bigscene-instanced-qml/instanced.frag | 43 | ||||
-rw-r--r-- | examples/qt3d/bigscene-instanced-qml/instanced.vert | 66 | ||||
-rw-r--r-- | examples/qt3d/bigscene-instanced-qml/main.cpp | 63 | ||||
-rw-r--r-- | examples/qt3d/bigscene-instanced-qml/main.qml | 105 | ||||
-rw-r--r-- | examples/qt3d/qt3d.pro | 3 |
7 files changed, 298 insertions, 1 deletions
diff --git a/examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.pro b/examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.pro new file mode 100644 index 000000000..b08e85654 --- /dev/null +++ b/examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.pro @@ -0,0 +1,12 @@ +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) +} + +QT += qml quick 3dcore 3drenderer 3dinput 3dquick + +SOURCES += \ + main.cpp + + +RESOURCES += \ + bigscene-instanced-qml.qrc diff --git a/examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.qrc b/examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.qrc new file mode 100644 index 000000000..3e4910f7a --- /dev/null +++ b/examples/qt3d/bigscene-instanced-qml/bigscene-instanced-qml.qrc @@ -0,0 +1,7 @@ +<RCC> + <qresource prefix="/"> + <file>main.qml</file> + <file>instanced.frag</file> + <file>instanced.vert</file> + </qresource> +</RCC> diff --git a/examples/qt3d/bigscene-instanced-qml/instanced.frag b/examples/qt3d/bigscene-instanced-qml/instanced.frag new file mode 100644 index 000000000..0efd52b32 --- /dev/null +++ b/examples/qt3d/bigscene-instanced-qml/instanced.frag @@ -0,0 +1,43 @@ +#version 150 core + +uniform vec4 lightPosition = vec4(1.0, 1.0, 0.0, 1.0); +uniform vec3 lightIntensity = vec3(1.0, 1.0, 1.0); + +uniform vec3 ka; // Ambient reflectivity +uniform vec3 ks = vec3(1.0, 1.0, 1.0); // Specular reflectivity +uniform float shininess = 150.0; // Specular shininess factor + +in vec3 kd; // Diffuse reflectivity +in vec3 position; +in vec3 normal; + +out vec4 fragColor; + +vec3 adsModel( const in vec3 pos, const in vec3 n ) +{ + // Calculate the vector from the light to the fragment + vec3 s = normalize( vec3( lightPosition ) - pos ); + + // Calculate the vector from the fragment to the eye position + // (origin since this is in "eye" or "camera" space) + vec3 v = normalize( -pos ); + + // Reflect the light beam using the normal at this fragment + vec3 r = reflect( -s, n ); + + // Calculate the diffuse component + float diffuse = max( dot( s, n ), 0.0 ); + + // Calculate the specular component + float specular = 0.0; + if ( dot( s, n ) > 0.0 ) + specular = pow( max( dot( r, v ), 0.0 ), shininess ); + + // Combine the ambient, diffuse and specular contributions + return lightIntensity * ( ka + kd * diffuse + ks * specular ); +} + +void main() +{ + fragColor = vec4( adsModel( position, normalize( normal ) ), 1.0 ); +} diff --git a/examples/qt3d/bigscene-instanced-qml/instanced.vert b/examples/qt3d/bigscene-instanced-qml/instanced.vert new file mode 100644 index 000000000..f713957e3 --- /dev/null +++ b/examples/qt3d/bigscene-instanced-qml/instanced.vert @@ -0,0 +1,66 @@ +#version 150 core + +#define M_PI 3.14159 + +in vec3 vertexPosition; +in vec3 vertexNormal; + +out vec3 position; +out vec3 normal; +out vec3 kd; + +uniform mat4 viewMatrix; +uniform mat4 projectionMatrix; +uniform mat3 modelViewNormal; +uniform int instanceCount; + +uniform float time; + +const vec3 ZAXIS = vec3(0.0, 0.0, 1.0); +const vec3 XAXIS = vec3(1.0, 0.0, 0.0); +const float radius = 30.0; +float det = 1.0 / float(instanceCount); + +mat4 rotationMatrix(vec3 axis, float angle) +{ + axis = normalize(axis); + float s = sin(angle); + float c = cos(angle); + float oc = 1.0 - c; + + return mat4(oc * axis.x * axis.x + c, oc * axis.x * axis.y - axis.z * s, oc * axis.z * axis.x + axis.y * s, 0.0, + oc * axis.x * axis.y + axis.z * s, oc * axis.y * axis.y + c, oc * axis.y * axis.z - axis.x * s, 0.0, + oc * axis.z * axis.x - axis.y * s, oc * axis.y * axis.z + axis.x * s, oc * axis.z * axis.z + c, 0.0, + 0.0, 0.0, 0.0, 1.0); +} + + +mat4 translationMatrix(vec3 translation) +{ + return mat4(1.0, 0.0, 0.0, 0.0, + 0.0, 1.0, 0.0, 0.0, + 0.0, 0.0, 1.0, 0.0, + translation.x, translation.y, translation.z, 0); + +} + +void main() +{ + float angle = M_PI * 2.0f * gl_InstanceID * det * 10.0 * time * 0.05; + vec3 translation = vec3(radius * cos(angle), 200.0 * gl_InstanceID * det, radius * sin(angle)); + + mat4 modelMatrix = translationMatrix(translation) * + rotationMatrix(ZAXIS, radians(angle * 45.0)) * + rotationMatrix(XAXIS, radians(angle * 30.0)); + + vec4 eyePosition = viewMatrix * + modelMatrix * + vec4(vertexPosition, 1.0); + + position = eyePosition.xyz; + kd = vec3(abs(cos(angle)), 0.75, 25); + normal = normalize(mat3(modelMatrix) * modelViewNormal * + vertexNormal); + + gl_Position = projectionMatrix * vec4(position, 1.0); +} diff --git a/examples/qt3d/bigscene-instanced-qml/main.cpp b/examples/qt3d/bigscene-instanced-qml/main.cpp new file mode 100644 index 000000000..45385a76c --- /dev/null +++ b/examples/qt3d/bigscene-instanced-qml/main.cpp @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** 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:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/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 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later 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 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <window.h> +#include <Qt3DRenderer/qrenderaspect.h> +#include <Qt3DInput/QInputAspect> +#include <Qt3DQuick/QQmlAspectEngine> + +#include <QGuiApplication> + +int main(int argc, char* argv[]) +{ + QGuiApplication app(argc, argv); + + Window view; + Qt3D::Quick::QQmlAspectEngine engine; + + engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); + engine.aspectEngine()->registerAspect(new Qt3D::QInputAspect()); + engine.aspectEngine()->initialize(); + QVariantMap data; + data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); + data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); + engine.aspectEngine()->setData(data); + engine.setSource(QUrl("qrc:/main.qml")); + + view.show(); + + return app.exec(); +} diff --git a/examples/qt3d/bigscene-instanced-qml/main.qml b/examples/qt3d/bigscene-instanced-qml/main.qml new file mode 100644 index 000000000..9d5cc596e --- /dev/null +++ b/examples/qt3d/bigscene-instanced-qml/main.qml @@ -0,0 +1,105 @@ +/**************************************************************************** +** +** 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:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/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 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later 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 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import Qt3D 2.0 +import Qt3D.Renderer 2.0 +import QtQuick 2.2 as QQ2 + +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, -250.0, -50.0) + upVector: Qt.vector3d(0.0, 1.0, 0.0) + viewCenter: Qt.vector3d(0.0, 0.0, 0.0) + } + + Configuration { + controlledCamera: camera + } + + components: [ + FrameGraph { + activeFrameGraph: ForwardRenderer { + clearColor: Qt.rgba(0, 0.5, 1, 1) + camera: camera + } + } + ] + + property real timeValue: 5 + + Material { + id: instancedPhongMaterial + effect: Effect { + techniques: Technique { + openGLFilter { + api: OpenGLFilter.Desktop + profile: OpenGLFilter.Core + minorVersion: 2 + majorVersion: 3 + } + renderPasses: RenderPass { + shaderProgram: ShaderProgram { + vertexShaderCode: loadSource("qrc:/instanced.vert") + fragmentShaderCode: loadSource("qrc:/instanced.frag") + } + } + } + } + parameters: Parameter { name: "instanceCount"; value: cylinderMeshInstanced.instanceCount } + } + + CylinderMesh { + id: cylinderMeshInstanced + instanceCount: 2000 + rings: 50 + slices: 30 + radius: 2.5 + length: 5.0 + } + + Entity { + id: torusEntity + components: [ cylinderMeshInstanced, instancedPhongMaterial ] + } +} diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index 856836e86..d3e40cad9 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -38,7 +38,8 @@ SUBDIRS += \ scene3d-loader \ clip-planes-qml \ mouseinput-qml \ - custom-mesh-cpp + custom-mesh-cpp \ + bigscene-instanced-qml # TODO Port the old examples to new APIs #SUBDIRS += qt3d |