diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-11-27 14:52:43 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-11-28 08:15:19 +0000 |
| commit | c7c4bd2ac58748ae7d7158a9944ba37ce75347ff (patch) | |
| tree | 1a50878431799c99c1f552a8e296e2ac0645be4e /src/quick3d/imports/input/qt3dquick3dinputplugin.cpp | |
| parent | 6d14e81d8e25f9d7a37579f0b0d93b2bb66d0adc (diff) | |
Register Axis/Action/LogicalDevice to QML
Change-Id: If39f60452327d2611f78ec7b5edbff961f40f435
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports/input/qt3dquick3dinputplugin.cpp')
| -rw-r--r-- | src/quick3d/imports/input/qt3dquick3dinputplugin.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp index aa3b2710e..3ba28fac2 100644 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp +++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp @@ -41,6 +41,15 @@ #include <Qt3DInput/qmousecontroller.h> #include <Qt3DInput/qmouseinput.h> #include <Qt3DInput/q3dmouseevent.h> + +#include <Qt3DInput/qaxis.h> +#include <Qt3DInput/qaxisinput.h> +#include <Qt3DInput/qaction.h> +#include <Qt3DInput/qactioninput.h> +#include <Qt3DInput/qlogicaldevice.h> +#include <Qt3DQuickInput/private/quick3daxis_p.h> +#include <Qt3DQuickInput/private/quick3daction_p.h> + #include "qt3dquick3dinputplugin.h" QT_BEGIN_NAMESPACE @@ -55,6 +64,12 @@ void Qt3DQuick3DInputPlugin::registerTypes(const char *uri) qmlRegisterUncreatableType<Qt3DInput::Q3DWheelEvent>(uri, 2, 0, "WheelEvent", QStringLiteral("Events cannot be created")); qmlRegisterType<Qt3DInput::QMouseInput>(uri, 2, 0, "MouseInput"); qmlRegisterType<Qt3DInput::QMouseController>(uri, 2, 0, "MouseController"); + + qmlRegisterType<Qt3DInput::QLogicalDevice>(uri, 2, 0, "LogicalDevice"); + qmlRegisterType<Qt3DInput::QActionInput>(uri, 2, 0, "ActionInput"); + qmlRegisterType<Qt3DInput::QAxisInput>(uri, 2, 0, "AxisInput"); + qmlRegisterExtendedType<Qt3DInput::QAxis, Qt3DInput::Input::Quick::Quick3DAxis>(uri, 2, 0, "Axis"); + qmlRegisterExtendedType<Qt3DInput::QAction, Qt3DInput::Input::Quick::Quick3DAction>(uri, 2, 0, "Action"); } QT_END_NAMESPACE |