diff options
Diffstat (limited to 'src/quick3d/imports')
| -rw-r--r-- | src/quick3d/imports/extras/defaults.qrc | 21 | ||||
| -rw-r--r-- | src/quick3d/imports/extras/importsextras.pro | 2 | ||||
| -rw-r--r-- | src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 20 |
3 files changed, 42 insertions, 1 deletions
diff --git a/src/quick3d/imports/extras/defaults.qrc b/src/quick3d/imports/extras/defaults.qrc new file mode 100644 index 000000000..7b07aafab --- /dev/null +++ b/src/quick3d/imports/extras/defaults.qrc @@ -0,0 +1,21 @@ +<RCC> +<qresource prefix="/qt-project.org/imports/Qt3D/Extras/"> +<file alias="defaults/qml/DefaultEffect.qml">defaults/qml/DefaultEffect.qml</file> +<file alias="defaults/qml/DefaultAlphaEffect.qml">defaults/qml/DefaultAlphaEffect.qml</file> +<file alias="defaults/qml/PhongMaterial.qml">defaults/qml/PhongMaterial.qml</file> +<file alias="defaults/qml/DiffuseMapMaterial.qml">defaults/qml/DiffuseMapMaterial.qml</file> +<file alias="defaults/qml/DiffuseSpecularMapMaterial.qml">defaults/qml/DiffuseSpecularMapMaterial.qml</file> +<file alias="defaults/qml/NormalDiffuseMapMaterial.qml">defaults/qml/NormalDiffuseMapMaterial.qml</file> +<file alias="defaults/qml/NormalDiffuseMapAlphaMaterial.qml">defaults/qml/NormalDiffuseMapAlphaMaterial.qml</file> +<file alias="defaults/qml/NormalDiffuseSpecularMapMaterial.qml">defaults/qml/NormalDiffuseSpecularMapMaterial.qml</file> +<file alias="defaults/qml/ForwardRenderer.qml">defaults/qml/ForwardRenderer.qml</file> +<file alias="defaults/qml/PerVertexColorMaterial.qml">defaults/qml/PerVertexColorMaterial.qml</file> +<file alias="defaults/qml/SkyboxEntity.qml">defaults/qml/SkyboxEntity.qml</file> +<file alias="defaults/qml/GoochMaterial.qml">defaults/qml/GoochMaterial.qml</file> +<file alias="defaults/qml/PhongAlphaMaterial.qml">defaults/qml/PhongAlphaMaterial.qml</file> +<file alias="defaults/qml/TextureMaterial.qml">defaults/qml/TextureMaterial.qml</file> +<file alias="defaults/qml/OrbitCameraController.qml">defaults/qml/OrbitCameraController.qml</file> +<file alias="defaults/qml/FirstPersonCameraController.qml">defaults/qml/FirstPersonCameraController.qml</file> +<file alias="defaults/qml/NormalDiffuseMapAlphaEffect.qml">defaults/qml/NormalDiffuseMapAlphaEffect.qml</file> +</qresource> +</RCC> diff --git a/src/quick3d/imports/extras/importsextras.pro b/src/quick3d/imports/extras/importsextras.pro index acc993fa7..6a70238f4 100644 --- a/src/quick3d/imports/extras/importsextras.pro +++ b/src/quick3d/imports/extras/importsextras.pro @@ -3,7 +3,7 @@ TARGET = quick3dextrasplugin TARGETPATH = Qt3D/Extras IMPORT_VERSION = 2.0 -QT += core-private qml qml-private quick quick-private 3dcore 3dcore-private 3dquick 3dquick-private 3dextras 3dlogic +QT += core-private qml qml-private quick quick-private 3dcore 3dcore-private 3dquick 3dquick-private 3dextras 3dlogic 3dquickextras 3dquickextras-private # Qt3D is free of Q_FOREACH - make sure it stays that way: DEFINES += QT_NO_FOREACH diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index 7d695ea5b..55af6432b 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -52,6 +52,19 @@ #include <Qt3DExtras/qcylindergeometry.h> #include <Qt3DExtras/qtext3dgeometry.h> #include <Qt3DExtras/qtext3dmesh.h> +#include <Qt3DExtras/qkeyframeanimation.h> +#include <Qt3DExtras/qanimationcontroller.h> +#include <Qt3DExtras/qabstractanimation.h> +#include <Qt3DExtras/qmorphinganimation.h> +#include <Qt3DExtras/qanimationgroup.h> +#include <Qt3DExtras/qmorphtarget.h> + +#include <Qt3DQuickExtras/private/quick3dkeyframeanimation_p.h> +#include <Qt3DQuickExtras/private/quick3danimationgroup_p.h> +#include <Qt3DQuickExtras/private/quick3danimationcontroller_p.h> +#include <Qt3DQuickExtras/private/quick3dmorphtarget_p.h> +#include <Qt3DQuickExtras/private/quick3dmorphinganimation_p.h> + #include <QtQml/qqml.h> QT_BEGIN_NAMESPACE @@ -106,6 +119,13 @@ void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DExtras::QText3DGeometry>(uri, 2, 2, "Text3DGeometry"); qmlRegisterType<Qt3DExtras::QText3DMesh>(uri, 2, 2, "Text3DMesh"); + qmlRegisterUncreatableType<Qt3DExtras::QAbstractAnimation>(uri, 2, 0, "AbstractAnimation", QStringLiteral("AbstractAnimation is abstract")); + qmlRegisterExtendedType<Qt3DExtras::QKeyframeAnimation, Qt3DExtras::Quick::QQuick3DKeyframeAnimation>(uri, 2, 2, "KeyframeAnimation"); + qmlRegisterExtendedType<Qt3DExtras::QAnimationGroup, Qt3DExtras::Quick::QQuick3DAnimationGroup>(uri, 2, 2, "AnimationGroup"); + qmlRegisterExtendedType<Qt3DExtras::QAnimationController, Qt3DExtras::Quick::QQuick3DAnimationController>(uri, 2, 2, "AnimationController"); + qmlRegisterExtendedType<Qt3DExtras::QMorphingAnimation, Qt3DExtras::Quick::QQuick3DMorphingAnimation>(uri, 2, 2, "MorphingAnimation"); + qmlRegisterExtendedType<Qt3DExtras::QMorphTarget, Qt3DExtras::Quick::QQuick3DMorphTarget>(uri, 2, 2, "MorphTarget"); + // Register types provided as QML files compiled into the plugin for (int i = 0; i < int(sizeof(qmldir) / sizeof(qmldir[0])); i++) { auto path = QLatin1String("qrc:/qt-project.org/imports/Qt3D/Extras/defaults/qml/"); |