diff options
Diffstat (limited to 'src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp')
| -rw-r--r-- | src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 127 |
1 files changed, 61 insertions, 66 deletions
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index 55af6432b..879b79294 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -38,69 +38,76 @@ ****************************************************************************/ #include "qt3dquick3dextrasplugin.h" -#include <Qt3DExtras/qcuboidmesh.h> + +#include <Qt3DExtras/qconegeometry.h> #include <Qt3DExtras/qconemesh.h> +#include <Qt3DExtras/qcuboidgeometry.h> +#include <Qt3DExtras/qcuboidmesh.h> +#include <Qt3DExtras/qcylindergeometry.h> #include <Qt3DExtras/qcylindermesh.h> +#include <Qt3DExtras/qdiffusemapmaterial.h> +#include <Qt3DExtras/qdiffusespecularmapmaterial.h> +#include <Qt3DExtras/qextrudedtextgeometry.h> +#include <Qt3DExtras/qextrudedtextmesh.h> +#include <Qt3DExtras/qfirstpersoncameracontroller.h> +#include <Qt3DExtras/qforwardrenderer.h> +#include <Qt3DExtras/qgoochmaterial.h> +#include <Qt3DExtras/qmetalroughmaterial.h> +#include <Qt3DExtras/qmorphphongmaterial.h> +#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> +#include <Qt3DExtras/qplanegeometry.h> #include <Qt3DExtras/qplanemesh.h> +#include <Qt3DExtras/qskyboxentity.h> +#include <Qt3DExtras/qspheregeometry.h> #include <Qt3DExtras/qspheremesh.h> -#include <Qt3DExtras/qtorusmesh.h> +#include <Qt3DExtras/qtext2dentity.h> +#include <Qt3DExtras/qtexturedmetalroughmaterial.h> +#include <Qt3DExtras/qtexturematerial.h> #include <Qt3DExtras/qtorusgeometry.h> -#include <Qt3DExtras/qspheregeometry.h> -#include <Qt3DExtras/qcuboidgeometry.h> -#include <Qt3DExtras/qplanegeometry.h> -#include <Qt3DExtras/qconegeometry.h> -#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 <Qt3DExtras/qtorusmesh.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 <Qt3DQuickExtras/private/quick3dlevelofdetailloader_p.h> #include <QtQml/qqml.h> QT_BEGIN_NAMESPACE -static const struct { - const char *type; - int major, minor; -} qmldir [] = { - // Materials - { "PhongMaterial", 2, 0 }, - { "PhongAlphaMaterial", 2, 0 }, - { "DiffuseMapMaterial", 2, 0 }, - { "DiffuseSpecularMapMaterial", 2, 0 }, - { "NormalDiffuseMapAlphaMaterial", 2, 0 }, - { "NormalDiffuseMapMaterial", 2, 0 }, - { "NormalDiffuseSpecularMapMaterial", 2, 0 }, - { "PerVertexColorMaterial", 2, 0 }, - { "GoochMaterial", 2, 0 }, - { "TextureMaterial", 2, 0 }, - // Effects - { "DefaultEffect", 2, 0 }, - { "DefaultAlphaEffect", 2, 0 }, - { "NormalDiffuseMapAlphaEffect", 2, 0 }, - // Scene Graph - { "LevelOfDetailLoader", 2, 2 }, - // FrameGraphs - { "ForwardRenderer", 2, 0 }, +void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) +{ + // Framegraphs + qmlRegisterType<Qt3DExtras::QForwardRenderer>(uri, 2, 0, "ForwardRenderer"); + qmlRegisterRevision<Qt3DExtras::QForwardRenderer, 9>(uri, 2, 9); + // Entities - { "SkyboxEntity", 2, 0 }, + qmlRegisterType<Qt3DExtras::QSkyboxEntity>(uri, 2, 0, "SkyboxEntity"); + qmlRegisterRevision<Qt3DExtras::QSkyboxEntity, 9>(uri, 2, 9); + qmlRegisterType<Qt3DExtras::Extras::Quick::Quick3DLevelOfDetailLoader>(uri, 2, 9, "LevelOfDetailLoader"); + // Camera Controllers - { "OrbitCameraController", 2, 0 }, - { "FirstPersonCameraController", 2, 0 }, -}; + qmlRegisterType<Qt3DExtras::QFirstPersonCameraController>(uri, 2, 0, "FirstPersonCameraController"); + qmlRegisterType<Qt3DExtras::QOrbitCameraController>(uri, 2, 0, "OrbitCameraController"); + + // Materials + qmlRegisterType<Qt3DExtras::QPhongMaterial>(uri, 2, 0, "PhongMaterial"); + qmlRegisterType<Qt3DExtras::QPhongAlphaMaterial>(uri, 2, 0, "PhongAlphaMaterial"); + qmlRegisterType<Qt3DExtras::QDiffuseMapMaterial>(uri, 2, 0, "DiffuseMapMaterial"); + qmlRegisterType<Qt3DExtras::QDiffuseSpecularMapMaterial>(uri, 2, 0, "DiffuseSpecularMapMaterial"); + qmlRegisterType<Qt3DExtras::QNormalDiffuseMapAlphaMaterial>(uri, 2, 0, "NormalDiffuseMapAlphaMaterial"); + qmlRegisterType<Qt3DExtras::QNormalDiffuseMapMaterial>(uri, 2, 0, "NormalDiffuseMapMaterial"); + qmlRegisterType<Qt3DExtras::QNormalDiffuseSpecularMapMaterial>(uri, 2, 0, "NormalDiffuseSpecularMapMaterial"); + qmlRegisterType<Qt3DExtras::QPerVertexColorMaterial>(uri, 2, 0, "PerVertexColorMaterial"); + qmlRegisterType<Qt3DExtras::QGoochMaterial>(uri, 2, 0, "GoochMaterial"); + qmlRegisterType<Qt3DExtras::QTextureMaterial>(uri, 2, 0, "TextureMaterial"); + qmlRegisterType<Qt3DExtras::QMetalRoughMaterial>(uri, 2, 9, "MetalRoughMaterial"); + qmlRegisterType<Qt3DExtras::QTexturedMetalRoughMaterial>(uri, 2, 9, "TexturedMetalRoughMaterial"); + qmlRegisterType<Qt3DExtras::QMorphPhongMaterial>(uri, 2, 9, "MorphPhongMaterial"); -void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) -{ // Meshes qmlRegisterType<Qt3DExtras::QConeMesh>(uri, 2, 0, "ConeMesh"); qmlRegisterType<Qt3DExtras::QConeGeometry>(uri, 2, 0, "ConeGeometry"); @@ -109,31 +116,19 @@ void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DExtras::QCylinderMesh>(uri, 2, 0, "CylinderMesh"); qmlRegisterType<Qt3DExtras::QCylinderGeometry>(uri, 2, 0, "CylinderGeometry"); qmlRegisterType<Qt3DExtras::QPlaneMesh>(uri, 2, 0, "PlaneMesh"); + qmlRegisterRevision<Qt3DExtras::QPlaneMesh, 9>(uri, 2, 9); qmlRegisterType<Qt3DExtras::QPlaneGeometry>(uri, 2, 0, "PlaneGeometry"); + qmlRegisterRevision<Qt3DExtras::QPlaneGeometry, 9>(uri, 2, 9); qmlRegisterType<Qt3DExtras::QTorusMesh>(uri, 2, 0, "TorusMesh"); qmlRegisterType<Qt3DExtras::QTorusGeometry>(uri, 2, 0, "TorusGeometry"); qmlRegisterType<Qt3DExtras::QSphereMesh>(uri, 2, 0, "SphereMesh"); qmlRegisterType<Qt3DExtras::QSphereGeometry>(uri, 2, 0, "SphereGeometry"); // 3D Text - 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"); + qmlRegisterType<Qt3DExtras::QExtrudedTextGeometry>(uri, 2, 9, "ExtrudedTextGeometry"); + qmlRegisterType<Qt3DExtras::QExtrudedTextMesh>(uri, 2, 9, "ExtrudedTextMesh"); - // 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/"); - qmlRegisterType(QUrl(path + qmldir[i].type + QLatin1String(".qml")), - uri, - qmldir[i].major, qmldir[i].minor, - qmldir[i].type); - } + qmlRegisterType<Qt3DExtras::QText2DEntity>(uri, 2, 9, "Text2DEntity"); } |