summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash when running 3d-text examplev5.9.0-alpha1Antti Määttä2017-02-131-2/+5
| | | | | | | | | | | Change the text geometry to use 32-bit index buffer. qTriangulate is using them, which causes the index buffer copy to cause a mess. Also long texts could easily cause vertex buffers with more than 65536 vertices to be generated. Also add check for empty outlines. Task-number: QTBUG-58833 Change-Id: I5ad84081000e6b178a81d6d107aa013f29a95ac5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Enable animations doc generationAntti Määttä2017-02-134-5/+113
| | | | | Change-Id: Ia7e725b34b7a180dfbc920e7a65db70dac9ddd66 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add docs for animationsAntti Määttä2017-02-138-9/+763
| | | | | | | Also updated docs of other classes due to property changes. Change-Id: I1b1d44ad574ebb6ddf2ce7de5fe888c7b02a450b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Register QMorphPhongMaterial for qmlAntti Määttä2017-02-131-0/+2
| | | | | Change-Id: Ie15dbf44ccbdc09f51cb8525cbe77984d7e29791 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix autotestsAntti Määttä2017-02-1310-81/+138
| | | | | Change-Id: If7bd1299c7ccd4f5f40714a45025a40ac164db43 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Quick3DEntity: use dedicated list of QML componentsPaul Lemire2017-02-122-3/+5
| | | | | | | So that we can add layers to prebuilt Entities Change-Id: I608c3dfcb6351c95f4cd373f14bea0f3a247508c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Initialize members in DependencySean Harmer2017-02-121-1/+4
| | | | | | Change-Id: I0b6ee508099bc12d95da5ad7da519a25e5923747 Coverity-Id: 154602 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Initialize member in QThreadPoolerSean Harmer2017-02-121-4/+5
| | | | | | Change-Id: I7c59c48fbdeac30d0f2f3caefb6b71e19550e9f8 Coverity-Id: 154600 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Initialize member in SyncTaskRunnableSean Harmer2017-02-121-5/+6
| | | | | | Covrity-Id: 154599 Change-Id: Iacb9d98c8357a37ad8764875785862ee43506d37 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Initialize member in AspectTaskRunnableSean Harmer2017-02-121-2/+3
| | | | | | Change-Id: I370f798e7408c2bc47e64cfcc2e55b3e6e9f689b Coverity-Id: 154598 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove unused member from QEntityPrivateSean Harmer2017-02-121-4/+0
| | | | | | Change-Id: I21847fa56249cc403638b001bd49e6785f5e3ec3 Coverity-Id: 154597 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Initialize member in QSchedulerSean Harmer2017-02-121-0/+1
| | | | | | Change-Id: Idac9e42676ad92143e94dd5df02214fb79e5204e Coverity-Id: 154594 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Initialize members in Scene3DRendererSean Harmer2017-02-121-0/+2
| | | | | | Change-Id: Ifd2015207346987be498a63302ec6f352a489fb1 Coverity-Id: 154585 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Initialize members in Scene3DSGMaterialShaderSean Harmer2017-02-122-0/+8
| | | | | | Change-Id: Ia2f4f7840ad68c3868a7dfba9c81689f96ee524c Coverity-Id: 154584 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Initialize member in RendererSean Harmer2017-02-121-0/+1
| | | | | | Change-Id: I875f05fd7f6f19f3ccfd3fc44baecb1bf99312a1 Coverity-Id: 154568 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Initialize member in QBufferPrivateSean Harmer2017-02-121-0/+1
| | | | | | Change-Id: If4c908bef743a44334e8492aa613b8d14de18ee8 Coverity-Id: 154549 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Initialize variable in ShaderUniformsSean Harmer2017-02-121-0/+1
| | | | | | Change-Id: I65843908edfc7aba6eeb74f33f0df55444bd028c Coverity-Id: 154544 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Initialize member variable in RenderViewBuilderSean Harmer2017-02-121-1/+2
| | | | | | Change-Id: I16aeb64c88802c08f5328f00ec9dddfaa0922c80 Coverity-Id: 154536 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Silence warning 4828 in assimp on MSVCSean Harmer2017-02-121-1/+3
| | | | | Change-Id: I50dc8a64cfbf292228a88a7e7356dd958d592b4c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Use coordinates visitor to avoid copying vertex dataMike Krus2017-02-126-85/+477
| | | | | Change-Id: Ibab8d6cf8cedc93b0585a3af2d989eef7e8263b4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Unit test for bounding spheresMike Krus2017-02-126-0/+363
| | | | | Change-Id: Iee1e7aeaf43a4b783a914d808e2e7ac1e215b263 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Ignore compiled qml files (.qmlc)Mike Krus2017-02-111-0/+1
| | | | | Change-Id: Ic2b0e0f99947481bd05ca620d1d3d3c9f8ef9772 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix Clang warnings: wrong types in enum comparisonsMike Krus2017-02-111-1/+1
| | | | | Change-Id: Ib3795f141eaa65d76c8e7aeda4d8a9f2531c7205 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix Clang warnings: missing override declarationsMike Krus2017-02-111-4/+4
| | | | | Change-Id: Ifd6d83cd38358eef44af74e887d3a649917d764c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix Clang warnings: missing enum values in switchMike Krus2017-02-111-0/+9
| | | | | Change-Id: Id5087114283d5ef978ebb77d415f67c6254cbee0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix Clang warnings: missing virtual destructorMike Krus2017-02-112-0/+6
| | | | | Change-Id: Ifdb7c5ade912fb885b522d5a08d7569c14cbb48d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix Clang warnings: silence unused variablesMike Krus2017-02-114-2/+8
| | | | | Change-Id: I2dd185c1ae098034055fb1bbf7474554f8d1d13c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix Clang warnings: remove unused code and dataMike Krus2017-02-115-16/+3
| | | | | Change-Id: Ida1118c6471f35bff195395ed1df8f4dac2f0e6f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix Clang warnings: use of deprecated apiMike Krus2017-02-113-3/+3
| | | | | Change-Id: I72f92bfcbbd253cb3912c6dc51db9612d695fee9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix Clang warnings: out of order initializationMike Krus2017-02-116-12/+12
| | | | | Change-Id: Iea0b93082167bda9502e6947f213ab3430fa00d1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge branch '5.8' into 5.9Sean Harmer2017-02-1013-42/+114
|\ | | | | | | | | | | | | | | Conflicts: src/render/io/qsceneloader.cpp src/render/picking/objectpicker.cpp Change-Id: Ic36138954381820196eb81c5c59e6a91e7f40f33
| * Enable blitFramebuffer with ES2 when it is supportedAntti Määttä2017-02-083-22/+24
| | | | | | | | | | | | Task-number: QTBUG-57573 Change-Id: Ie1be0282fbab6e4346a81f37eff7597b932da07e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix deprecation warningSean Harmer2017-02-082-7/+15
| | | | | | | | | | Change-Id: I64bd08889fcd95dd41724652b84b34e8b9497ad3 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| * Fix -Wreorder warningsSean Harmer2017-02-081-2/+2
| | | | | | | | | | Change-Id: I53e040b84fa9fcc8ecec34c85d93da780b0e97ae Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| * Fix warning about set but not used variableSean Harmer2017-02-081-6/+0
| | | | | | | | | | Change-Id: Ic36141a63988a3070f7de453a8b6a3c0088866c8 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| * Add QBackendNode wizard templateDavid Morgan2017-02-076-11/+72
| | | | | | | | | | Change-Id: I0cca7a6037c4c599cc953c0d5d293c77f09216a0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Add .qmake.stash to .gitignoreSean Harmer2017-02-061-0/+1
| | | | | | | | | | Change-Id: If44d04450ca971ebefbdb767ef0e722ae893de3b Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Deliver all events by default unless marked as intermediateSean Harmer2017-02-0924-108/+81
| | | | | | | | | | | | | | | | | | | | This change inverts m_final flag on property change events so that now, all events are delivered by default. The animation aspect now marks intermediate calculated changes and these are not delivered unless the user subscribes to them. Change-Id: Ide6c30b29a91ed874d47c52d0ee1352f6680c3d8 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* | Fix KeyEvent forwardingAntti Määttä2017-02-081-0/+1
| | | | | | | | | | | | | | | | Renderer needs to set the key events also to the pick job. Change-Id: I305f96ef2cb836dac07b7710877cc6440ddb9216 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Guillermo A. Amaral <gamaral@kdab.com>
* | Move animations from extras to animationsAntti Määttä2017-02-0744-343/+339
| | | | | | | | | | Change-Id: If3bcfe24ebe7ecfb4519e0e400e601819783edad Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Improve documentation for QMeshMike Krus2017-02-062-5/+32
| | | | | | | | | | | | | | | | Also use QRegularExpression instead of the older QRegEx in the obj loader Change-Id: I031f98a718d81e9baeba7aeb6e3482bb22d5643f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Animations: add type to the jobs for the profilerPaul Lemire2017-02-067-3/+91
| | | | | | | | | | Change-Id: Ifa8d2def025608de6731b6391145df9ebb430d9f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge "Merge branch '5.8' into 5.9" into refs/staging/5.9Sean Harmer2017-02-0611-57/+179
|\ \
| * | Merge branch '5.8' into 5.9Sean Harmer2017-02-0611-57/+179
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/core/nodes/qnode.cpp Change-Id: Id989bec6c54eee94651906d44ece752c10b7d0d1
| | * Fix onDemand rendering idle loop CPU burningJanne Koskinen2017-02-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sleep render aspect if there are no jobs to create. Task-number: QTBUG-55109 Change-Id: I52ce90ab781d6986321ae0cd72a14cca09098180 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * Make sure not to reference already deleted VAOsWieland Hagen2017-02-021-1/+1
| | | | | | | | | | | | | | | Change-Id: I112100da22885b8f3868f235b44ea649e35755e9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Remove unneeded setAspectRatioWieland Hagen2017-02-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | will get updated in Qt3DWindow::resizeEvent() Task-number: QTBUG-58327 Change-Id: I9464ba193a225af17cc4638902d0c68e82640d41 Reviewed-by: Guillermo A. Amaral <gamaral@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * Fix node de-registration from scene on deletion/reparentingWieland Hagen2017-02-022-7/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNodePrivate::unsetSceneHelper() used to be broken, in that it set the m_scene of the the item that the NodeVisitor functor was executed on. Subsequent calls for child nodes would then have a m_scene == nullptr, and could thus not be de-registered. This patch fixes this behavior by treating each node's m_scene separately Task-number: QTBUG-57571 Change-Id: I779caadd6957a97514fd105cd16935c3edc9f41f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Delete abandoned VAOs after each frameWieland Hagen2017-02-015-37/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a job to traverse all active VAO handles to check if the geometry and shader objects used to identify the VAO do stil exist. If not, let the renderer dispose the VAOs. Make sure to synchronize access to VAO state and hide state changes behind member functions. Change-Id: Ib77be67d55daa61885cd914af8d9cfc622cae940 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * OpenGLVertexArrayObject: require cleanupWieland Hagen2017-02-013-5/+15
| | | | | | | | | | | | | | | Change-Id: I65d7e85abd707aea0554652694803bfdc52b8632 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 22:03:18 +0000