| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 03e5f60e585701608c1181365faee484d7a1f14c.
Revert of commercial license headers is required for
Qt 5.15.3 opensource release.
Task-number: QTBUG-91108
Change-Id: I359e89ed77b1b2750607617d138ebb6c316f0296
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Updated header.COMM to the files in tqtc-qt3d. Examples,
documentation files or tests are not updated.
The commercial license header may contain some
additional lines so that its line count equals
with the earlier license header. Reason for this
is that some autotests use hard coded line numbers
and a change in the line count causes failures in
tests.
Task-number: QTQAINFRA-4155
Change-Id: I139c8ad72c042b0900239decc36cfed4bc1c4951
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
|
|
|
|
|
|
|
|
| |
There's an upgrade plan somewhere, because binary JSON won't exist in Qt
5. Someone is taking care of that, surely.
Change-Id: I99ab0f318b1c43b89888fffd160b626e8b871766
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
'matIt' is defined as a Java-style iterator outside the loop, as well
as a type-inferred STL-iterator inside.
Drop the hidden declaration.
Change-Id: I83ab93a5b2b5f611a820c1d47f17ec9371d65f50
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
Added a new QRenderState to provide access to glDepthRange.
Task-number: QTBUG-73059
Change-Id: I434b73e6e499307bfa58b2a1001e4c48328e9d5b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Mark as private:
* Qt3DRender::AssimpImporter
* Qt3DRender::GLTFImporter
* Qt3DRender::GLTFExporter
Exclude qt3d/src/plugins/sceneparsers from QDoc.
Task-number: QTBUG-67935
Change-Id: Ibaa04de183bce4bd88704d53c92718a331f9866b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|
|
|
|
|
|
| |
Found by Clazy clazy-range-loop
Change-Id: I4956f9be2b7b3f986b2fc83c1d883829314a8b6c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I890be56a59be47923bd0c2db31d72d3c2c45ae0e
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
| |
Change-Id: I331dd9b4adf7a412338daba6d11ca945dc290054
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/core/qscene.cpp
src/plugins/sceneparsers/gltf/gltfimporter.cpp
src/plugins/sceneparsers/gltfexport/gltfexporter.cpp
src/render/texture/gltexture.cpp
Change-Id: I7bde0fc0177eae252fef01cc43725fcf69c13a80
|
| |
| |
| |
| |
| | |
Change-Id: I998507edff792cfbdcdf2e36e29792fab3c734cf
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: I2a7a94d7b2791382699b39dda1189bc78ce0ff06
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: I5d541cd0d08f17c25cbb839c111417130d133c3c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ib014b4ad7adc6604e600afc489e3dafaf0e299c1
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|\|
| |
| |
| | |
Change-Id: I5ba00475ad83132589f99348500a7103a03474b0
|
| |
| |
| |
| |
| |
| |
| |
| | |
Found by Clang
gltfexporter.cpp:171:19: error: unused function 'matrix2jsvec' [-Werror,-Wunused-function]
Change-Id: I27b55fdf514247549455fffd14b18083413d36f9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Category logging is off by default, so explicitly turning it off will
just make it harder to turn it on in the application.
qt.*.debug has special behavior in the sense that defaults to off. Other
categories, like Qt3D.*.debug default to true. Therefore the only correct
way in Qt 3D is to always specify warning-and-up as the default enabled
severity.
Change-Id: I91daf48e049b7a9fcfac9720982138b178ee4804
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|/
|
|
|
|
|
| |
Fixes all clazy-container-anti-pattern warnings.
Change-Id: I399e333ef9b4731667cd698cd3882e0fdd63a857
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
QCamera position, upVector, and viewCenter properties were not properly
preserved when doing GLTF export/import.
Change-Id: I6d81633cf29d6e347935c56605b46923d3e1aa03
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|
|
|
|
|
|
|
| |
QGLTF exported basic mesh types will now properly import as the same
basic mesh types instead of generic QGeometryRenderers.
Change-Id: I6fb2f076f62f66116b26370a5c2ef99550c56233
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|
|
|
|
|
|
|
| |
Generic materials can now be exported with GLTF exporter
and imported back with GLTF importer.
Change-Id: I05f1f4d4be414d9a17c7ba91ee139e801dbccae8
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|
Added a plugin that can export Qt3D entity tree as a
GLTF scene. The GLTF format is extended a little to support
those cases not covered by standard format.
The existing GLTF import plugin was modified to support cases
it didn't already support.
Any meshes, transformations, default materials from Qt3DExtras,
cameras, and lights can be exported and imported.
Other components are ignored.
Adding support for custom materials is left for the future.
The camera fov unit (degrees vs radians) was also fixed to qgltf
tool to make it consistent with both assimp and GLTF specs,
as well as the fixed implementation in the importer plugin.
Change-Id: Iaa0aa6656429abb173f291fb1a768bf98819ac84
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|