summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* qgltf: Add an option to suppress techniques completelyLaszlo Agocs2016-01-071-7/+17
| | | | | | | | | | Due to the KHR_materials_common block Qt 3D is able to load the generated scenes without the presence of shaders, programs and techniques blocks. Add an option to skip outputting these, in order to reduce the size and speed of parsing. Change-Id: I212e4e66197489c107ee47dcbc33d6f5b6b40156 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* qgltf: Fix not including image files in the qrcLaszlo Agocs2016-01-071-6/+6
| | | | | | | | | Once again, the problem surfaces: when not specifying an output directory, image files are not added to the resource list. Change it to go through the external texture list always. Change-Id: Ic3da5d7f8b1da958c6453f18650f2e50c70a0d1f Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* qgltf: Promote rgb to rgba for common material valuesLaszlo Agocs2016-01-071-0/+20
| | | | | | | | | | The spec uses FLOAT_VEC4 for colors. This means that while in the custom material case we can use vec3 since we provide the type information, the common materials path needs to promote all colors to RGBA. Change-Id: I1ac403807d0d6f0e9dfe14ea704c7f4a325495fa Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Use .qgltf extension for qgltf-generated glTF filesLaszlo Agocs2016-01-071-3/+3
| | | | | | | | | | Let's avoid future confusion by using a custom extension for the main JSON document. In case assimp gets upgraded to a future version supporting glTF files for example, confusion can arise due to the conflicting file extensions in the scene parser plugins. Change-Id: I370cc45cc399cae4f425d86574ccea9cd6c59d4f Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* qgltf: Output a KHR_materials_common blockLaszlo Agocs2016-01-071-1/+30
| | | | | | | | | | | | | | Unless disabled by a command-line switch. The spec is insufficient to support normal maps, the "normalmap" value is our own extension to the extension for now. Also, the common technique name is always PHONG. The correct material can be chosen based on the presence and type of the value list entries. Task-number: QTBUG-49384 Change-Id: I4f2e5848ad8019c44e9392416501655ab1163d7c Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Add template for QtCreator to create subclasses of some Qt3D typesSean Harmer2016-01-015-0/+278
| | | | | | Change-Id: I050e45a8b2e884ec9ee805fa9ddcbafe705802c3 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* fix condition for using qtcore's built-in zlibOswald Buddenhagen2015-12-011-1/+0
| | | | | | | | | | | when we're not cross-building, even a host build may use the system zlib. this also makes the force_bootstrap workaround in qgltf superfluous. Change-Id: Ic0a8b872ac602b1f268a1c6f8dcd5b400d641ff5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix shadow builds on windowsSean Harmer2015-11-261-0/+1
| | | | | | | Seems to work on Windows, Linux and OS X. Change-Id: Ie0a00c4abf12c3dc7451019fc4d53a15094d558a Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Allow to link on systems with another Qt installed in /usr/libSean Harmer2015-11-201-1/+1
| | | | | | | | | | | | | | | Without this commit, the link line for qgltf tries to search in /usr/lib before the qtbase/lib dir of the Qt currently being built. In doing so it found the system installed QtCore which is not what we want. In my case it failed because of missing symbols as I'm using a namespaced build but in other cases it may lead to more subtle errors. Using PKGCONFIG_PRIVATE puts the /usr/lib search path from pkgconfig at the end rather than the beginning of the search path list. Change-Id: I0f715564c3255100a42d6e9c12b1d10168cd05bb Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* qglTf: Update to use glTF 1.0draft specAndy Nichols2015-11-131-46/+12
| | | | | Change-Id: I137b5b67e89930a055360e3017ce9f0c0ceb6d6b Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Rename varyings that clash with three.js' glTFLoaderLaszlo Agocs2015-11-131-24/+24
| | | | | | | Task-number: QTBUG-49343 Change-Id: Ice78fc0a689251ddd27f1b4cfe9b5ba2a4db0f0f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* qgltf: Fix not putting textures into the qrc when no copying occursLaszlo Agocs2015-11-131-1/+1
| | | | | | | | | | | | | Now that the qmake rule uses "." as the default output directory for the generated files, external assets like textures are often not copied as they are in the same place already. However, we still need to list everything in the generated .qrc file. This should fix not having textures in many cases with the simplified prf. Change-Id: I2b593adf9ac9dddf32bf1e411bd9443025727f8f Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 15:17:48 +0000