diff options
author | Paul Lemire <paul.lemire.ecortex@kdab.com> | 2014-12-04 11:54:55 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-12-12 14:17:39 +0100 |
commit | 87401507ec111dc1b6bf252a8662d90d5caae523 (patch) | |
tree | 425b1a632b798e68d6cb1a95119cde7914a3dcc0 /src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | |
parent | 634285f5e0c2555bd108f5f8ed979a0a18505429 (diff) |
Quick3DShaderDataArray
QML allows property var array: [] of simple types only.
We can't use a var property to store an array of ShaderDataObject so
Quick3DShaderDataArray was introduce to overcome that issue.
It contains a QQmlListProperty<Quick3DShaderData>.
This is only needed for QML, in C++ providing a QVariantList of QShaderData is
enough.
Change-Id: I768f5189252c219c5a1718b4c4da128bbaff008e
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.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 3a90c38e1..a86f1f3ac 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -103,6 +103,7 @@ #include <Qt3DQuickRenderer/quick3dsortmethod.h> #include <Qt3DQuickRenderer/quick3dparameter.h> #include <Qt3DQuickRenderer/quick3dshaderdata.h> +#include <Qt3DQuickRenderer/quick3dshaderdataarray.h> QT_BEGIN_NAMESPACE @@ -137,6 +138,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) qmlRegisterExtendedType<Qt3D::QMaterial, Qt3D::Render::Quick::Quick3DMaterial>(uri, 2, 0, "Material"); qmlRegisterExtendedType<Qt3D::QRenderPass, Qt3D::Render::Quick::Quick3DRenderPass>(uri, 2, 0, "RenderPass"); qmlRegisterType<Qt3D::QShaderProgram>(uri, 2, 0, "ShaderProgram"); + qmlRegisterType<Qt3D::Render::Quick::Quick3DShaderDataArray>(uri, 2, 0, "ShaderDataArray"); qmlRegisterType<Qt3D::Render::Quick::Quick3DShaderData>(uri, 2, 0, "ShaderData"); // Textures |