summaryrefslogtreecommitdiffstats
path: root/src/plugins/sceneparsers
Commit message (Collapse)AuthorAgeFilesLines
* Make default geometries viewsMike Krus2020-02-272-18/+33
| | | | | | | | | | 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-274-26/+26
| | | | | | | Move QBuffer, QAttribute, QGeometry to Qt3DCore. Change-Id: I59dfd091eefadcada93350b3aba955f40b304385 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove custom deprecation macroPaul Lemire2020-02-123-3/+0
| | | | | Change-Id: If9fdd63d58b2f9d41dc3a6c99d1dde2245506d15 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>
* Merge remote-tracking branch 5.15 into devMike Krus2020-02-074-7/+6
|\ | | | | | | Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7
| * Fix deprecation handlingMike Krus2020-01-143-0/+3
| | | | | | | | | | | | Change-Id: If981333f7a3d78028d4f08c59867453d4192b955 Task-number: QTBUG-81058 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Accept CBOR as optional format in gltf dataUlf Hermann2019-10-291-11/+3
| | | | | | | | | | Change-Id: I8e64f061147af10a0d017238664c483724047059 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Remove support for binary json gltfMike Krus2020-01-303-35/+12
|/ | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.13' into 5.14Paul Lemire2019-10-151-1/+1
|\ | | | | | | Change-Id: I44133fbc9b93e96918463b0b0891ee5ab7db9f2c
| * Ensure we can build assimp on Windows and macOS with non gcc compilersAndy Shaw2019-10-071-1/+1
| | | | | | | | | | | | Fixes: QTBUG-75145 Change-Id: Ibee7d877bf78c2d2ed74ac8a89b7af5bf22f14f1 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* | Fix deprecation warningsMike Krus2019-07-301-11/+0
| | | | | | | | | | Change-Id: Ie36f38180d7cca5d8586aec765608bb2cdfb3d4a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | assimp plugin: replace QMap with a C arrayMarc Mutz2019-07-222-35/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The keys are statically known, short, and few, so replace the QMap<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. This is a port of dd1d8f51e67ec93031fdd7f7930d63761d1238e6 to the other copy of this code, which shows that arguments like 'this is just a tool, not a library' are ill-advised. Code _will_ be copied. Change-Id: Ie04137f94e487ce998ec077daf655b09bcbbcfc7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | AssimpImporter: remove unused QMapMarc Mutz2019-07-221-2/+0
| | | | | | | | | | | | | | The variable is referenced no-where else. Change-Id: Iad385c83a1fd3de260f830bf27edabeab7f17cb5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Remove unused file gltfparser.cppMarc Mutz2019-07-181-1560/+0
| | | | | | | | | | | | | | Found because it's full of Q_FOREACH when the module compiles fine with QT_NO_FOREACH... Change-Id: I8e34a3f54c1070d4dcc9b5c7b578760860eab72c 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>
* | 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>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-191-1/+1
|\| | | | | | | Change-Id: I129f54fd4c10318282428ea435f739930c6f3b08
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-161-1/+1
| |\ | | | | | | | | | Change-Id: Ida854001b159e527fefcc88bc14d842cb4ef3723
| | * Enable assimp for gcc 5.x buildsKarim Pinter2019-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the gcc major version is higher than 4, then assimp build is enabled so it will build on QNX and embedded linux. Task-number: QTBUG-73700 Change-Id: I92ffb6b364e85598cb754159d0e83ef02f368104 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-121-0/+1
|\| | | | | | | | | | | Change-Id: I99b5e3fd377f620dbb2fcf4dc14c2e5301baadb0
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-091-0/+1
| |\| | | | | | | | | | Change-Id: I41b5d2330d28231bd534a6def968906cc3b129aa
| | * Fix Assimp scene loader plugin resource pathsLee Helpingstine2019-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Assimp is passing us DOS style paths and failing to load resources in a QRC. Replacing \\ with / allows them to be loaded on all platforms. Change-Id: I086a158a9b2f3f8dcbc0ebfc082471b515e74820 Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Add support for glDepthRangeJim Albamont2019-02-112-3/+12
|/ / | | | | | | | | | | | | | | Added a new QRenderState to provide access to glDepthRange. Task-number: QTBUG-73059 Change-Id: I434b73e6e499307bfa58b2a1001e4c48328e9d5b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-021-0/+1
|\| | | | | | | Change-Id: I9b3faae3e87e1c68ae34bac278f08087dc6ac1a9
| * assimp: Provide names for generated child entitiesMichael Brasser2019-01-311-0/+1
| | | | | | | | | | | | | | Allow them to be found via QSceneLoader::entity() Change-Id: I3b2fbfa780eb0a2be928554689d03c5c0e3ba5c9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Preliminary glTF 2.0 scene import supportMassimo Callegari2018-12-222-152/+635
|/ | | | | | | | | | | | - add parsing of assets and detect the format version - add support for embedded resources - add composite metalness+roughness texture support See notes in cpp file. Task-number: QTBUG-61258 Change-Id: I40f2922d3e2391eb384527a6808fe1509a4aff96 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* 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>
* Doc: Remove private classes from public documentationPaul Wicking2018-07-113-0/+3
| | | | | | | | | | | | | | 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>
* Fix compile warningsPaul Lemire2018-06-201-1/+2
| | | | | Change-Id: I71f1352de28383d5105c7ff887191265b509d191 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Doc: Add missing dots (qt3d)Paul Wicking2018-06-191-1/+1
| | | | | | Task-number: QTBUG-68933 Change-Id: I4226b8b9d70548b6921948c5ea47520f40f5df98 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+1
|\ | | | | | | Change-Id: I666d4ca1ad39f81e41a9b47a8828d1689ff2b33e
| * gltf sceneloader: request mirrored=false for texturesLaszlo Agocs2018-04-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | The default of mirrored=true is unlikely to be the right thing to do here. Task-number: QTBUG-54881 Change-Id: I484927be984d69fdb75713401e0be1135831f8d1 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Doc: Fix documentation warnings related to Clang QDoc parserTopi Reinio2018-04-203-7/+7
|/ | | | | | | | | | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.10' into 5.11Sean Harmer2018-02-152-10/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/animation/doc/src/qt3danimation-module.qdoc src/render/backend/abstractrenderer_p.h src/render/backend/buffervisitor_p.h src/render/backend/renderer.cpp src/render/backend/renderer_p.h src/render/backend/triangleboundingvolume_p.h src/render/backend/trianglesextractor_p.h src/render/frontend/sphere_p.h src/render/jobs/calcboundingvolumejob.cpp src/render/jobs/job_common_p.h src/render/jobs/pickboundingvolumejob.cpp src/render/jobs/pickboundingvolumejob_p.h src/render/jobs/pickboundingvolumeutils.cpp src/render/jobs/renderviewjobutils_p.h tests/auto/render/boundingsphere/tst_boundingsphere.cpp tests/auto/render/commons/testrenderer.h tests/auto/render/raycasting/tst_raycasting.cpp tests/auto/render/render.pro tests/auto/render/renderer/tst_renderer.cpp Change-Id: I76633bc5a5a065e5f9ea62cc16563377e5c693a3
| * Merge remote-tracking branch 'origin/5.9' into 5.10Sean Harmer2018-02-052-10/+10
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/render/backend/trianglesvisitor.cpp src/render/backend/uniform.cpp src/render/jobs/calcboundingvolumejob.cpp src/render/jobs/pickboundingvolumejob.cpp src/render/jobs/pickboundingvolumeutils.cpp Change-Id: Ib8305011c51710a3538c0b29f7022388f5244a38
| | * Cleanup AssimpImporterPaul Lemire2018-02-012-10/+10
| | | | | | | | | | | | | | | | | | | | | And improve error output Change-Id: I9364e0e610cc758ad322bf96b52f57989c7ed0df Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | | Merge remote-tracking branch 'origin/5.10.1' into 5.11Liang Qi2018-02-141-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/render/backend/renderer.cpp src/render/backend/renderer_p.h tests/auto/render/renderer/tst_renderer.cpp Done-with: Svenn-Arne Dragly <svenn-arne.dragly@qt.io> Change-Id: I2ca9bac4777e51434579edf86030414734f533ac
| * | Fix warning about unused variableThiago Macieira2018-01-301-0/+1
| | | | | | | | | | | | | | | | | | | | | assimpimporter.cpp:616:75: error: unused parameter ‘basePath’ [-Werror=unused-parameter] Change-Id: I8d96dea9955d4c749b99fffd14cd62dd3d0fa45f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-221-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/render/backend/renderer_p.h src/render/geometry/geometryrenderer.cpp src/render/geometry/qmesh.cpp src/render/geometry/qmesh_p.h tests/auto/render/commons/testrenderer.h tests/auto/render/meshfunctors/tst_meshfunctors.cpp tests/auto/render/qmesh/tst_qmesh.cpp Change-Id: Ia078029e2faf23fe253c5ce385e393c094266e3b
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-221-0/+1
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/render/backend/renderer.cpp Change-Id: I691f54cd6daef8a966df37d447164c94badce34c
| | * AssimpImporter: disable default mirroring on texturesPaul Lemire2018-01-221-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: I8fd5776b44faf36b08f3966f634d656d06b203a4 Task-number: QTBUG-64133 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | | Merge branch '5.10' into devSean Harmer2018-01-173-23/+36
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I248aa369ba98659a61e563fd29cc811c76ea1e2d
| * | Prevent potential containers detachingMike Krus2018-01-142-21/+34
| | | | | | | | | | | | | | | | | | | | | Found by Clazy clazy-range-loop Change-Id: I4956f9be2b7b3f986b2fc83c1d883829314a8b6c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Iterate on references to avoid copiesMike Krus2018-01-132-2/+2
| | | | | | | | | | | | | | | | | | | | | Found by Clazy clazy-range-loop Change-Id: Ib2d7f4073cbe7b5b2280518d5dc92981b56541cc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-053-13/+68
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/animation/backend/channelmapper_p.h Change-Id: I4e0f59c6648925ba45d30ccc2405524a9e901a0e
| * | Doc: add doc to class AssimpImporterNico Vertriest2017-09-291-3/+3
| | | | | | | | | | | | | | | Change-Id: I8ce9c418b6a77aa6ec8054bdacfd69152924fbfe Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * | Doc: add doc to classes GLTFImporter and GLTFExporterNico Vertriest2017-09-292-4/+54
| | | | | | | | | | | | | | | 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>
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-251-45/+45
| | | | | | | | | | | | | | | Change-Id: I480f8b917e41d514f9efff01b2f2664b61ea3440 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Replace Q_DECL_FINAL with finalKevin Funk2017-09-253-9/+9
| | | | | | | | | | | | | | | Change-Id: Ia80d1cb9cc96d76f8b367caa725c59a70ae0a4d5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 21:18:12 +0000