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 11:36:10 +0000 |
| commit | 74c06c02f896c6aba408cfd0857d317378572736 (patch) | |
| tree | 2018f10fb6adc27868ac8a8e1ff23202eb8c68e7 /tests | |
| parent | 07053f8424cbb3fffd89a9774bd5aba737d07f08 (diff) | |
Add replacement materials example
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/manual/assimp/assimp.pro | 2 | ||||
| -rw-r--r-- | tests/manual/assimp/main.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/assimp/assimp.pro b/tests/manual/assimp/assimp.pro index 5e74f760a..0ac29e426 100644 --- a/tests/manual/assimp/assimp.pro +++ b/tests/manual/assimp/assimp.pro @@ -14,4 +14,4 @@ SOURCES += \ RESOURCES += \ assimp.qrc \ ../../../examples/qt3d/exampleresources/test_scene.qrc \ - ../../../examples/qt3d/exampleresources/chest.qrc + ../../../examples/qt3d/exampleresources/obj.qrc diff --git a/tests/manual/assimp/main.qml b/tests/manual/assimp/main.qml index 43eff2c26..9599999ce 100644 --- a/tests/manual/assimp/main.qml +++ b/tests/manual/assimp/main.qml @@ -208,7 +208,7 @@ Entity translation: Qt.vector3d(0.0, -15.0, 0.0) }, SceneLoader { - source: "qrc:/assets/chest/Chest.obj" + source: "qrc:/assets/obj/material-sphere.obj" } ] } |