From f5b66ed6706c129754a8fc0c0541eab1f9ed4181 Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Wed, 25 Jan 2017 12:10:33 +0100 Subject: 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 --- examples/qt3d/materials/main.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/qt3d/materials/main.qml') diff --git a/examples/qt3d/materials/main.qml b/examples/qt3d/materials/main.qml index 9ed9bd219..c09454065 100644 --- a/examples/qt3d/materials/main.qml +++ b/examples/qt3d/materials/main.qml @@ -96,9 +96,9 @@ Entity { material: NormalDiffuseSpecularMapMaterial { ambient: Qt.rgba( 0.05, 0.05, 0.05, 1.0 ) - diffuse: "assets/textures/pattern_09/diffuse.webp" - specular: "assets/textures/pattern_09/specular.webp" - normal: "assets/textures/pattern_09/normal.webp" + diffuse: TextureLoader { source: "assets/textures/pattern_09/diffuse.webp" } + specular: TextureLoader { source: "assets/textures/pattern_09/specular.webp" } + normal: TextureLoader { source: "assets/textures/pattern_09/normal.webp" } textureScale: 10.0 shininess: 10.0 } -- cgit v1.2.3