diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2017-01-25 12:10:33 +0100 |
|---|---|---|
| committer | Kevin Ottens <kevin.ottens@kdab.com> | 2017-01-27 14:58:39 +0000 |
| commit | f5b66ed6706c129754a8fc0c0541eab1f9ed4181 (patch) | |
| tree | 7cf7903abe9b817c24f34f3074c04e4e0c1f4da1 /examples/qt3d/materials/Barrel.qml | |
| parent | 946e78eada359f651d337309b25d51d4204289b0 (diff) | |
Consolidate QML/C++ materials in extras
We remove the qml implementation of materials in extras that were also
implemented in C++. Note this is an API change for the materials having
texture properties. The QML ones had mistakenly a string property
instead of a texture one. This move also fixes this API issue on the QML
end.
Change-Id: Ibed14288cd7b8c5ab9615b74b949c6a73ac29329
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
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 |