summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Improve QScene2D documentationsMäättä Antti2017-05-091-6/+91
| | | | | | | | Add missing docs and add usage instructions for the Qml type. Change-Id: Id52025f0022bbaad56b0dbf4aa8ed33575568ceb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add quick3d class for VertexBlendAnimationAntti Määttä2017-05-095-3/+209
| | | | | | | | | Add the missing class for VertexBlendAnimation so that it can be used from qml. Task-number: QTBUG-60618 Change-Id: If47dccf5e44d0158053ca3b9122fcef91d73ea93 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge "Merge remote-tracking branch 'origin/5.9' into 5.9.0" into ↵Jani Heikkinen2017-05-097-34/+95
|\ | | | | | | refs/staging/5.9.0
| * Merge remote-tracking branch 'origin/5.9' into 5.9.0Oswald Buddenhagen2017-05-087-34/+95
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/render/geometry/buffer.cpp Change-Id: If4d28a1e4c95cbd8e81b1751eed3214952516d8c
| | * Fix Buffer uploadingPaul Lemire2017-05-084-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to load buffer data when creating it. This led to cases where we would not take into account immediately buffer updates after creation. This would then results in artifacts that would pop up on screen as actual buffer data and count would be different Change-Id: I5a2fad4fb5d7c1e1542cd0bf87ded16a111bc613 Task-number: QTBUG-60429 Reviewed-by: Oleg Evseev <ev.mipt@gmail.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | * Logic: only execute FrameActions which are enabledPaul Lemire2017-05-051-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ib89f6a4eae1b875a17c124337e0e4283d5d62b9e Task-number: QTBUG-60584 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * AssimpImporter: properly handle texture wrappingPaul Lemire2017-05-052-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default the wrap mode is Repeat. If specified it is changed to the appropriate value. Note: This changes also shows that each material could be definining the same texture with different wrap modes. Therefore we cannot store textures only based on their file path like we used to. Change-Id: Ic543c466d7c5cc7cd7e26d1738006952a8ce746b Task-number: QTBUG-59531 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * Optimize partial data update support for QBufferOleg Evseev2017-05-042-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now both QBuffer setData/functor and partial data update can be called without unexpected behavior. Optimize applying sequential updates. Change-Id: I5d3a8bcb7eb6eeb3ae33f0fbedbb34acedd1c000 Reviewed-by: Oleg Evseev <ev.mipt@gmail.com> Reviewed-by: Dmitry Volosnykh <dmitry.volosnykh@gmail.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * fixed graphicscontext applyUniform for uint uniform types.Daniel Bulla2017-05-041-4/+4
| | | | | | | | | | | | | | | Change-Id: I20e4146ba004a9b7f0cd823aa5ceaf2ed4a7103a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Add documentation for Scene2D exampleSean Harmer2017-05-091-1/+2
| | | | | | | | | | | | | | | Change-Id: I2d47b9224e4f26b342cd8a9bbe3c9c5a5e410dc1 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* | | Scene2D cleanup - register pick events when scene is initializedAntti Määttä2017-05-098-103/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current model where mouseGrab is connected to picker signal doesn't work. The pressed event is not sent to scene2d item, because it is already lost when scene2d gets the grabMouse message where it registers to the picker events. This breaks the mouse event sequence (press-move-release) for the quick item. Instead hook to setScene of the node to message scene2d when the scene gets initialized and always register to the picker events. Task-number: QTBUG-58876 Change-Id: Ic9ca4b0899a030336ef20ff2cffbe10b567c36f5 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* | | Scene2D cleanup - remove qml engine and sourceMäättä Antti2017-05-094-205/+9
|/ / | | | | | | | | | | | | | | | | | | Remove QQmlEngine constructor and source property. Update unit tests and manual tests accordingly. Task-number: QTBUG-58876 Change-Id: Ide06bb1381f48efa5378f9a008476734a33089c1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* | Scene3DRenderer: fix race conditionv5.9.0-beta4Paul Lemire2017-05-063-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | When the window geometry changes, the Scene3DRenderer was updating a Qt3D frontend node's property from the QSGRenderThread. This resulted in the QPostman::notifyBackend being called from possibly two threads at the same time, resulting in a race condition where the changes would never be submitted again to the backend. Change-Id: I842aaa54637d85d4d45eb54620749efb36168e2a Task-number: QTBUG-54900 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oleg Evseev <ev.mipt@gmail.com>
* | Add documentation for simplecustommaterial exampleMäättä Antti2017-05-051-1/+2
| | | | | | | | | | | | Task-number: QTBUG-60287 Change-Id: Id167ddd190b7aa5468bc6590c9f9f4fea234430b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Scene2D: put picking coordinates back in window coordinatesKevin Ottens2017-05-051-1/+1
| | | | | | | | | | | | | | | | | | We get the picking coordinates in model local tex coords which have a different convention than the mouse events in window coordinates. So flip them vertically to pass them in the right convention. Change-Id: I558cc62c7c820677407730eead8011193a4b967c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add a new mirrored property to QPlane(Mesh|Geometry)Kevin Ottens2017-05-056-7/+75
| | | | | | | | | | | | | | | | | | | | | | This is regularly necessary to be able to flip vertically the UV coordinates on the plane mesh depending if we are using a texture in model space coords or in window coords. Especially necessary now with Scene2D which outputs textures in window coords. This property is necessary to make it usable. Change-Id: I0fe7d3fdc125f1791492cf39ebe908bbc20f1db2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Apply layer filter to light sourcesLaszlo Agocs2017-05-051-2/+8
| | | | | | | | | | | | | | | | | | Cannot just take all entities with light components: the layer filter must be applied as usual. Task-number: QTBUG-60573 Change-Id: I361fab88745113c1b24b68cbff52051139046d9c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge 5.9 into 5.9.0Oswald Buddenhagen2017-05-0436-259/+786
|\| | | | | | | Change-Id: I02adbc5294f9d5879cb05e75eccad74196ea2a7c
| * Doc: correct several link errorsNico Vertriest2017-05-034-33/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | qkeyframeanimation.cpp:61: warning: Can't link to 'Qt3D.Render::Transform' levelofdetailloader.qdoc:40: warning: Can't link to 'minimum' levelofdetailloader.qdoc:40: warning: Can't link to 'maximum' qlevelofdetail.cpp:201: warning: Can't link to 'Qt3DRender::QLevelOfDetail::SizeProxyMode' qlevelofdetailswitch.cpp:62: warning: Can't link to 'LevelOfDetailSwitch::currentIndex' Plus a minor language correction Change-Id: I26096ec74880a406ada27fb3d867983845611410 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Renderer: fix OnDemand renderingPaul Lemire2017-04-274-76/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: this is a risky change For some reason the renderer assumed that a RenderQueue would never have a size of 0. This prevented the renderer from calling proceedToNextFrame() on the vsync advance service as it somehow felt that it was a case of rendering with a RenderQueue not yet ready. In the case of OnDemand rendering it is perfectly valid to have a RenderQueue of 0 (nothing has changed that requires rendering) but we still need to call proceedToNextFrame() otherwise syncChanges() is never called and we end up never updating the aspects ever again. The renderer was updated to 1) check if a RenderQueue is complete 2) check if the RenderQueue is empty. (a RenderQueue can be complete but empty (OnDemand case)) 3) Proceed to next frame if RenderQueue is complete or RenderQueue is empty. Change-Id: I27ae778831c9b136db1e1a69892f6fde291fd965 Task-number: QTBUG-59696 Task-number: QTBUG-54900 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Modify configure to build with no assimpMäättä Antti2017-04-272-3/+4
| | | | | | | | | | | | | | | | Add -no-assimp configure to build without assimp. Task-number: QTBUG-60128 Change-Id: I2ca7bb68d3b659e18bd79039beb5cb6623473859 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix -Werror=unused-parameter issueSean Harmer2017-04-271-1/+1
| | | | | | | | | | Change-Id: Ibc77241e8d369224eda790b8dcfd900f330bed37 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Fix build for -no-feature-regularexpressionStephan Binner2017-04-272-2/+2
| | | | | | | | | | | | Change-Id: Icff3f2bb2886ba4e077fb43f9a406592435f6fff Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Document QAdditiveClipBlendSean Harmer2017-04-271-49/+74
| | | | | | | | | | Change-Id: I8cc48899e31a32f6c1dd9f4f56e3a5fa846bd8f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Document QAbstractClipBlendNodeSean Harmer2017-04-271-0/+71
| | | | | | | | | | Change-Id: I15a95fed8500824e0eb0a5294c4725e6263a247c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Document QBlendedClipAnimatorSean Harmer2017-04-271-9/+199
| | | | | | | | | | Change-Id: Ic2505c1f2bfbcf3790f38634cf58b41c219c3525 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Document QClipAnimatorSean Harmer2017-04-271-0/+62
| | | | | | | | | | Change-Id: Iac75f836033e07c2d525c495e4cf0656a5ab11f5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Add imperative slots to control animator running propertySean Harmer2017-04-272-0/+19
| | | | | | | | | | Change-Id: I6fc8a5860421eb881a1b7d299f771ad88a278027 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Document the QAbstractClipAnimator classSean Harmer2017-04-271-0/+96
| | | | | | | | | | Change-Id: I731946acd392a3c164e71513b431e4d7e2a7034a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Fix build for -no-feature-wheeleventStephan Binner2017-04-2714-8/+59
| | | | | | | | | | | | | | Change-Id: I72591f43c0e2c4cc6e3e589f8d8e52fbb1041666 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix build for -no-feature-gesturesStephan Binner2017-04-273-3/+11
| | | | | | | | | | | | | | Change-Id: Ib0f0d7f21bf32b09f8dc6d3a4859d037b4e39af7 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix build for -no-feature-shortcutStephan Binner2017-04-271-0/+2
| | | | | | | | | | | | Change-Id: I1ddd01924fc1d5667be7e0bba2540e24c2272bc3 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix build without quick moduleStephan Binner2017-04-271-76/+84
| | | | | | | | | | | | Change-Id: I5a2a5ac0d498e8ab5568d57cd2c16e83d947fe47 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix build for -no-feature-temporaryfileStephan Binner2017-04-271-1/+6
| | | | | | | | | | | | Change-Id: I9e5bfc7636c10d0f0e39faf18b0b97bfb70f67d3 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix warnings for -no-feature-libraryStephan Binner2017-04-271-0/+5
| | | | | | | | | | | | Change-Id: I5a6713fe6081c36fdae9dcb7b7671403f737e4c0 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Update qmltypes filesMike Krus2017-05-036-244/+1453
| | | | | | | | | | | | Task-number: QTBUG-60514 Change-Id: Idc42a21109abef5563e6e8cda1a338147bb8dfce Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Unregister event filter when surface to closeMike Krus2017-05-031-0/+4
| | | | | | | | | | | | | | | | | | Prevents crash in two window manual test where the object is deleted when PlatformSurfaceFilter destructor tries to remove the event filter Change-Id: I1a37a3cb9088be462957ffbd4412ae5e5241f2df Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Use non-template version of QVariant::value (clazy reports)Mike Krus2017-05-026-6/+6
| | | | | | | | | | Change-Id: I998507edff792cfbdcdf2e36e29792fab3c734cf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Remove unneeded temporary container (clazy reports)Mike Krus2017-05-023-7/+17
| | | | | | | | | | Change-Id: I2a7a94d7b2791382699b39dda1189bc78ce0ff06 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add qAsConst, range-loop might detach Qt container (clazy reports)Mike Krus2017-05-0211-19/+19
| | | | | | | | | | 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-028-33/+33
| | | | | | | | | | Change-Id: Ib014b4ad7adc6604e600afc489e3dafaf0e299c1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add missing emit (clazy reports)Mike Krus2017-05-021-1/+1
| | | | | | | | | | Change-Id: I3e893a8dff15f4822ba1cde102a50d16daf042ee Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add missing Q_OBJECT (clazy reports)Mike Krus2017-05-026-0/+6
|/ | | | | Change-Id: I0bc49e1b391c610a8f8f649a45391b31f9283302 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* AssimpRawTextureImage: fix creation of QTextureImageDataPtrPaul Lemire2017-04-271-2/+3
| | | | | | Change-Id: Idefb37f5b52acb3400f08d9bb6488d9339738b53 Task-number: QTBUG-59362 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Render: make FrameGraphVisitor return a vector of FG nodesPaul Lemire2017-04-273-31/+22
| | | | | | | | Adjust the Renderer to be the one creating the RenderViewBuilder jobs. This removes a bit of coupling that will be needed to later only execute some jobs on demand. Change-Id: Ia5f1c6e6d40ee39595c661e177a08054ebc92a18 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Improve QParameter documentationPaul Lemire2017-04-261-9/+118
| | | | | Change-Id: I0b9cbd4d24120c9aa7c4186be26ff5e1c42c3299 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Improve QTechnique documentationPaul Lemire2017-04-261-17/+111
| | | | | Change-Id: I4fc3ff7256854968ae6a31fb30f4ad1721787e03 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Send move events when hover is enabledMike Krus2017-04-251-1/+1
| | | | | | Change-Id: I3bea4f27361dd4f51f8547c6d9d45c964f4fb5d3 Task-number: QTBUG-58607 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Remove last bits of qsortcriterionPaul Lemire2017-04-252-167/+0
| | | | | | | | | QSortCriterion was replaced with QSortPolicy, somehow some files were still around. Change-Id: Ic41fe557eb77c0b8d9d701a875598a7850a92b62 Task-number: QTBUG-55952 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Improve documentation for QMaterialPaul Lemire2017-04-251-2/+100
| | | | | Change-Id: Ied1053afa5cde7ce376ba6232d20a03b6edb05b6 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 01:00:21 +0000