diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /examples/qt3d/materials/Barrel.qml | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'examples/qt3d/materials/Barrel.qml')
-rw-r--r-- | examples/qt3d/materials/Barrel.qml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/examples/qt3d/materials/Barrel.qml b/examples/qt3d/materials/Barrel.qml index c68cab657..31abd329f 100644 --- a/examples/qt3d/materials/Barrel.qml +++ b/examples/qt3d/materials/Barrel.qml @@ -74,13 +74,11 @@ Entity { material: NormalDiffuseSpecularMapMaterial { id: material ambient: "black" - diffuse: "assets/metalbarrel/diffus_" + root.diffuseColor + ".webp" - normal: "assets/metalbarrel/normal_" + root.bump + ".webp" - specular: { - if (root.specular !== "" ) - return "assets/metalbarrel/specular_" + root.specular + ".webp" - else - return "assets/metalbarrel/specular.webp" + diffuse: TextureLoader { source: "assets/metalbarrel/diffus_" + root.diffuseColor + ".webp" } //TextureLoader { source: ("assets/metalbarrel/diffus_" + root.diffuseColor + ".webp") } + normal: TextureLoader { source: "assets/metalbarrel/normal_" + root.bump + ".webp" } + specular: TextureLoader { + source: root.specular !== "" ? "assets/metalbarrel/specular_" + root.specular + ".webp" + : "assets/metalbarrel/specular.webp" } shininess: 5.0 |