diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2018-04-03 17:19:43 +0100 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-04-04 13:31:46 +0000 |
commit | 2a260617b96281375e2ee018af8c7547d99e4a6d (patch) | |
tree | a5aee129a69c0b2e9b6dab42a5fcddd17f3c5361 /examples/qt3d/pbr-materials/doc/src/materials.qdoc | |
parent | 634529d899e99c2fb40429d3d0be6295aa444a40 (diff) |
Add replacement materials examplev5.11.0-beta3
All texture assets were made by KDAB under the CLA. The material
"sphere" mesh is from Allegorithmic and published under the
Creative Commons 4 license. See paragraph 1.2 of
https://www.allegorithmic.com/legal/substance-share
Task-number: QTBUG-61415
Change-Id: I23d61723bbac561e22e11fa57105b29148c01699
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 74c06c02f896c6aba408cfd0857d317378572736)
Diffstat (limited to 'examples/qt3d/pbr-materials/doc/src/materials.qdoc')
-rw-r--r-- | examples/qt3d/pbr-materials/doc/src/materials.qdoc | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/examples/qt3d/pbr-materials/doc/src/materials.qdoc b/examples/qt3d/pbr-materials/doc/src/materials.qdoc new file mode 100644 index 000000000..c96bb0843 --- /dev/null +++ b/examples/qt3d/pbr-materials/doc/src/materials.qdoc @@ -0,0 +1,39 @@ +/**************************************************************************** +** +** 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 materials + \title Qt 3D: PBR Materials QML Example + \ingroup qt3d-examples-qml + \brief A QML application that demonstrates using PBR materials. + + \image pbr-materials.png + + \e {Pbr-Materials} demonstrates using the Qt 3D material system. + + \include examples-run.qdocinc +*/ |