diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2018-08-20 10:11:41 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2018-10-10 10:20:59 +0000 |
| commit | 5149ff8c645a15bc7f9ea28f6c085d08d79ca784 (patch) | |
| tree | 3e22e4f453fce06feb5bdf80ad60036ce644a7f3 /src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | |
| parent | b45d56eb116395387f619837d440d5771e9edd4b (diff) | |
QAbstractTexture:: add handle and handleType properties
Will allow to retrieve the OpenGL texture id for textures created by Qt3D.
Also completed tests along the way.
[ChangeLog][Qt3DRender] QAbstractTexture: Expose raw texture handle and
handleType to share with 3rdparty engines.
Change-Id: I27d390c223303d9d11a418c2957aaae6ae1df850
Task-number: QTBUG-70055
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/quick3d/imports/render/qt3dquick3drenderplugin.cpp')
| -rw-r--r-- | src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 4d9028f48..3d1d248c3 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -191,6 +191,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) // Textures qmlRegisterType<Qt3DRender::QTextureWrapMode>(uri, 2, 0, "WrapMode");//, QStringLiteral("QTextureWrapMode cannot be created from QML")); qmlRegisterUncreatableType<Qt3DRender::QAbstractTexture>(uri, 2, 0, "Texture", QStringLiteral("Texture should be created from one of the subclasses")); + qmlRegisterUncreatableType<Qt3DRender::QAbstractTexture, 13>(uri, 2, 13, "Texture", QStringLiteral("Texture should be created from one of the subclasses")); Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTexture1D, Qt3DRender::Render::Quick::Quick3DTextureExtension>("QTexture1D", "Qt3D.Render/Texture1D", uri, 2, 0, "Texture1D"); Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTexture1DArray, Qt3DRender::Render::Quick::Quick3DTextureExtension>("QTexture1DArray", "Qt3D.Render/Texture1DArray", uri, 2, 0, "Texture1DArray"); Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTexture2D, Qt3DRender::Render::Quick::Quick3DTextureExtension>("QTexture2D", "Qt3D.Render/Texture2D", uri, 2, 0, "Texture2D"); |