summaryrefslogtreecommitdiffstats
path: root/src/plugins/sceneparsers/gltf/gltfimporter.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Add support to load data from memory for scene loadersMike Krus2017-05-211-13/+28
| | | | | Change-Id: I666897ae54441a226fa6f8a7f8cdfc1a576f3494 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge branch '5.9' into devSean Harmer2017-05-211-1/+1
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Remove unneeded temporary container (clazy reports)Mike Krus2017-05-021-2/+2
| | | | | | | | | | Change-Id: I2a7a94d7b2791382699b39dda1189bc78ce0ff06 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Add missing reference in range-for with non trivial type (clazy reports)Mike Krus2017-05-021-2/+2
| | | | | | | | | | Change-Id: Ib014b4ad7adc6604e600afc489e3dafaf0e299c1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge branch '5.9' into devSean Harmer2017-04-031-1/+1
|\| | | | | | | Change-Id: I5ba00475ad83132589f99348500a7103a03474b0
| * 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-7/+19
| | | | | | | | | 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-68/+128
| | | | | | | | 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-286/+556
| | | | | | | | 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>
* Fix GLTFImporter crash on loading second sceneMiikka Heikkinen2016-11-161-2/+2
| | | | | | | | | | | GLTFImporter caches raw pointers, which could very well be invalid by the time the second load happens, so clear the caches immediately after the load is finished. Task-number: QTBUG-57038 Change-Id: I0381f25b08bbbb1a397ba59fe9ef5be8ecbfcc36 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* GLTF Scene export pluginMiikka Heikkinen2016-11-161-125/+314
| | | | | | | | | | | | | | | | | | | | | | 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>
* Renaming Scene IO classes to scene import classesOtto Ryynänen2016-10-101-0/+1599
The so-called "IO" classes have never done I/O, only import. There is no sense to add also export to those classes as the IF is designed to do only import and there is no code that would be shared between the importer and exporter/saver. For the sanity of the code the naming is changed and we will implement exporter/saver class to be used for storing purposes. Change-Id: I832bef0e7de1f65289a89c6898a475dab7431dc0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 03:57:14 +0000