From f8483f866267db71ef338ee1600074896c9534b3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 2 Jan 2019 09:38:14 +0100 Subject: Fix sourceComponent property of EntityLoader Add the accessor to the property macro, fixing warning: Property declaration sourceComponent has no READ accessor function or associated MEMBER variable. The property will be invalid. Amends 4030e1796ca10c0eeab4fcb6cc6000b5bdb08028. Change-Id: Icc5048d34ecae4f7d0648002727362eaa97614a8 Reviewed-by: Paul Lemire --- src/quick3d/quick3d/items/quick3dentityloader_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h index beb72ba79..611d86cb2 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader_p.h +++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h @@ -76,7 +76,7 @@ class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DEntityLoader : public QEntity Q_PROPERTY(QObject *entity READ entity NOTIFY entityChanged) Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) - Q_PROPERTY(QQmlComponent *sourceComponent WRITE setSourceComponent NOTIFY sourceComponentChanged REVISION 12) + Q_PROPERTY(QQmlComponent *sourceComponent READ sourceComponent WRITE setSourceComponent NOTIFY sourceComponentChanged REVISION 12) public: enum Status { Null = 0, -- cgit v1.2.3 From a0496abe3890766638e8601c4bd11ba1755138e3 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Wed, 9 Jan 2019 10:09:41 +0200 Subject: Add changelog file for Qt 5.12.1 Change-Id: I91f2b59967d6e35fe6c5285223a76e8908c56d50 Reviewed-by: Sean Harmer --- dist/changes-5.12.1 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 dist/changes-5.12.1 diff --git a/dist/changes-5.12.1 b/dist/changes-5.12.1 new file mode 100644 index 000000000..0f6813e10 --- /dev/null +++ b/dist/changes-5.12.1 @@ -0,0 +1,33 @@ +Qt 5.12.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.12.1 Changes * +**************************************************************************** + + - Fixes to support loading uncompressed HDR textures + - Do not set texture layers when target is a 3D texture + - Recompute bounding volumes when a geometry buffer changes + - Fixes to PBR Metal Rough material on OpenGL ES 3 platforms + - Fix ordering of parameters to glDrawArraysInstancedBaseInstance + - Initialize texture internal format to NoFormat + - Do not send incorrect texture format back to frontend + - Fix loading of animation aspect on iOS + - Fix for locking in Scene3D rendering loop + - Various documentation fixes -- cgit v1.2.3 From ff36269001b1e0b13266ac14064657cbe2b0ed34 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Mon, 29 Oct 2018 14:14:09 +0100 Subject: Doc: Add doc to undocumented methods and properties qt3d Task-number: QTBUG-36985 Change-Id: Iead255c42517b45b1c2b07e2e6e081d15c865bcc Reviewed-by: Paul Wicking --- src/render/materialsystem/qshaderdata.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/render/materialsystem/qshaderdata.cpp b/src/render/materialsystem/qshaderdata.cpp index a636bc1a8..b70b99846 100644 --- a/src/render/materialsystem/qshaderdata.cpp +++ b/src/render/materialsystem/qshaderdata.cpp @@ -78,7 +78,7 @@ QShaderDataPrivate::QShaderDataPrivate(PropertyReaderInterfacePtr reader) /*! \fn Qt3DRender::PropertyReaderInterface::readProperty(const QVariant &v) - \return the property identifies by \a v + \return the property identified by \a v. */ /*! @@ -95,7 +95,7 @@ QShaderData::~QShaderData() } /*! * \brief QShaderData::propertyReader - * \return PropertyReaderInterfacePtr for this shader data + * Returns the PropertyReaderInterfacePtr for this shader data */ PropertyReaderInterfacePtr QShaderData::propertyReader() const { -- cgit v1.2.3 From a82fdf26ef28bee65b99850a745540b6ba92cbf4 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Thu, 24 Jan 2019 18:51:34 -0600 Subject: Document that QMetalRoughMaterial has an ES 3 technique Change-Id: Ia8467962fae689498a1f48c8784cf58d22c6a7a7 Reviewed-by: Laszlo Agocs --- src/extras/defaults/qmetalroughmaterial.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extras/defaults/qmetalroughmaterial.cpp b/src/extras/defaults/qmetalroughmaterial.cpp index f52437769..c6913b490 100644 --- a/src/extras/defaults/qmetalroughmaterial.cpp +++ b/src/extras/defaults/qmetalroughmaterial.cpp @@ -167,7 +167,7 @@ void QMetalRoughMaterialPrivate::handleTextureScaleChanged(const QVariant &var) \inherits Qt3DRender::QMaterial This material uses an effect with a single render pass approach and performs per fragment - lighting. Techniques are provided for OpenGL 3 only. + lighting. Techniques are provided for OpenGL 3 and OpenGL ES 3. */ /*! -- cgit v1.2.3 From 16701c2b3cb88e1a7092fcb244793dffd69cfe28 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Tue, 29 Jan 2019 08:16:47 -0600 Subject: Doc: Fix external link error for SceneLoader This was already fixed for the C++ docs; apply to the QML docs as well. Change-Id: Ibc5fd04ef4fa910af2d4ea05732c7d4c585cc074 Reviewed-by: Paul Wicking --- src/render/io/qsceneloader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp index f039933b0..d66fe3080 100644 --- a/src/render/io/qsceneloader.cpp +++ b/src/render/io/qsceneloader.cpp @@ -114,7 +114,7 @@ namespace Qt3DRender { SceneLoader internally relies on the use of plugins to support a wide variety of 3D file formats. \l - {http://www.assimp.org/main_features_formats.html}{Here} is a list of + {http://assimp.sourceforge.net/main_features_formats.html}{Here} is a list of formats that are supported by Qt3D. \note this component shouldn't be shared among several Entity instances. -- cgit v1.2.3 From 29683b1f79bdd6ffa8c8b02155c20995ad704770 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Wed, 30 Jan 2019 13:35:17 -0600 Subject: Add revisioned QML registrations for QAttribute Without this the revisioned properties are unavailable from QML. Change-Id: I0075a08b7bd0c0c62cea680fa4eb529a844d3466 Reviewed-by: Paul Lemire --- src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 015527730..4d2d5d19c 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -208,6 +208,8 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) // Geometry qmlRegisterType(uri, 2, 0, "Attribute"); + qmlRegisterType(uri, 2, 10, "Attribute"); + qmlRegisterType(uri, 2, 11, "Attribute"); qmlRegisterUncreatableType(uri, 2, 0, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML")); qmlRegisterUncreatableType(uri, 2, 9, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML")); qmlRegisterType(uri, 2, 0, "Buffer"); -- cgit v1.2.3 From a0194f58b3dbcb9aa10cf86f0239d284733493f6 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Wed, 30 Jan 2019 14:03:08 -0600 Subject: assimp: Provide names for generated child entities Allow them to be found via QSceneLoader::entity() Change-Id: I3b2fbfa780eb0a2be928554689d03c5c0e3ba5c9 Reviewed-by: Paul Lemire --- src/plugins/sceneparsers/assimp/assimpimporter.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp index a9a149c32..a91bc268d 100644 --- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp +++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp @@ -533,6 +533,7 @@ Qt3DCore::QEntity *AssimpImporter::node(aiNode *node) entityNode->addComponent(mesh); } else { QEntity *childEntity = QAbstractNodeFactory::createNode("QEntity"); + childEntity->setObjectName(entityNode->objectName() + QLatin1String("_Child") + QString::number(i)); if (material) childEntity->addComponent(material); childEntity->addComponent(mesh); -- cgit v1.2.3 From f7e1a38eb8b548a739e8e67eb7e5e6af3c4c0bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A4=C3=A4tt=C3=A4=20Antti?= Date: Wed, 30 Jan 2019 10:05:50 +0200 Subject: Always export scene2d shared object MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows implementing scene2d backend nodes in other render aspects. Task-number: QT3DS-2886 Change-Id: Idd3b32bbb2bf55870eccdd6b2470afd62183d676 Reviewed-by: Tomi Korpipää --- src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h b/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h index 83863be20..416a2280d 100644 --- a/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h +++ b/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h @@ -70,7 +70,7 @@ namespace Quick { class Scene2DManager; -class Q_AUTOTEST_EXPORT Scene2DSharedObject +class QT3DQUICKSCENE2DSHARED_EXPORT Scene2DSharedObject { public: Scene2DSharedObject(Scene2DManager *manager); -- cgit v1.2.3