summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Fix misuse of QByteArrayLiteral vs QStringLiteralMike Krus2020-07-031-1/+1
| | | | | Change-Id: Ic42739ebefd3b5f81ab177d6d155da014c28bab9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Suppress the warning about binary JSON being deprecatedThiago Macieira2020-05-201-0/+3
| | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.14' into 5.15Antti Määttä2020-04-211-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * qgltf: Fix MSVC warning about narrowing conversionFriedemann Kleint2020-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-283-13/+37
|\| | | | | | | Change-Id: I41981a6e58046ad1b8e9870c789f6d46dce9accc
| * Update Blender exporters to work with Blender 2.80+Paul Lemire2019-12-193-13/+37
| | | | | | | | | | Change-Id: Icc688bf31d0ed5b2759ff6be8a667e64eb0085bf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Temporarily disable binary JSON mode for qgltf in bootstrap modeUlf Hermann2019-10-311-14/+28
|/ | | | | | | | | | 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>
* qgltf: replace QHash with a C arrayMarc Mutz2019-05-291-22/+29
| | | | | | | | | | | | | | | | | | 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>
* Eradicate Q_FOREACH loops and mark the module cleanMarc Mutz2019-05-221-3/+0
| | | | | | | | | | 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>
* Fix the build with -no-guiLiang Qi2019-04-091-0/+4
| | | | | | Task-number: QTBUG-74602 Change-Id: If9cf0795e887a0b3cdfed0a6f5e7798116ef137d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Revert disabling of tools building on cross-compiled buildPaul Lemire2018-11-131-1/+1
| | | | | | Change-Id: I66319ebe87b8f5a10cc20e6f57d0f25ca0694b2f Task-number: QTBUG-70701 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Allow to build assimp sceneparser on Android when using clangPaul Lemire2018-08-131-1/+2
| | | | | | | | | | | 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>
* Android: glTF is available here, so we can build the toolAndy Shaw2018-02-151-1/+1
| | | | | | | | 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>
* Replace Q_DECL_FINAL with finalKevin Funk2017-09-251-1/+1
| | | | | Change-Id: Ia80d1cb9cc96d76f8b367caa725c59a70ae0a4d5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-253-14/+14
| | | | | Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* qt3d_animation_export.py: fix crashPaul Lemire2017-08-181-9/+14
| | | | | | | | 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>
* Exporters for Qt3D Blender Path and ArmaturesRobert Brock2017-07-192-0/+296
| | | | | | | | | | | 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>
* Merge 5.9 into 5.9.0Oswald Buddenhagen2017-05-041-1/+3
|\ | | | | | | Change-Id: I02adbc5294f9d5879cb05e75eccad74196ea2a7c
| * Modify configure to build with no assimpMäättä Antti2017-04-271-1/+3
| | | | | | | | | | | | | | | | Add -no-assimp configure to build without assimp. Task-number: QTBUG-60128 Change-Id: I2ca7bb68d3b659e18bd79039beb5cb6623473859 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix build for -no-feature-commandlineparserStephan Binner2017-04-271-1/+1
| | | | | | | | | | | | Change-Id: Ib84385167b2d71e460de87fbda58d59173385258 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Use multi-arg where possible (clazy reports)Mike Krus2017-05-021-4/+4
|/ | | | | Change-Id: I333e65e3173077c53ffae8cff3c2c1c37da6bd26 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add script for blender to export animations for Qt 3DSean Harmer2017-03-021-0/+433
| | | | | Change-Id: Icfcdaf52fb619d76e0edbca47995bc9028952dea Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Merge branch '5.8' into 5.9Sean Harmer2017-02-106-11/+72
|\ | | | | | | | | | | | | | | Conflicts: src/render/io/qsceneloader.cpp src/render/picking/objectpicker.cpp Change-Id: Ic36138954381820196eb81c5c59e6a91e7f40f33
| * Add QBackendNode wizard templateDavid Morgan2017-02-076-11/+72
| | | | | | | | | | Change-Id: I0cca7a6037c4c599cc953c0d5d293c77f09216a0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix double -> float conversion warningsSean Harmer2017-02-061-1/+1
| | | | | | | | | | | | Change-Id: I7eac42f170de92bb34b69e72855e0b5de514de8c Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-244-12/+19
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/sceneparsers/gltf/gltfio.cpp src/render/io/objloader.cpp Change-Id: I094c9310d56657ab19b4722b946c60d8cb490191
| * remove obsolete host build declarations from subdirs projectsOswald Buddenhagen2017-01-181-1/+0
| | | | | | | | | | | | | | follows up qtbase/4eb2feb2. Change-Id: I9af28a8f050d9fe1a9c45f5e677e609b68e6b421 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Update the creator template files to follow latest APISean Harmer2017-01-113-11/+19
| | | | | | | | | | Change-Id: I8d6144a25963390b78ed9273a02b65b8e9cb37c4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-122-2/+1
|\| | | | | | | | | | | | | Conflicts: tests/auto/render/render.pro Change-Id: I3d0463dabae4fc78f334afc8f90d2d321ab71e03
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-281-1/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-251-1/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * remove pointless load(qt_build_paths)Oswald Buddenhagen2016-10-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Do not build qgltf when using an Android buildPaul Lemire2016-11-231-1/+1
| |/ / | | | | | | | | | | | | | | | Change-Id: I47537db7e86d97ab8ef5c8ffc3da8f5a55c3f54c Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | | Use the static QFileInfo::exists(), it's fasterSergio Martins2016-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | GLTF Scene export pluginMiikka Heikkinen2016-11-161-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | qgltf: eradicate all Q_FOREACH loopsMarc Mutz2016-09-272-50/+65
| | | | | | | | | | | | | | | | | | | | | | | | ... 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>
* | qgltf: replace some QStringLiteral with QLatin1StringMarc Mutz2016-09-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | qgltf: mark types movable/complexMarc Mutz2016-05-191-0/+19
| | | | | | | | | | | | | | | | | | | | 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>
* | qgltf: fix GCC 6 warning about misleading indentionMarc Mutz2016-05-081-1/+2
| | | | | | | | | | | | | | | | 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>
* | Q_NULLPTR -> nullptrSean Harmer2016-05-011-7/+7
| | | | | | | | | | | | Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge branch '5.6' into 5.7Sean Harmer2016-04-161-6/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix build in C++98 mode: template typenames must not be localThiago Macieira2016-03-031-6/+8
| | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-261-7/+6
|\| | | | | | | | | | | | | | | | | Conflicts: src/doc/src/qt3dcollision-module.qdoc src/render/frontend/qcamera.cpp src/render/frontend/qcameralens.cpp Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d
| * Fix potential crash due to taking iterator from temporary containerSergio Martins2016-01-231-7/+6
| | | | | | | | | | | | | | constBegin() would belong to a different container than constEnd() Change-Id: I5094d6a6ee9c2167bb69274556f568538c77cf6f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Unify license header usageAntti Kokko2016-01-261-18/+10
| | | | | | | | | | | | | | | | Updated license headers to use new GPL-EXCEPT header instead of LGPL3 one (in those files which will be under GPL 3 with exceptions) Change-Id: I930c6234bfe720d38c596bbc3d1f39be75a7328b Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Fix typo in creator template and adjust whitespaceSean Harmer2016-01-173-1/+3
|/ | | | | Change-Id: I4bee133d1babf86612e584f938938d59de7f422b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* remove workaround for framework buildsOswald Buddenhagen2016-01-141-10/+0
| | | | | | | the bootstrap library is supposed to work out of the box now. Change-Id: Ida1d181b55a37dc9f1b049bc2586aca5a9d9dc9c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* centralize + fix use of system assimpOswald Buddenhagen2016-01-141-10/+3
| | | | | | | | | | | | follow the foo.pri & foo_dependency.pri pattern found in qtbase to de-duplicate the code (and thus implicitly make it consistent) and synchronize the conditionals in the configure test. also document why we still can't enable the assimp sceneparser in all configurations. Change-Id: I3bdc30e077b6c9c7027a9311195c08a6c5f1fcf4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* qgltf: Add a short description to the helpLaszlo Agocs2016-01-131-0/+12
| | | | | Change-Id: I978127436e197c714f7ad43c86c1c7896b94d9cd Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* qgltf: Do not output the unused, dummy light blockLaszlo Agocs2016-01-071-10/+0
| | | | | Change-Id: Ie6de66a4150a1ebc8a4a6b555618282b7e756658 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 12:38:28 +0000