summaryrefslogtreecommitdiffstats
path: root/src/plugins/geometryloaders
Commit message (Collapse)AuthorAgeFilesLines
* Partially Revert "Remove custom gltf tool"Mike Krus2021-06-208-0/+938
| | | | | | | | | | In b9994cd88925ca012d66e52d033cc9a3a909fc7a, we removed the tool and the parser. This restores the parser, but the tool was unmaintained. Change-Id: I168e720b7fdf65aafebb9652933d8093f5449bdc Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 3c02825fcedbdb0983775d0522af9c851be6c0cd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Re-regenerate configure-related filesJoerg Bornemann2021-04-202-0/+24
| | | | | | | | | | | | | Add the missing qt_cmdline.cmake files. Fix the bundled assimp library. Remove the stale configure.cmake in src/plugins/sceneparsers. Remove unused features from src/core/configure.json. Change-Id: Id2aa3a02a1c0118c97bd2a447bd23f332f4b5270 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit e4aec09c7b9c639542965207850fdc8a3d1fc841) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Convert containers to use std::vectorMike Krus2020-12-015-60/+60
| | | | | Change-Id: Id1445c48761890836f965bee5c28df9b17e1fca4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix deprecated API usage and compile warningsMike Krus2020-11-201-1/+1
| | | | | | | | | - 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>
* Fix compilation with newer qtbaseFabian Kosmale2020-08-253-0/+3
| | | | | Change-Id: Iaba2780c2ac28181cce15ae350fadd755a51999f Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Use QList instead of QVector in implementation and docsJarek Kobus2020-07-094-40/+40
| | | | | | | | | Fix some const correctness. Use list-initialization. Task-number: QTBUG-84469 Change-Id: I9c56742581f48f89a3b02e4121fae414117c7a25 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove custom gltf toolMike Krus2020-06-178-938/+0
| | | | | Change-Id: I36ae2a043af155d2f2408dce5fcfae7f6e98823d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Resolve ambiguous namespacesMike Krus2020-06-081-2/+2
| | | | | Change-Id: Ia4509b24ed3316e8ef6f943529c69d43da17a774 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add support for building with CMakeMike Krus2020-05-225-0/+125
| | | | | Change-Id: If6c887c6356a160a5f3fb906d38a341fff0c7b29 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-033-6/+6
|\ | | | | | | Change-Id: Ic9d44cc830370b438ce5a5e54acb02f747209338
| * Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-02-273-6/+6
| | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: I685be5c4f16e7acfb38deafe3b92cfadb3a42188 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Geometry refactoringMike Krus2020-02-275-27/+36
|/ | | | | | | Move QBuffer, QAttribute, QGeometry to Qt3DCore. Change-Id: I59dfd091eefadcada93350b3aba955f40b304385 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove QtGui module path from OpenGL related pathsMike Krus2020-02-061-1/+1
| | | | | | | | Many are moving to opengl module in qt6, will make merging easier. Change-Id: I0ad08510e6999a5d887d9197fe2cb0dc21919fb9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Accept CBOR as optional format in gltf dataUlf Hermann2019-10-291-6/+2
| | | | | Change-Id: I8e64f061147af10a0d017238664c483724047059 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix Coverity warningsMike Krus2019-10-211-1/+2
| | | | | Change-Id: I00c875b48d838170fddf0b92f0ac5592828c6f0f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Eradicate Q_FOREACH loops and mark the module cleanMarc Mutz2019-05-223-9/+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 deprecation warnings about Qt3DRender::QBuffer::BufferTypeFriedemann Kleint2019-03-122-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the calls as 6158b4ae7cc88848b03d5d592a671de7113c4faf states that it no longer has any effect, fixing: gltfgeometryloader.cpp:333:18: warning: 'void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)' is deprecated [-Wdeprecated-declarations] gltfgeometryloader.cpp:371:54: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] basegeometryloader.cpp:155:39: warning: 'void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)' is deprecated [-Wdeprecated-declarations] basegeometryloader.cpp:202:46: warning: 'void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)' is deprecated [-Wdeprecated-declarations] instancebuffer.cpp:61:39: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is dep tst_qbuffer.cpp:79:96: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_qbuffer.cpp:85:100: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_qbuffer.cpp:128:109: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_qbuffer.cpp:132:57: warning: ‘void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)’ is deprecated [-Wdeprecated-declarations] tst_attribute.cpp:56:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_attribute.cpp:108:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_buffer.cpp:74:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_buffer.cpp:271:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_buffer.cpp:297:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_gltfplugins.cpp:519:95: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_gltfplugins.cpp:574:95: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_gltfplugins.cpp:967:83: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_gltfplugins.cpp:969:82: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_trianglesextractor.cpp:56:118: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_trianglesextractor.cpp:57:116: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_trianglesextractor.cpp:199:118: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] Change-Id: I6835598a1771a0ec3a0b080911fa4cada210a01a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* configure: adjust to qbase changesOswald Buddenhagen2018-12-311-13/+9
| | | | | | | call functions to resolve/verify the determined parameters. Change-Id: I1d0773b47e048a8b017c12216bd03625651921e4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: don't add system default library locations to fbxOswald Buddenhagen2018-12-311-6/+0
| | | | | | | | | it's rather pointless. Change-Id: I7fe3fbd402cadb60d81f778fd30760c49dfe8c29 Reviewed-by: Svenn-Arne Dragly <svenn-arne.dragly@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix compile warningsPaul Lemire2018-06-202-3/+6
| | | | | Change-Id: I71f1352de28383d5105c7ff887191265b509d191 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix compiler warningsFriedemann Kleint2018-05-241-1/+1
| | | | | | | | renderers/opengl/renderer/renderer.cpp:1232:20: warning: variable ‘newGLTexture’ set but not used [-Wunused-but-set-variable] stlgeometryloader.cpp:116:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Change-Id: Iacb8f19eee9c8c687ddbc52e21d7b991f6e5753b Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Doc: Fix documentation warnings related to Clang QDoc parserTopi Reinio2018-04-201-2/+3
| | | | | | | | | | | | | | | | | | | | | Since Qt 5.11, QDoc uses Clang to parse C++ documentation. Clang requires a module header, as well as proper include paths, to build a precompiled header and process the sources. To do this, add a custom module header that pulls in all Qt 3D modules - this way, we can continue using a single documentation project to covers all of Qt 3D. Fix all documentation warnings are caused by missing namespaces, QML module/type names and typos, as well as a number of linking problems and other minor issues. After this change, the remaining documentation issues consist of 'No documentation for ...' warnings. Task-number: QTBUG-67790 Change-Id: I38b91163c475a00cc1893e793240470c5409eb57 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Handle the check of binary versus ascii STL files more robustlyAkihito Izawa2018-04-121-10/+17
| | | | | | Task-number: QTBUG-67552 Change-Id: I30fc50415f155ce990e72287a99bfca35fcf9713 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* ObjGeometryLoader::doLoad(): Fix fall through warningsFriedemann Kleint2018-03-021-0/+2
| | | | | | | | | | | Fix: objgeometryloader.cpp:161:49: warning: this statement may fall through [-Wimplicit-fallthrough=] objgeometryloader.cpp:163:51: warning: this statement may fall through [-Wimplicit-fallthrough=] Amends 4338a85487788bb553cef0eaa5e5a3f929934eea. Change-Id: I4a77a6436eef0d91ccc69decdfe4365dfdc5df22 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-211-7/+7
|\ | | | | | | | | | | | | | | Conflicts: src/render/backend/renderer.cpp tests/auto/auto.pro Change-Id: Idc5bb088ae7f591809f8795124a3e44410bf4cf9
| * ObjGeometryLoader: Fix out of bound errorPaul Lemire2018-02-081-7/+7
| | | | | | | | | | | | | | Apparently this was a major security issue reported to security.qt-project.org Change-Id: Id52f035134ca6111e24b5820eb1b64b99449e47f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devAndy Nichols2017-11-201-0/+4
|\ \ | | | | | | | | | Change-Id: Ia6496e1ea22f2393a28e37cdd9f6e34f7613db49
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Svenn-Arne Dragly2017-11-151-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/render/backend/abstractrenderer_p.h src/render/backend/layer.cpp src/render/backend/layer_p.h src/render/backend/render-backend.pri src/render/backend/renderer_p.h src/render/backend/renderviewbuilder.cpp tests/auto/render/renderer/tst_renderer.cpp tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp Change-Id: I5c1b649052992e1b3483d549ddc188c8450e927f
| | * Deal with trailing spaces and crlfKevin Ottens2017-11-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | We ended up having corrupted meshes if the application which exported the OBJ was adding trailing white spaces. Also make sure we got a test case using crlf for end of lines. Change-Id: Iace9dbc3d0d124fefe9e3350d396fdf26555cd17 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Merge remote-tracking branch 'origin/5.10' into devAndy Nichols2017-11-133-8/+82
|\| | | | | | | | | | | Change-Id: I2d373d538df3a65ac2d41238e5c6a214a151be68
| * | Doc: add doc to undocumented classes qt3dv5.10.0-beta2Nico Vertriest2017-10-132-6/+82
| | | | | | | | | | | | | | | | | | | | | | | | Fbxgeometryloader Plygeometryloader Change-Id: Iace5ec78521d96386c1c2171195deba7ad6b5597 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * | Don't warn about buffers with unknown attribute typesSean Harmer2017-10-061-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Buffers in glTF are used for several other things than just vertex attributes so silence this annoying warning. Change-Id: I4c65ff681b148e449af0b8ce689f6df157eeca61 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-051-1/+1
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/animation/backend/channelmapper_p.h Change-Id: I4e0f59c6648925ba45d30ccc2405524a9e901a0e
| * | Merge branch '5.9' into 5.10Sean Harmer2017-09-301-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/animation/backend/animationutils.cpp src/animation/backend/animationutils_p.h src/render/geometry/qmesh.cpp tests/auto/animation/animation.pro Change-Id: Ifb57bfb0b12b3ebf9ee177d4ea684134455b4143
| | * Don't crash objgeometryloader on ill-formed face, just ignoreWieland Hagen2017-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | For < 3 vertices, array accesses would fail, and face creation not make sense anyways Change-Id: I5eb746dfdec92d1c836e9870d87e7900530ec81c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Replace Q_DECL_FINAL with finalKevin Funk2017-09-255-7/+7
| | | | | | | | | | | | | | | Change-Id: Ia80d1cb9cc96d76f8b367caa725c59a70ae0a4d5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-255-12/+12
|/ / | | | | | | | | Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add skinned mesh support to glTF mesh loadingSean Harmer2017-07-281-2/+4
| | | | | | | | | | | | | | | | | | This provides the joint indices and joint weights per-vertex attributes. The palette of skinning matrices will be supplied by the armature component in a followup commit. Change-Id: Ic0e87b7cb99d53edeb18c473acbdcc125bccaded Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Initial support for loading glTF 2 meshesSean Harmer2017-07-282-19/+235
|/ | | | | | | | We should likely refactor this more cleanly into a glTF 1 and glTF 2 pair of classes. Change-Id: I7046a77e1071ccd110608e24bb815ad6f1b6b87a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge branch '5.9.0' into 5.9Sean Harmer2017-05-201-1/+1
|\ | | | | | | Change-Id: Icb23dcb19d312559f5f4a71bde3dc26bf4a19408
| * Merge 5.9 into 5.9.0Oswald Buddenhagen2017-05-041-1/+1
| |\ | | | | | | | | | Change-Id: I02adbc5294f9d5879cb05e75eccad74196ea2a7c
| * | Add qAsConst, range-loop might detach Qt container (clazy reports)Mike Krus2017-05-021-1/+1
| | | | | | | | | | | | | | | Change-Id: I5d541cd0d08f17c25cbb839c111417130d133c3c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Fix build with QT_STRICT_ITERATORSSergio Martins2017-05-191-1/+1
| |/ |/| | | | | | | | | | | | | Which also fixes potential bugs when comparing iterators from different containers in case a detach happens. Change-Id: I5e91f82177d46a0f06272035af837e8a8b196f81 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Fix build for -no-feature-regularexpressionStephan Binner2017-04-271-1/+1
|/ | | | | | Change-Id: Icff3f2bb2886ba4e077fb43f9a406592435f6fff Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Don't explicitly disable the Qt3D category loggingLaszlo Agocs2017-03-316-6/+6
| | | | | | | | | | | | | 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>
* Improve documentation for QMeshMike Krus2017-02-061-2/+4
| | | | | | | | Also use QRegularExpression instead of the older QRegEx in the obj loader Change-Id: I031f98a718d81e9baeba7aeb6e3482bb22d5643f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix build for INTEGRITYKimmo Ollila2017-02-061-10/+10
| | | | | | | | Explicit specialization of class must precede its first use. Change-Id: I99c91e8724b1a66b5c151d2a751a19563b0d9a28 Reviewed-by: Nikola Velinov <nvelinov@ghs.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Added FBX geometry loaderGuillermo A. Amaral2017-01-208-0/+757
| | | | | | | Tested on Linux, macOS and Windows Change-Id: I4522e2c0ca07d7bbbf6e2918458b08be7e73c7e4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* GeometryLoader const and cleanupGuillermo A. Amaral2017-01-203-36/+34
| | | | | Change-Id: I4a3bfc67c4149f0946ca30adfb308b8b67004b22 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Added GLTF geometry loaderGuillermo A. Amaral2017-01-206-0/+701
| | | | | | | Based on scene parser. Change-Id: I9e4a84926fffaf9e2fa69ac351cfa151b3e79e95 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 03:21:02 +0000