summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-01-06 09:18:10 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-01-10 20:58:22 +0100
commitd443ed0b742ed37abf80b554a00a3f4b3328f552 (patch)
tree64175409907663d6771d176b6d2c34f3a89360e3 /src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
parent69123a4ca74cbc37a5c3eab1ee3c0ba14faa9062 (diff)
Added default QML Materials
Use them in material-qml example. Chest, Barrel and HousePlant simplified. Change-Id: I4161c79869d79a7bcacadd1d82e5b282deac7df0 Task-number: QTBUG-41548 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports/render/qt3dquick3drenderplugin.cpp')
-rw-r--r--src/quick3d/imports/render/qt3dquick3drenderplugin.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index cc813539a..4ca89b267 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -116,7 +116,12 @@ static const struct {
const char *type;
int major, minor;
} qmldir [] = {
- { "PhongMaterial", 2, 0 }
+ { "PhongMaterial", 2, 0 },
+ { "DiffuseMapMaterial", 2, 0 },
+ { "DiffuseSpecularMapMaterial", 2, 0 },
+ { "NormalDiffuseMapAlphaMaterial", 2, 0 },
+ { "NormalDiffuseMapMaterial", 2, 0 },
+ { "NormalDiffuseSpecularMapMaterial", 2, 0 }
};
QVariantList QJSValueToVariantListConverter(const QJSValue &jsValue)