diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-05-30 17:42:56 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-31 15:49:14 +0200 |
| commit | 7f750d898f26312ab76f716c8f9b69089cebe576 (patch) | |
| tree | 732d6338d3f332923e493eaf259c9d77efa0f455 /src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp | |
| parent | 76efd5b9713431984c143bf2b861f196dd05acb8 (diff) | |
CameraController usable from QML
Configuration QML element with controlledCamera property which has to be set
to as valid Camera element we want to control.
Slight hack (behind the scene) to make that work. Will be cleaned up on the
next iteration.
Change-Id: I794ee1c26207178f94765c873331bce19efaab9f
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 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp index 503106129..5ca63962a 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp @@ -55,18 +55,24 @@ #include <Qt3DCore/qabstracttechnique.h> #include <Qt3DCore/qabstractmesh.h> #include <Qt3DCore/qabstractrenderpass.h> +#include <Qt3DQuick/quick3dconfiguration.h> QT_BEGIN_NAMESPACE void Qt3DQuick3DCorePlugin::registerTypes(const char *uri) { - qmlRegisterUncreatableType<Qt3D::Node>(uri, 2, 0, "Node_priv", ""); + qmlRegisterUncreatableType<Qt3D::Node>(uri, 2, 0, "Node_private", ""); + qmlRegisterUncreatableType<Qt3D::Transform>(uri, 2, 0, "Transform_private", ""); qmlRegisterInterface<Qt3D::QAbstractEffect>("QAbstractEffect"); qmlRegisterUncreatableType<Qt3D::QAbstractMesh>(uri, 2, 0, "QAbstractMesh", ""); qmlRegisterUncreatableType<Qt3D::QAbstractMaterial>(uri, 2, 0, "QAbstractMaterial", ""); qmlRegisterUncreatableType<Qt3D::QAbstractTechnique>(uri, 2, 0, "QAbstractTechnique", ""); qmlRegisterUncreatableType<Qt3D::QAbstractRenderPass>(uri, 2, 0, "QAbstractRenderPass", ""); + qmlRegisterType<Qt3D::Quick::Quick3DConfiguration>(uri, 2, 0, "Configuration"); + qmlRegisterType<Qt3D::Quick::Quick3DEntity>(uri, 2, 0, "Entity"); + qmlRegisterType<Qt3D::Quick::Quick3DTransform>(uri, 2, 0, "Transform"); + qmlRegisterType<Qt3D::Quick::Quick3DNode>(uri, 2, 0, "Node"); qmlRegisterType<Qt3D::Component>(uri, 2, 0, "Component"); qmlRegisterType<Qt3D::Camera>(uri, 2, 0, "Camera"); qmlRegisterType<Qt3D::CameraLens>(uri, 2, 0, "CameraLens"); @@ -75,9 +81,6 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri) qmlRegisterType<Qt3D::RotateTransform>(uri, 2, 0, "Rotate"); qmlRegisterType<Qt3D::LookAtTransform>(uri, 2, 0, "LookAt"); qmlRegisterType<Qt3D::ScaleTransform>(uri, 2, 0, "Scale"); - qmlRegisterType<Qt3D::Quick::Quick3DEntity>(uri, 2, 0, "Entity"); - qmlRegisterType<Qt3D::Quick::Quick3DTransform>(uri, 2, 0, "Transform"); - qmlRegisterType<Qt3D::Quick::Quick3DNode>(uri, 2, 0, "Node"); } QT_END_NAMESPACE |