| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit be52033d3074773e313ed5522c7aa51625f95604.
Revert of commercial license headers is required for the
Qt 6.2.x opensource releases, Qt 6.2.5 onwards.
Task-number: QTBUG-107760
Change-Id: I2160e3269e8652cec427b3d82f540b0a07f789d7
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Updated header.COMM to the files in tqtc-qt3d.
Examples, tests, or documentation files 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-4935
Change-Id: I769e2e6a9afe8a340fb04ae002cd37a3b356c701
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
| |
Change-Id: I36ae2a043af155d2f2408dce5fcfae7f6e98823d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
| |
Fails CI with CMake
Change-Id: Ib9bed74c33cfcac150bc2d2dcfa720e88d14cfb1
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I33ed0dab919a5a8a79ed021c6c0dca3d83188f47
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
| |
Change-Id: If6c887c6356a160a5f3fb906d38a341fff0c7b29
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|\
| |
| |
| | |
Change-Id: Id669d5c1aab29965eac0dabd1cb497e908dac23e
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp
src/plugins/renderers/opengl/graphicshelpers/submissioncontext_p.h
src/plugins/renderers/opengl/renderer/renderer.cpp
src/render/backend/attachmentpack_p.h
src/render/frontend/qrenderaspect.cpp
src/render/picking/qabstractraycaster.cpp
tests/manual/manual.pro
Change-Id: I617b7e34bf7e11b2921bfc15e1b99c3e81891ec7
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use int, fixing:
qgltf.cpp(158): warning C4838: conversion from 'QFlags<QIODevice::OpenModeFlag>' to 'ushort' requires a narrowing conversion
qgltf.cpp(159): warning C4838: conversion from 'QFlags<QIODevice::OpenModeFlag>' to 'ushort' requires a narrowing conversion
qgltf.cpp(160): warning C4838: conversion from 'QFlags<QIODevice::OpenModeFlag>' to 'ushort' requires a narrowing conversion
qgltf.cpp(161): warning C4838: conversion from 'QFlags<QIODevice::OpenModeFlag>' to 'ushort' requires a narrowing conversion
qgltf.cpp(163): warning C4838: conversion from 'QFlags<QIODevice::OpenModeFlag>' to 'ushort' requires a narrowing conversion
qgltf.cpp(165): warning C4838: conversion from 'QFlags<QIODevice::OpenModeFlag>' to 'ushort' requires a narrowing conversion
Change-Id: I8fa5452b6485d32c8d86172497cf877d5bcaf0e2
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
[ChangeLog][qgltf][Important Behavior Changes] The -b option to qgltf
now generates CBOR data instead of binary JSON. Therefore, gltf files
generated with Qt 6.0 and the -b option to qgltf are not compatible
with Qt 5.14 or earlier.
Change-Id: I1641afa4ee3635e86885f85e79558ab42c31a196
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|\| |
| | |
| | |
| | | |
Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7
|
| |\|
| | |
| | |
| | | |
Change-Id: I41981a6e58046ad1b8e9870c789f6d46dce9accc
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Icc688bf31d0ed5b2759ff6be8a667e64eb0085bf
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We need to update the bootstrap library in order to remove binary JSON
support and add CBOR support. As we cannot use CBOR before and we cannot
use binary JSON afterwards, we need to disable binary JSON in qgltf,
then update the bootstrap library, and then add CBOR support to qgltf.
Change-Id: I4d70b831cf1924d08c821c74f0c1b63fd0d21844
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|/
|
|
|
|
|
|
|
| |
Binary JSON was deprecated in 5.15. It was never an official gltf
format anyway.
Could be replaced by CBOR but API is different.
Change-Id: If4ac6301addde8aa875fde246055dc8f1c6bcf9d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The keys are statically known, short, and few, so
replace the QHash<QByteArray, OpenMode> with a C
array of a {char[2]; OpenMode} struct, which
occupies just 40B in read-only memory. We don't
even need to sort the list, as binary search
in a list of ten entries is slower than linear
search (five comparisons each, on average, with
the linear scan having a predictable memory
access pattern.
Saves ~2.5KiB in text size on optimized GCC 6.0
Linux AMD64 builds.
Change-Id: I8ac680dc3a5c3489438d7dd9077aac46cd5708ab
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The only noteworth change is where a loop around spy.events modified
the container using takeFirst(). There was no reason to do so, so it
was changed to use the loop variable instead of the result of taking.
Change-Id: I02c62a7c2efc5d042c6e669fe5daddd7da7e85d2
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-74602
Change-Id: If9cf0795e887a0b3cdfed0a6f5e7798116ef137d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
|
|
|
|
|
|
| |
Change-Id: I66319ebe87b8f5a10cc20e6f57d0f25ca0694b2f
Task-number: QTBUG-70701
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Which should be all Android builds since gcc has been deprecated
in favor of clang in the NDK.
Also disable building of tools when cross compiling
Change-Id: Idb3f88130bf211926f7dd4ce52ac6582d806570d
Task-number: QTBUG-65542
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
|
| |
Change-Id: I4b498d9a17a35adaa503c1464e0b342ba693d4fe
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
|
|
|
|
| |
Change-Id: Ia80d1cb9cc96d76f8b367caa725c59a70ae0a4d5
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
| |
Do the fCurveIndex lookup in the right code branch which otherwise could lead
to out of range access (euler to quaternion case)
Change-Id: Ib3da1186ec2b20021436434c54a26f13969c49d2
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Armature export creates a json with bone names, bone matrices and
bone parents.
Path export creates a json for the camera path. At
the moment it is only exporting the path points.
Change-Id: I230fa7960cad7c6c7bbfea227fec51275e24d065
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|\
| |
| |
| | |
Change-Id: I02adbc5294f9d5879cb05e75eccad74196ea2a7c
|
| |
| |
| |
| |
| |
| |
| |
| | |
Add -no-assimp configure to build without assimp.
Task-number: QTBUG-60128
Change-Id: I2ca7bb68d3b659e18bd79039beb5cb6623473859
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ib84385167b2d71e460de87fbda58d59173385258
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|/
|
|
|
| |
Change-Id: I333e65e3173077c53ffae8cff3c2c1c37da6bd26
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: Icfcdaf52fb619d76e0edbca47995bc9028952dea
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/render/io/qsceneloader.cpp
src/render/picking/objectpicker.cpp
Change-Id: Ic36138954381820196eb81c5c59e6a91e7f40f33
|
| |
| |
| |
| |
| | |
Change-Id: I0cca7a6037c4c599cc953c0d5d293c77f09216a0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I7eac42f170de92bb34b69e72855e0b5de514de8c
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/sceneparsers/gltf/gltfio.cpp
src/render/io/objloader.cpp
Change-Id: I094c9310d56657ab19b4722b946c60d8cb490191
|
| |
| |
| |
| |
| |
| |
| | |
follows up qtbase/4eb2feb2.
Change-Id: I9af28a8f050d9fe1a9c45f5e677e609b68e6b421
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I8d6144a25963390b78ed9273a02b65b8e9cb37c4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/render/render.pro
Change-Id: I3d0463dabae4fc78f334afc8f90d2d321ab71e03
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/input/backend/updateaxisactionjob.cpp
src/render/renderstates/qalphacoverage.cpp
src/render/renderstates/qclipplane.cpp
src/render/renderstates/qdithering.cpp
src/render/renderstates/qseamlesscubemap.cpp
src/render/renderstates/qstenciltest.cpp
Change-Id: I5b279d30bbbb06af5e8ee9fc47e9794b78a567f5
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/core/resources/qframeallocator.cpp
src/plugins/sceneparsers/gltf/gltfparser.cpp
src/render/frontend/qrenderaspect.cpp
tests/auto/render/renderqueue/tst_renderqueue.cpp
Change-Id: Icdc2be2c80e7de6135a09e2f370ee004e395f514
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
all .prf files that need the variables it sets actually load it by
themselves.
This reverts commit 3ec11e4d94d57678f4dd1162185beef62e43da12.
Change-Id: Ia662f252b8215f83e090391748947a8579566885
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |/ /
| | |
| | |
| | |
| | |
| | | |
Change-Id: I47537db7e86d97ab8ef5c8ffc3da8f5a55c3f54c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It's stated in the documentation that it's faster.
Fixes all clazy-qfileinfo-exists warnings.
Change-Id: If80805f5144ddf765b4ed9d54f3aab842c21725f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... and mark qgltf as Q_FOREACH-free, using QT_NO_FOREACH.
In writeShaders(), also port two indexed loops to range-for.
Saves almost 6KiB in text size on optimized GCC 6.0 Linux
AMD64 builds.
Change-Id: Id281b077159f461c01c23600f6cb301a6aa34b9e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The first two lines are implicated in a compile error
in a follow-up commit that introduces C++11 ranged for
loops, so take another shot in the dark and remove the
lambda expression embedded in the QStringLiteral macro
by using QLatin1String instead, which, this being in a
QStringBuilder expression, is even a desirable change
in itself.
Change-Id: I1ccd8d2e3c23cefdd50e7bc71f3f95dbeac78b72
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
All structs are Q_MOVABLE_TYPE, except Node, whose
address is used as its identity, so by definition it
is not trivially relocatable. Therefore explicitly
marked as Q_COMPLEX_TYPE.
Change-Id: I338491a57cc0f70b3971dec34b7dd9d913a92462
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
It's even a true positive. Braces were missing.
Change-Id: Ie807c46659ad4085751bc78b86408ce1001e1daf
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-52736
Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/qt3d/examples-common/qorbitcontrol.h
src/core/qnodecreatedchange.cpp
src/core/qnodecreatedchange.h
src/input/frontend/qaxisactionhandler.h
src/input/frontend/qinputaspect.h
src/input/frontend/qkeyboardhandler.h
src/input/frontend/qmousedevice.h
src/input/frontend/qmousehandler.h
src/input/frontend/qphysicaldevicecreatedchange.h
src/input/input.pro
src/logic/qframeaction.h
src/plugins/sceneparsers/assimp/assimp.pro
src/quick3d/imports/input/importsinput.pro
src/quick3d/imports/render/importsrender.pro
src/render/backend/trianglesextractor.cpp
src/render/framegraph/qclearbuffer.h
src/render/framegraph/qlighting.h
src/render/framegraph/qstateset.h
src/render/frontend/qrenderattachment.h
src/render/geometry/qabstractattribute.h
src/render/geometry/qabstractbuffer.h
src/render/geometry/qattribute.h
src/render/geometry/qboundingvolumespecifier.h
src/render/geometry/qbuffer.h
src/render/materialsystem/qfilterkey.h
src/render/materialsystem/qparameter.h
src/render/materialsystem/qparametermapping.h
src/render/renderstates/qblendstate.h
src/render/renderstates/qdepthmask.h
src/render/renderstates/qpointsize.cpp
src/render/renderstates/qrenderstatecreatedchange.cpp
src/render/renderstates/qstencilop.h
src/render/renderstates/qstencilopseparate.h
src/render/renderstates/qstenciltestseparate.h
src/render/texture/qabstracttexture.h
src/render/texture/qabstracttextureimage.h
src/render/texture/qtextureproviders.h
Change-Id: I894d7781042cabdaa0cac690c198b57a41127bd4
|
| |
| |
| |
| |
| |
| |
| | |
qgltf.cpp:1990:38: error: template argument for ‘template<class Key, class T> class QHash’ uses local type ‘GltfExporter::exportTechniques(QJsonObject&, const QString&)::ProgramNames’
Change-Id: Ic747cc2ab45e4dc6bb70ffff143844dc7120e571
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|