diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2017-01-25 15:22:04 +0100 |
---|---|---|
committer | Kevin Ottens <kevin.ottens@kdab.com> | 2017-01-27 14:59:06 +0000 |
commit | 633c2efcc5b7d6d4943985e9ea0a9b6ff90becbf (patch) | |
tree | d2f90b1ed983028555832914eec9eeafbd8090af /src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | |
parent | fbb3c3f59fdb7a60fdbf9590baf953920585957e (diff) |
Remove OrbitCameraController.qml
It completely duplicates QOrbitCameraController behavior, let's use it
instead.
Change-Id: I5fee3c16360461f2a918b0ec1428b3cc7f20ec04
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp')
-rw-r--r-- | src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index 998d94cbf..c6223adf2 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -48,6 +48,7 @@ #include <Qt3DExtras/qnormaldiffusemapalphamaterial.h> #include <Qt3DExtras/qnormaldiffusemapmaterial.h> #include <Qt3DExtras/qnormaldiffusespecularmapmaterial.h> +#include <Qt3DExtras/qorbitcameracontroller.h> #include <Qt3DExtras/qpervertexcolormaterial.h> #include <Qt3DExtras/qphongalphamaterial.h> #include <Qt3DExtras/qphongmaterial.h> @@ -75,7 +76,6 @@ static const struct { // Scene Graph { "LevelOfDetailLoader", 2, 2 }, // Camera Controllers - { "OrbitCameraController", 2, 0 }, { "FirstPersonCameraController", 2, 0 }, }; @@ -87,6 +87,9 @@ void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) // Entities qmlRegisterType<Qt3DExtras::QSkyboxEntity>(uri, 2, 0, "SkyboxEntity"); + // Camera Controllers + qmlRegisterType<Qt3DExtras::QOrbitCameraController>(uri, 2, 0, "OrbitCameraController"); + // Materials qmlRegisterType<Qt3DExtras::QPhongMaterial>(uri, 2, 0, "PhongMaterial"); qmlRegisterType<Qt3DExtras::QPhongAlphaMaterial>(uri, 2, 0, "PhongAlphaMaterial"); |