diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2017-07-31 09:58:06 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-09-04 11:11:53 +0000 |
commit | c69ebe3a79c727e99d7c654841cb46f0fa967332 (patch) | |
tree | 91d629bf3beada4b6b0f007e5f2497be9ef44f2c /src/quick3d | |
parent | aa3d86f2b7358dd71bdf78fb275bc2aa21ca23fd (diff) |
Use layers to have only one graph for Metal/Rough
Both QMetalRoughMaterial and QTexturedMetalRoughMaterial use the same
graph now. Also QMetalRoughMaterial does the job to be clever and
activate the right layers depending on the type set on the properties
(which is why they are now all variants).
QMetalRoughMaterial can then be used as a drop in replacement for
QTexturedMetalRoughMaterial.
Change-Id: Ia52fe4608aca5558642599ed435f3cd9ac93e651
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d')
-rw-r--r-- | src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index bdafca64c..d60603e8c 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -109,6 +109,7 @@ void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DExtras::QTextureMaterial>(uri, 2, 0, "TextureMaterial"); qmlRegisterRevision<Qt3DExtras::QTextureMaterial, 10>(uri, 2, 10); qmlRegisterType<Qt3DExtras::QMetalRoughMaterial>(uri, 2, 9, "MetalRoughMaterial"); + qmlRegisterRevision<Qt3DExtras::QMetalRoughMaterial, 10>(uri, 2, 10); qmlRegisterType<Qt3DExtras::QTexturedMetalRoughMaterial>(uri, 2, 9, "TexturedMetalRoughMaterial"); qmlRegisterType<Qt3DExtras::QMorphPhongMaterial>(uri, 2, 9, "MorphPhongMaterial"); |