summaryrefslogtreecommitdiffstats
path: root/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove QFrameAllocator (again)Mike Krus2021-01-111-5/+5
| | | | | | Push-to: 6.0 Change-Id: I03ff6cab88d5bb0d279a61fa0a730f32b088b481 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Handle changes in QMetaType APIMike Krus2021-01-081-0/+12
| | | | | | | Updates to support building with Qt6 and Qt5.15 Change-Id: I9f06d810c943a348e6a060f4ea35ed870f21694a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Restore use of QVector in private APIMike Krus2021-01-051-1/+1
| | | | | | | | Facilitates building against Qt 5.15. Will migrate to std::vector over time. Change-Id: I5db14c9ea95b38e4b2d596d7397fef76f6baf118 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix deprecated API usage and compile warningsMike Krus2020-11-201-6/+6
| | | | | | | | | - QVariant::Type deprecated, use QMetaType related APIs - QNodeId not used as reference in for loops (nop but really noisy) - some unused code Change-Id: I291219207fcd1ad0bf89533b4e2bb5fa47a353bb Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Make sample meshes geometry renderers againMike Krus2020-07-301-8/+5
| | | | | | | Introduce new geometry view class for each. Change-Id: I8e9a8f3a078d4cc63f9656ae8142e39f05d755c7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Use QList instead of QVectorJarek Kobus2020-07-071-9/+9
| | | | | | Task-number: QTBUG-84469 Change-Id: Ic726ce85e01190dbc64426388fd454c54ae3c3e3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Make default geometries viewsMike Krus2020-02-271-5/+8
| | | | | | | | | | In Extras, make QTorusMesh and others a QGeometryView rather than a QGeometryRenderer. Requires changes to scene graphs here and there but going forward there simple shapes could be used as proxies for picking or collision detection, etc. Change-Id: Id488e064080dfd303e448aba11e6b242236b81d4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Geometry refactoringMike Krus2020-02-271-3/+3
| | | | | | | Move QBuffer, QAttribute, QGeometry to Qt3DCore. Change-Id: I59dfd091eefadcada93350b3aba955f40b304385 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove buffer functor APIMike Krus2020-02-111-11/+1
| | | | | Change-Id: I78cc60ff634f909111b891d5b9716e19cae35f3b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove support for binary json gltfMike Krus2020-01-301-28/+10
| | | | | | | | | 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>
* GLTFExporter: remove duplicate definitionMarc Mutz2017-12-281-1/+0
| | | | | | | | | | | | '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>
* Add support for glDepthRangeJim Albamont2019-02-111-0/+6
| | | | | | | | Added a new QRenderState to provide access to glDepthRange. Task-number: QTBUG-73059 Change-Id: I434b73e6e499307bfa58b2a1001e4c48328e9d5b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Remove private classes from public documentationPaul Wicking2018-07-111-0/+1
| | | | | | | | | | | | | | 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>
* Prevent potential containers detachingMike Krus2018-01-141-20/+32
| | | | | | | Found by Clazy clazy-range-loop Change-Id: I4956f9be2b7b3f986b2fc83c1d883829314a8b6c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: add doc to classes GLTFImporter and GLTFExporterNico Vertriest2017-09-291-0/+24
| | | | | Change-Id: I890be56a59be47923bd0c2db31d72d3c2c45ae0e Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* PhongAlpha: encode the alpha in kdKevin Ottens2017-09-271-6/+11
| | | | | Change-Id: I331dd9b4adf7a412338daba6d11ca945dc290054 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge branch '5.9' into devSean Harmer2017-05-211-20/+23
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Use non-template version of QVariant::value (clazy reports)Mike Krus2017-05-021-1/+1
| | | | | | | | | | Change-Id: I998507edff792cfbdcdf2e36e29792fab3c734cf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Remove unneeded temporary container (clazy reports)Mike Krus2017-05-021-4/+8
| | | | | | | | | | Change-Id: I2a7a94d7b2791382699b39dda1189bc78ce0ff06 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Add qAsConst, range-loop might detach Qt container (clazy reports)Mike Krus2017-05-021-4/+4
| | | | | | | | | | Change-Id: I5d541cd0d08f17c25cbb839c111417130d133c3c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Add missing reference in range-for with non trivial type (clazy reports)Mike Krus2017-05-021-17/+17
| | | | | | | | | | Change-Id: Ib014b4ad7adc6604e600afc489e3dafaf0e299c1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge branch '5.9' into devSean Harmer2017-04-031-1/+3
|\| | | | | | | Change-Id: I5ba00475ad83132589f99348500a7103a03474b0
| * Disable two functions not currently in useThiago Macieira2017-04-021-0/+2
| | | | | | | | | | | | | | | | 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>
| * Don't explicitly disable the Qt3D category loggingLaszlo Agocs2017-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Don't allocate temporary containers while iteratingSergio Martins2017-04-021-1/+1
|/ | | | | | | Fixes all clazy-container-anti-pattern warnings. Change-Id: I399e333ef9b4731667cd698cd3882e0fdd63a857 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* GLTF Export QCamera properlyMiikka Heikkinen2017-01-181-1/+12
| | | | | | | | | 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 exporting basic mesh typesMiikka Heikkinen2016-12-131-238/+338
| | | | | | | | 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>
* GLTF exporting materials with custom shadersMiikka Heikkinen2016-12-091-478/+887
| | | | | | | | 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>
* GLTF Scene export pluginMiikka Heikkinen2016-11-161-0/+1571
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 10:05:30 +0000