summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Improve documentation of ObjectPickerJean-Michaël Celerier2019-08-071-0/+2
| | | | | | | | | | | | | | Add a reference to Scene3D hoverEnabled Change-Id: I59e282a985ae5af30ff22d7caf433fb3b7cd821b Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Fix download test after removal of assetsMike Krus2019-08-071-1/+1
| | | | | | | | | | Change-Id: Id7f37b014dec7f395bbf3d2c6c22ea59283257ec Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * GLTexture: glTexParam is not supported on multisampled texturesPaul Lemire2019-08-071-0/+7
| | | | | | | | | | | | | | So try to avoid performing these calls on such texture Change-Id: I051fd6a0150d07656687a1f84756d8a3d506ec24 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * submissioncontext fix: devicePixelRatio is not an integerPaul Lemire2019-08-071-1/+1
| | | | | | | | | | | | | | | | Converting it to int would cause the viewport not to take the whole expected size as the interger conversion would essentially floor the value. Change-Id: Ic608b0e1a0910aadb8b98c3225f999cba6326535 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-061-3/+16
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-061-3/+16
|/| | | |/ | | | | Change-Id: I8957f671305454e7b2db83f52a09a2fa4b6d3e67
| * Improve SortPolicy documentationMichael Brasser2019-08-051-3/+16
| | | | | | | | | | Change-Id: If7759ce872d26087d181eefe24504409aa779ea9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-306-1/+109
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-306-1/+109
|/| | | |/ | | | | Change-Id: Id2885cdbb45f8aa701e218b6201f0a3732b7ef11
| * ShaderData: don't call markDirty(AllDirty)Paul Lemire2019-07-241-1/+1
| | | | | | | | | | | | | | | | But only markDirty(ParametersDirty) as that's the only thing this is affecting. Change-Id: I450d013dc266ca70ca51cfa866b731a6e8b6499a Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Add QML documentation to QSkyboxEntityPaul Lemire2019-07-241-0/+45
| | | | | | | | | | | | Change-Id: Id82777c111827e8db8924d2d39b5844386344b69 Task-number: QTBUG-76767 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Provide more detail in *Light documentationMichael Brasser2019-07-234-0/+63
| | | | | | | | | | Change-Id: I8d56836f1f075c7239b262454131062c10058026 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-2324-23/+915
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-2324-23/+915
|/| | | |/ | | | | Change-Id: I2a66e9344b72524431885bdf5f59fcaedb94c718
| * Silence warnings about null textures in uniformsMike Krus2019-07-221-0/+6
| | | | | | | | | | | | | | It's common while textures are loading Change-Id: I360c88c72fbd0a034aff07451fd49be17b348d40 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Renderer: use last known good surface to reset render statesPaul Lemire2019-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were instead checking against the last surface used (which could be null) instead of the last known good surface to reset the render states. This could result in not resetting the render states and keeping dangling pointers around. To know if we can render, we check find the first non null surface in the list of RV. In most cases we can safelly assume that if first RV has a surface, all following ones will likely use the same surface. If we have no good surface we skip the rendering. However in the case you have a FG where the first RV has a surface but not the last one (which wouldn't really make sense but can happen if you mess up), we could end up in the above case where surface is nullptr though we have partially rendered something for the RV which had valid surfaces. Change-Id: I902b8c7a943ad2ca7e2f487873f73990cf8db433 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Align RenderView::buildComputeRenderCommands with buildDrawRenderCommandsPaul Lemire2019-07-191-3/+14
| | | | | | | | | | | | | | State and parameter handling are the same between the two branches Change-Id: Ic8394a969184daead33253c9303c20ecf1a97484 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * RenderStates: fix override of nested RenderStatesPaul Lemire2019-07-1822-19/+894
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When merging states, make sure we don't add several states of the same types with possibly different values. We should only add states with type we don't already have. Since the FG traversal is done from leaf to root, we know that the states we already contain should override any state that may have been specified higher up in the FG branch. Change-Id: I9bd1eadd37e8addf740a4b85b2318f9be269fedb Task-number: QTBUG-76766 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-1617-50/+208
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-1617-50/+208
|/| | | |/ | | | | Change-Id: I0f68ab1277617c32b1c31f29d8793d23d9909208
| * Document an example of how textureScale might be usedMichael Brasser2019-07-157-0/+51
| | | | | | | | | | Change-Id: Iead857526a06b104080ab843b26c49efc22f05cc Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * QRay3D: normalize the direction vector internallyPaul Lemire2019-07-152-22/+22
| | | | | | | | | | | | | | | | | | It can be created with a non normalized dir vector but we should always perform the computations with a normalized dir vector for correct results. Change-Id: Ie9108de7ed2092f6b979a70ad9391267fe6c4696 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Take shortest path on quaternion slerpJuan Jose Casafranca2019-07-153-12/+38
| | | | | | | | | | Change-Id: I4499e945481a22adfbafcc82198f7c411d04301b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Joints: remove removed joints from dirty listPaul Lemire2019-07-153-0/+8
| | | | | | | | | | | | | | | | | | In case a joint is added and destroyed within the same loop of the event loop, we need to remove it from the list of dirty joints to process as this otherwise results in an assert. Change-Id: If2f4ece6e2d69a7801ce9c4ec2cb732f48895ad1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Expand documentation for CameraMichael Brasser2019-07-121-15/+88
| | | | | | | | | | Change-Id: Id886decd4f2bd83a2319b4ad792a15b7280cb448 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Doc: Fix typo in property namePaul Wicking2019-07-101-1/+1
| | | | | | | | | | | | | | | | | | colorbuffer -> colorBuffer Fixes: QTBUG-76342 Change-Id: Ic63ac9b333710ebab17aa7c4ccd9e864f10e6fcf Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-111-2/+2
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-111-2/+2
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iabe445fa892f2022aa1e58d1783a2d588d6b6a87
| | * Document unit for FrameAction::triggeredMichael Brasser2019-07-031-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-74165 Change-Id: I4d3de42cddd8f6e1e6729cc16a52e135ab7fa3b1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: I9e9da54e565ad7818e6ea8196a062af8b4931783
* | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
|/ / | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: Iec111e88d38fb9a143a60a647251601f331fc41e Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | Change-Id: Iff6e240187e3515a51f41a91da827d4a53c01a31
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-285-49/+157
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-275-49/+157
|/| | | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iae5fa92dfdf8012315c043e20950368e42451e20
| * Doc: Update code samples in 'Qt 3D Render Framegraph' documentationTopi Reinio2019-06-171-47/+81
| | | | | | | | | | | | | | | | | | | | | | | | The code snippets were outdated, referring to QML properties that do not exist. In particular, the Deferred Rendering section contains code that was based on an example that's since moved into tests. Adapt the code to match the updates done to that example and also mention where it originates from. Task-number: QTBUG-73024 Change-Id: I9ec750d05f8e853e5614f33dadcbe44a0b42e356 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Doc: Extend Qt3D documentationPaul Wicking2019-06-073-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds missing C++ and/or QML documentation for: * enum QBuffer::AccessType * QBuffer::accessType() * QBuffer::dataAvailable() * ForwardRenderer::externalRenderTargetSize * enumeration Qt3D.Render.Light::type * Qt3D.Render.Light::color * Qt3D.Render.Light::intensity Fixes: QTBUG-73071 Change-Id: I48b13cb8001558b20bd801b6f96f5b5933144d82 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| |\
| | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| |/| | | | | | | | | | Change-Id: I871b54c0af70d568a489416db859e827d865c273
| | * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | Change-Id: I639e7fd3ee6df52b10195b2e183bb46c4380350d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Merge 5.12 into 5.12.4Frederik Gladhorn2019-05-273-2/+95
| | |\ | | | | | | | | | | | | Change-Id: I43d66c3533ee546f40c1a1373717721b48fcd23b
| | * | Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ibfc879d78837fb297244384deef0bff699a3b105
* | | | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+26
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+26
|/| | | | | | | | | | | | | | | | | | | Change-Id: I3ded63bf4c8f08f363327ab6297d0b7f59d4e39d
| * | | | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Antti Kokko2019-05-101-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I81f5367a391bc80f83ed4648a89cafc8ab379671 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | | | Add doc to undocumented functions qt3dNico Vertriest2019-05-275-13/+92
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic5183b31ee0df54e7a99a48f71ac04fc648f92e2 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-157-6/+368
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-157-6/+368
|/| | | | | | | |/ / / | |/| | | | | | | | Change-Id: I903f92a7b910eee165a2dd708a2d5fb25192ab14
| * | | | Fix removal of components when they are destroyedMike Krus2019-05-285-3/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic removal of components when they are destroyed is based on connecting to the destroyed() signal. This however means that by the time removeComponent() is called, the pointer is no longer a valid QComponent (just a QNode). While accessing member data of derived classes such as nodeId is fine, emitting signals from derived class does nothing, and in some cases asserts. Fix this by: - doing the QComponent clean up from it's destructor - implementing a separate method on QEntity to simply clear the now partly invalid pointer from the list. Change-Id: Id7632ee2ceaff6548c44c7a43ae40a0372febde9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | | | Fix Parameter priority sortingPaul Lemire2019-05-242-3/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parameters defined on an effect have priority over those defined in a Technique. Change-Id: I49558a065b613d7ea9d1cbf0a64f6d5aad941cd3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Liang Qi2019-05-2970-25104/+12
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 21:13:15 +0000