diff options
author | Lorenz <Lorenz.Esch@tu-ilmenau.de> | 2015-03-06 22:31:39 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-03-11 13:19:36 +0000 |
commit | d0f29fee3ebfa916c2ee44ea805c8ebf6cc64bf9 (patch) | |
tree | 26a844492a2b95a97e308e624d7a40cbe3420c2e /src/quick3d | |
parent | a21a41759f4fc115f34ce0891fedb255c4d32937 (diff) |
Add new material QPerVertexColorMaterial
The new QPerVertexColorMaterial class provides color per vertex rendering.
Change-Id: Idc87c21a07c2c8cd1ebfd5bed54c300c55e307ba
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d')
3 files changed, 105 insertions, 0 deletions
diff --git a/src/quick3d/imports/render/defaults/defaults.pri b/src/quick3d/imports/render/defaults/defaults.pri index 76b67a420..797dd09f0 100644 --- a/src/quick3d/imports/render/defaults/defaults.pri +++ b/src/quick3d/imports/render/defaults/defaults.pri @@ -12,3 +12,4 @@ QML_FILES = \ $$PWD/qml/NormalDiffuseMapAlphaMaterial.qml \ $$PWD/qml/NormalDiffuseSpecularMapMaterial.qml \ $$PWD/qml/ForwardRenderer.qml \ + $$PWD/qml/PerVertexColorMaterial.qml \ diff --git a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml new file mode 100644 index 000000000..6051ca3b9 --- /dev/null +++ b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml @@ -0,0 +1,103 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Lorenz Esch (TU Ilmenau). +** 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.Render 2.0 + +Material { + id:root + + parameters: [ + Parameter { name: "lightPosition"; value: Qt.vector4d(1.0, 1.0, 0.0, 1.0) }, + Parameter { name: "lightIntensity"; value: Qt.vector3d(1.0, 1.0, 1.0) } + ] + + ShaderProgram { + id: gl3PerVertexColorShader + vertexShaderCode: loadSource("qrc:/shaders/gl3/pervertexcolor.vert") + fragmentShaderCode: loadSource("qrc:/shaders/gl3/pervertexcolor.frag") + } + + ShaderProgram { + id: gl2es2PerVertexColorShader + vertexShaderCode: loadSource("qrc:/shaders/es2/pervertexcolor.vert") + fragmentShaderCode: loadSource("qrc:/shaders/es2/pervertexcolor.frag") + } + + effect: Effect { + techniques: [ + // GL 3 Technique + Technique { + openGLFilter { + api: OpenGLFilter.Desktop + profile: OpenGLFilter.Core + majorVersion: 3 + minorVersion: 1 + } + renderPasses: RenderPass { + shaderProgram: gl3PerVertexColorShader + } + }, + + // GL 2 Technique + Technique { + openGLFilter { + api: OpenGLFilter.Desktop + profile: OpenGLFilter.None + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { + shaderProgram: gl2es2PerVertexColorShader + } + }, + + // ES 2 Technique + Technique { + openGLFilter { + api: OpenGLFilter.ES + profile: OpenGLFilter.None + majorVersion: 2 + minorVersion: 0 + } + renderPasses: RenderPass { + shaderProgram: gl2es2PerVertexColorShader + } + } + ] + } +} + diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 2a8e7075d..0a1250f75 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -120,6 +120,7 @@ static const struct { { "NormalDiffuseMapAlphaMaterial", 2, 0 }, { "NormalDiffuseMapMaterial", 2, 0 }, { "NormalDiffuseSpecularMapMaterial", 2, 0 }, + { "PerVertexColorMaterial", 2, 0 }, // FrameGraphs { "ForwardRenderer", 2, 0 } }; |