summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionv5.12.125.12Jani Heikkinen2021-10-041-1/+1
| | | | Change-Id: I2d8eab30e00b85afd7c982846729ba82eaa98976
* ClearBuffers: fix member initialization from uninitialized valuePaul Lemire2021-06-042-1/+3
| | | | | | | Change-Id: I7f1b2f3bca78f16abac49fa8686522aebf393d7c Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 312890f18b77cd898ca2ab1f93331e2f56d5cd80) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Bump versionv5.12.11Jani Heikkinen2020-11-061-1/+1
| | | | Change-Id: Ib1ae8fe75f6ad57368183f6c4348a35c59c2f840
* Bump versionJani Heikkinen2020-10-141-1/+1
| | | | Change-Id: I0fc6658cec5fbdb422523ce0b13e96415ba1cc75
* evaluateClipAtLocalTime: prevent negative indices for keyframes lookupPaul Lemire2020-09-181-1/+1
| | | | | | | Change-Id: I811c1a7334674d670f42eb46195e2e0e23b690f3 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 0731f8b336a6792e344dfefad8b7e9c79afac2d2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve third-party license information about assimpKai Koehne2020-08-276-14/+255
| | | | | | | | | | | | | | Assimp actually bundles a whole lot of other libs and tools. Document them properly. [ChangeLog][Third-Party Code] Also document sub-projects that are part of the Assimp project: Clipper, irrXML, Open3DGC, OpenDLL-Parser, Poly2Tri, RapidJSON, Unzip, Utf8Cpp, and Zip. Change-Id: I3ae696f081a6c7cee89e5901b2036da2f41a7417 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit d8b98b3e236bb2dcec0b8082d9a59c54efc63bca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Initialize pointerMike Krus2020-07-031-0/+1
| | | | | | Task-number: QTBUG-84905 Change-Id: I4eca9e609ea589e651de727fe5749c1deaaa34c9 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Animation Handler: assign iterator on erasePaul Lemire2020-06-301-3/+3
| | | | | | | Change-Id: Ia65be6befec3aa07080650ad82c59053b6d3670b Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 809ef32b3901213dcd0576a77eb507a06ba55ff3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Delete offscreen surface when doneMike Krus2020-06-291-0/+2
| | | | | | | | Task-number: QTBUG-84905 Change-Id: I2c9ddcf415e3f7565c1ba606adb3ab4c6eadfebb Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit a2f1ee50bb5f25a92d6f1ede0438a1d236f8ba67) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Merge remote-tracking branch 'origin/5.12.9' into 5.12Qt Forward Merge Bot2020-06-171-0/+20
|\ | | | | | | Change-Id: I537319e718cbd52f6168a73322327d259fdad740
| * Add changes file for Qt 5.12.9v5.12.9Antti Kokko2020-06-041-0/+20
|/ | | | | | | | | | | + 0a8af876d1edb8b4cc23ce07828d086e1e4dbe22 Implement Mouse Click and Double Click on MouseHandler + 32b6f5e337d076530fc6fec638f192102217c292 Fix scene3ditem to register optional aspects + 3c0b236a235d68de329609fc4643c3b3c4326849 Bump version + cfd8c4d06bc81028b055e6c3343d0d4b50793219 Release rendertargets on destruction + f78171f76d769f84e13dec53354484de75a18c06 Use surfaceSize as this will always be valid Change-Id: I3b7158d925a49fc573114b48f404e914a4a084ea Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Use surfaceSize as this will always be validAndy Shaw2020-06-021-1/+1
| | | | | | | | | | | | This fixes an issue when resizing a Scene3D that is inside a QQuickWidget to ensure that it has something rendered in each frame. Fixes: QTBUG-83095 Change-Id: Ic6c8b1b2efd0757f9f88768aafb331c4c1a1f9f2 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 2e3607aa120324f60832ca1cd42aaeaf22cc148d) Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Release rendertargets on destructionPaul Lemire2020-05-143-0/+10
| | | | | | | | We were only releasing them at runtime if they changed, but we should also clean them up before we are destroyed. Change-Id: Ibc3f37fba92e8be8381fd869af7f5747da87038a Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Bump versionAlexandru Croitor2020-04-221-1/+1
| | | | Change-Id: I289122d19b3ec1b35a3f1175d00ee7ece06134c6
* Fix scene3ditem to register optional aspectsPaul Lemire2020-04-151-4/+0
| | | | | | | | | | | applyAspect shouldn't not be checking against the m_aspects list following the recent refactorings introduced in cdc9efb609894298d8d854a0ec75f9cb8e89f195. This checks prevents any optional aspect from being used because m_aspects will never be empty. Change-Id: I6548d86599b3ac4c8aaad034a3e4ffc830a855c5 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Merge remote-tracking branch 'origin/5.12.8' into 5.12Qt Forward Merge Bot2020-04-141-0/+20
|\ | | | | | | Change-Id: I8c9e7089f0501d34f55a303902e951b15505e783
| * Add changes file for Qt 5.12.8v5.12.8Antti Kokko2020-03-241-0/+20
| | | | | | | | | | | | | | | | | | | | + 292dbe36a8ffa811eb950b2cec4f954e23652eaa Shader: make uniform block accessors const + 62dfe1be5c2eefbe195f6808516cae6955bcfb46 Bump version + c465d4f28d1dd132901869131b3c231280c737d0 Destroy FBOs when RenderTarget node is destroyed + 292481b0c0f87e43579acd6d26c6bc9e1a399a93 Fix and improve FBO handling Change-Id: I8c12df226234feb1c8647e25d18e3642377236a0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Implement Mouse Click and Double Click on MouseHandlerMike Krus2020-03-242-3/+5
|/ | | | | | | | Looks like it actually never worked. Task-number: QTBUG-75219 Change-Id: I54e7c58be57c41461c95c48ec3e76aa45bf340a1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Allow for when a Scene3D item switches screensAndy Shaw2020-03-1916-211/+683
| | | | | | | | | | | | | | | | | | | | When a Scene3D item switches screens then it will need to be reinitalized so that the supporting contexts, offscreen surfaces are set to use the same screen and not the original one. This ensures that the item is still rendered correctly on the new screen. This includes a manual test using QQuickWidget in separate windows that enables it going from one screen to the other. This is a fresh version after the previous version was found to have a bug shown in the scene3d-loader test which has now been resolved. Change-Id: I3c711e894018db52ec00a8a5d2e0fb0128743ab1 Done-with: Antti Kokko <antti.kokko@qt.io> Fixes: QTBUG-79192 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 4eef300be70509a208527bf164f7746fa1bf07a1)
* Animations: handle colors as vec3 or vec4Paul Lemire2020-03-192-12/+94
| | | | | Change-Id: If450816fadce4adad4881938ecaea9c4000afe16 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix and improve FBO handlingPaul Lemire2020-02-175-31/+99
| | | | | | | | | | | | | | FBO need to be rebuild when one of the attachments directly or indirectly changes. By direct change we mean one of the FBO attachment texture being resized or the list of attachments changing. By indirect we mean when texture resource is recreated internally by the engine. Failure to handle this cases resulted in FBO referencing invalid attachments. Change-Id: I8dd4c08e464eed7fb0eeefd61a4158304ab4245f Task-number: QTBUG-64757 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Destroy FBOs when RenderTarget node is destroyedPaul Lemire2020-02-178-1/+131
| | | | | | | | It appears we never destroyed FBOs which lead to bugs when destroying and recreating a RenderTarget Change-Id: I99b3df95b821670aa3bbd63209ff9bcc21afbf79 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Merge remote-tracking branch 'origin/5.12.7' into 5.12Qt Forward Merge Bot2020-01-311-0/+20
|\ | | | | | | Change-Id: I1c2420e4a658e510640e9f64c697fb0a0dbda802
| * Add changes file for Qt 5.12.7v5.12.7Antti Kokko2020-01-211-0/+20
| | | | | | | | | | | | | | | | | | + 7a5367935db9a5a54ab59a3a10a7a028caafba44 Bump version + eb375c963d79add7b827ea9f9f40aea44fecd094 Fix picking with primitive restart + 5746b72615f0c1ab59bf9391195cb795fd76d927 Fix picking with primitive restart for line loops Change-Id: Iab194e9d3a6495c78769d122a4f6e5be8f54e384 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Bump versionAlexandru Croitor2020-01-281-1/+1
| |
* | Shader: make uniform block accessors constPaul Lemire2020-01-272-33/+30
|/ | | | | | | To prevent any container detaching Change-Id: Ie7de744fd492efaab49aa133a7904b293dc7d178 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Merge remote-tracking branch 'origin/5.12.6' into 5.12Qt Forward Merge Bot2020-01-071-0/+20
|\ | | | | | | Change-Id: I5b2ba0203ad4928d864a1e8843ce6a43df65c56d
| * Merge 5.12 into 5.12.6v5.12.6Kari Oikarinen2019-11-072-9/+17
| |\ | | | | | | | | | Change-Id: I0c9bbaeaeeba1a18447c48faf189ac19ab034c1b
| * | Add changes file for Qt 5.12.6Antti Kokko2019-10-311-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 99cc24f53ed2946494d3e8d594a6722c571a282f Add missing * for SkyboxEntity QML type documentation + dbd7c517e4d49fb05457a7fe290f7c4e48cdb9cf Allow multiple instances of a few render states + 855295c3748239ae65e874b579f5449e4ea6723f Add QML documentation for ClipBlendValue + 2a72abee721c24638e6a7164379117d887b74aab Fix LerpClipBlend QML documentation + 151694c095e05e1c735f96f60c799cc717e93dc1 Update MetalRoughMaterial documention + a802fd74e010a6d8ebfc2243232e0373d67f3df6 Minor fixes for QSprite* classes + 968be8e9ee0851d401d302621eccc1de415ec243 Add a property map job in animation aspect + 923292120777c351ebecf33bcf0ac2a1535b0fe7 Fix blitting to also blit depth and stencil buffers + e76193605ab725bbb004f3ff8b1c2af973803d31 Make sure right screen is set on QOpenGLContext and QOffscreenSurface + 4e6b2cd0b6ee275ef38392e7e0b0ab2de6718bb4 Renderer: check context thread before destroying resources + 30f5da09a033bb1993b3ba06e59c3afa4710a087 Ensure we can build assimp on Windows and macOS with non gcc compilers + 612143ed95a436964caf2c18d324336cf9ed2c90 Bump version Change-Id: I3e2e4f85d765c4f92d7774ab77cc6948a298b00f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Fix picking with primitive restart for line loopsMike Krus2019-12-132-32/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previous fix was not closing the loop on every primitive, just the last one. Task-number: QTBUG-71919 Change-Id: I22d52258477b0c4777118ee36a0b3868da982885 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Fix picking with primitive restartMike Krus2019-12-135-8/+42
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-71919 Change-Id: If7923fab6c43f5d7139d1bbdceb73c17bf489099 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 69789d0184ffa54c1760ad5204bb4539c9399753)
* | | Bump versionFrederik Gladhorn2019-11-071-1/+1
| |/ |/|
* | QNode: stop using hash<node,connection> for bookkeepingPaul Lemire2019-11-042-9/+17
|/ | | | | | | | | | | | | | | It is totally valid to have actually the same node used for 2 distinct connections (e.g setting 2 different node properties to the same node). With the hash, the second setter call would overwrite the first connection resulting in leaving a dangling connection around potentially resulting in crashes. Instead use a QVector<pair<node, connection>> and adjust code accordingly. Change-Id: I49870c409c3f7b629c8f1bdfcb8757a904db2490 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 906f8a62f89a7ce2343a155e6db62616e66dc14b) Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Bump versionFrederik Gladhorn2019-10-301-1/+1
|
* Ensure we can build assimp on Windows and macOS with non gcc compilersAndy Shaw2019-10-231-1/+1
| | | | | | | Fixes: QTBUG-75145 Change-Id: Ibee7d877bf78c2d2ed74ac8a89b7af5bf22f14f1 Reviewed-by: Antti Määttä <antti.maatta@qt.io> (cherry picked from commit b18845b0451cf0ff9c7611483b589ce51b3c9e1b)
* Renderer: check context thread before destroying resourcesPaul Lemire2019-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Only try to cleanup the resources if we know we are called from the right thread. releaseGraphicsResources can be called from 2 places: - Scene3DCleaner when using Scene3D (when closing the window) - AspectThread when the RenderAspect gets unregistered In configurations where the context lives in the main thread (Scene3D + single threaded render loop / ANGLE), the RenderAspect gets unregistered before the Scene3DCleaner has had time to call releaseGraphicsResources. This means that we won't release the resources ourselved and that the driver will have to do that for us. This has been fixed properly in 5.14 with the AspectThread removal. Task-number: QTBUG-60971 Change-Id: I49c1c2f74ad09e7162b988f87bac65863f8490d8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit f60a57ebe0e9a4449fb0f8f28a38c0f69b3f845e) Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Make sure right screen is set on QOpenGLContext and QOffscreenSurfaceAndy Shaw2019-10-149-0/+34
| | | | | | | | | | | When the Qt3D window is on a specific screen, then it needs to ensure that any supporting QOpenGLContexts and QOffscreenSurfaces are set to be using that same screen or it will fail to render the content. Change-Id: Ief4f3e88bf6f71862bc5dace0cb0bddcdf3a98b5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 93aa379ae5cf624f024aa9173ce42e90b5c58002)
* Fix blitting to also blit depth and stencil buffersPaul Lemire2019-10-101-1/+2
| | | | | Change-Id: Ib7b491c638508cfcdfbd523fd4e6a3d757c2c832 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add a property map job in animation aspectJuan Jose Casafranca2019-09-2318-126/+800
| | | | | | | | | | | | | | | | | ClipAnimator is always dirty because at each frame the normalizedTime is changed. This has a big performance penalisation as we are launching job which updates the property map at each frame. This patch adds a new dirty flag which is use to decide if the animator need to update the mapping of the fcurve to actual node properties. Using that flag, a new UpdatePropertyMapJob is launched for dirty clipAnimators. Some scenes boost from 30fps to 60fps (vsync) during animation. Change-Id: Ic8a8db01535c55995bc569ea5a69660a40014401 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
|\
| * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
|/| | | | | | | Change-Id: I5b9092d7ce9070b61f36fc327d7ba20b193cc1af
| * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-09-041-0/+20
| | | | | | | | | | | | Change-Id: Ia7f358a01d71f4ddeec76aa30788785318576270 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Minor fixes for QSprite* classesMichael Brasser2019-08-303-6/+6
| | | | | | | | | | | | | | | | * Fix off-by-one errors * Allow non-integer cell sizes Change-Id: I081cb5050a6805cbc9183fb2a7a1ee07b5594187 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Update MetalRoughMaterial documentionMichael Brasser2019-08-291-3/+3
| | | | | | | | | | | | | | | | These properties are not strongly typed. Change-Id: I02c8b793cc7b7f9e88a8b8598ea27efa93fa0468 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix LerpClipBlend QML documentationMats Honkamaa2019-08-271-3/+3
| | | | | | | | | | | | Task-number: QTBUG-74682 Change-Id: I346d31333f4bbce9a909798c176ad09fc2267859 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Add QML documentation for ClipBlendValueMats Honkamaa2019-08-261-0/+11
| | | | | | | | | | | | Task-number: QTBUG-74683 Change-Id: I821e52ab071b422c1e1351d59b83e9879fa2a884 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | Allow multiple instances of a few render statesHarald Vistnes2019-08-265-14/+29
| | | | | | | | | | | | | | | | | | | | Allow more than one instance of BlendEquationArgumentsMask and ClipPlaneMask render states. Task-number: QTBUG-77735 Change-Id: I9d2bdc82843e2eaf0f8a781208e4ca10e3a777c7 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Add missing * for SkyboxEntity QML type documentationMats Honkamaa2019-08-261-1/+1
|/ | | | | | Task-number: QTBUG-77789 Change-Id: I3dcee435562c86ea9db98ee7c50a42d06bd576f9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Expand QCamera::exposure documentationMichael Brasser2019-08-201-0/+20
| | | | | Change-Id: Ia844b046720b530fbb9b7bac096d1853710225c3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Expand EnvironmentLight documentationMichael Brasser2019-08-201-3/+31
| | | | | Change-Id: Ia6e6ca65469c7c04914fbb6a73f796ec86436577 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 04:26:57 +0000