diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-06-04 13:07:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-07 11:18:08 +0200 |
| commit | f01be721572e4b56176cda042ea77879eb0ee658 (patch) | |
| tree | 3aa3acf456ed8bf0403354734af18a8035bcd137 /src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp | |
| parent | 2eee1f2c45ef7d0fc3832b501e0c029a3eb00a84 (diff) | |
Completed QAbstractShader and QAbstractRenderPass
QAbstractRenderPass now contains a QAbstractShader.
Backend was updated to use QAbstractRenderPass.
Change-Id: I0353d6cf7ec7f74c5506d6c6a6513d54ca27fcd4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp')
| -rw-r--r-- | src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp index c75a387f3..2833ffad4 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp @@ -41,8 +41,6 @@ #include <QtQml> #include "qt3dquick3dcoreplugin.h" -#include <Qt3DQuick/quick3dentity.h> -#include <Qt3DQuick/quick3dtransform.h> #include <Qt3DCore/cameralens.h> #include <Qt3DCore/camera.h> #include <Qt3DCore/scaletransform.h> @@ -55,6 +53,9 @@ #include <Qt3DCore/qabstracttechnique.h> #include <Qt3DCore/qabstractmesh.h> #include <Qt3DCore/qabstractrenderpass.h> +#include <Qt3DCore/qabstractshader.h> +#include <Qt3DQuick/quick3dentity.h> +#include <Qt3DQuick/quick3dtransform.h> #include <Qt3DQuick/quick3dconfiguration.h> QT_BEGIN_NAMESPACE @@ -67,6 +68,7 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri) qmlRegisterUncreatableType<Qt3D::QAbstractTechnique>(uri, 2, 0, "QAbstractTechnique", ""); qmlRegisterUncreatableType<Qt3D::QAbstractRenderPass>(uri, 2, 0, "QAbstractRenderPass", ""); qmlRegisterUncreatableType<Qt3D::QAbstractEffect>(uri, 2, 0, "QAbstractEffect", ""); + qmlRegisterUncreatableType<Qt3D::QAbstractShader>(uri, 2, 0, "QAbstractShader", ""); qmlRegisterType<Qt3D::Quick::Quick3DConfiguration>(uri, 2, 0, "Configuration"); qmlRegisterExtendedType<Qt3D::Entity, Qt3D::Quick::Quick3DEntity>(uri, 2, 0, "Entity"); |