summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.1.2' in qt/qt3dv6.1.2Qt Submodule Update Bot2021-06-181-3/+3
| | | | | Change-Id: Id855544c505fb1f49387d21a8a4a286edb92c34d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-06-161-3/+3
| | | | | Change-Id: I1b91885782f084d82326ad5c5328189d7127e22a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-06-161-3/+3
| | | | | Change-Id: Ib39eeedb715624a8d5eb93866008b915f9e1a395 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-06-161-3/+3
| | | | | Change-Id: I2834fb00c5dd590f47b266d80c70ca06096e3968 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-06-151-3/+3
| | | | | Change-Id: I9feaccca4a17b6c64947e143048e12494bd05801 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-06-151-3/+3
| | | | | Change-Id: Ie8b538badb05a1e543a0ce070437b668401f4708 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update phong and metalrough shader graphsPaul Lemire2021-06-156-664/+611
| | | | | | | | | | | | - RHI requires updates to existing prototypes, explicit locations for inputs and outputs and treats samplers, uniforms and other inputs differently Change-Id: I7f8c6bf0d2a4732b8badcb7fb426f3349da3d6c3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 9c9284ce7f0d4ea3dda6d6bc6b602f5d4d6016d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-06-151-1/+1
| | | | | Change-Id: I594a4cc77faefda9fa0f037f1b2cddd4a610ccf0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix multi-view pickingMike Krus2021-06-147-4/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When using Scene3DView, qt3d still has a single scene graph and and a single framegraph. It automatically creates layers and layer filters to make sure the right objects are only rendered in the right view. This affects picking though as it was not aware of layer filters. This patch collects the filtered layers for each view and makes sure only entities matching those layers are tested for picking (this uses code that existed for ray casting). This changes the behavior of Qt3D though as non rendered objects (ie, excluded by layer filtering) are no longer pickable. Only way now would be to provide a shader that just discarded everything. Note: Scene3DView is not available in Qt6 so on this branch this only really affects custom scenes with multiple views each showing different content. [ChangeLog] Non rendered entities (due to layer filtering) are no longer pickable Ticket-number: QTBUG-94214 Change-Id: I8515368e43342b33ac219dff533e92efa72fbe7d Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit d79376732105dea749e71cdb114251084c7138a9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-06-141-3/+3
| | | | | Change-Id: I13f14739d8a70f84daadb042ecf2bb11d7b629e8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-06-121-3/+3
| | | | | Change-Id: Iea8564b2fa87844f0bf50f96ea822667e52d3ad5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-06-101-3/+3
| | | | | Change-Id: I10b750926f43875ecb89d268075df27be718607c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump versionJani Heikkinen2021-06-083-3/+3
| | | | Change-Id: I139059ba9b01ba7dd3ae7facc0b75d290f2bf5a5
* QChannel/QChannelComponent: Export comparison operatorsFriedemann Kleint2021-06-072-8/+8
| | | | | | | Change-Id: I44d1400da38949285f1c12c17bba3561b36f6dc9 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit ca4a251a207795b879a15f0df30f21e717183172) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't export QKeyFrame which is fully implemented in the headerPaul Lemire2021-06-021-1/+1
| | | | | | | | | This otherwise leads to inconsistent dll linkage warnigns on windows. Change-Id: I4f32f2fd2cc45939187535b8232172b280df7316 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 9d17891737befa4645ffd1e1a1153c314366e059) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-06-011-3/+3
| | | | | Change-Id: I8340092a14bdefba0714d29ca88fcd40bb4f94e1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-06-011-3/+3
| | | | | Change-Id: I835966086c1c3002a05dd54fc605aa2e9cd9ebc8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-311-3/+3
| | | | | Change-Id: I65f7ef745145ea862a120529e91deb129bd00ae6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-311-3/+3
| | | | | Change-Id: I15c156c32fbe3110063cf19651ee1dc778f9e5f7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-311-3/+3
| | | | | Change-Id: I4514ea2d863a9938590da2ce0814c86618c1f590 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-281-3/+3
| | | | | Change-Id: I6beb4aae9620d1edb25a414493e7aa1c484dd5a3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-281-3/+3
| | | | | Change-Id: I1632061d8e42c91dbac7e7da88b15260d5592ce0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-271-3/+3
| | | | | Change-Id: I552cf814bd99f071a51152c8f7ceed573e477b49 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-271-1/+1
| | | | | Change-Id: Ic9fe238533e0fe52c8fe81eb4d82e309e81b8882 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-241-3/+3
| | | | | Change-Id: Id7f4991a9a1cdf30068c477efaa3e0c293a160c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-211-3/+3
| | | | | Change-Id: I5b0f92347ef8a3f31d19052e7d9e26204895b21b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-201-3/+3
| | | | | Change-Id: Ieec1292384c01e83162c60c024e75164d32eaf40 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-191-3/+3
| | | | | Change-Id: I66618935dd5f8202c6ea67a69985a225457c217a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-181-3/+3
| | | | | Change-Id: I4cd3e8f6d38e5f69d5f9bb31ffb8c323a0103dba Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Re-generate CMake project files for examplesJoerg Bornemann2021-05-1831-0/+126
| | | | | | | Change-Id: Ic123a704f904096e112b5bdece167800dfc295bb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit b7b7285d0198c6d7e0e2f1a10a90a386e04f9e90) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-181-3/+3
| | | | | Change-Id: Iebdc36acaddfaf4053289dab94074f08c01037dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-181-3/+3
| | | | | Change-Id: I8133b6fe4d82fc8f83791c014ef9a7f9e2936876 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-131-3/+3
| | | | | Change-Id: If1e7029d87221b621a60f775dd22e5e17dda0d8b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-131-3/+3
| | | | | Change-Id: I195fbce36414bd0fb5eae9c4f9ff265586a18c20 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-121-3/+3
| | | | | Change-Id: Ia54655f34be1521abc1174d80f312b788321a32b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-121-3/+3
| | | | | Change-Id: If3c3d79dbc7e557ee07a7e0fbc57e0b7b617813c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-121-3/+3
| | | | | Change-Id: I294a65d875d71e7f1bbd69ffba9f31547f84fa8a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-111-3/+3
| | | | | Change-Id: I79addbb7a8f441709f84dafb559f1e059ca0d026 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-111-3/+3
| | | | | Change-Id: I0876410677902090fd877afb4fdd652612709fef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-111-1/+1
| | | | | Change-Id: Id06f85b68dbb2fa45a0b62ba8b226bbb37771870 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-111-3/+3
| | | | | Change-Id: I286f89b0ab93c4e73b567bb429d594105fcdd915 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump versionJani Heikkinen2021-05-073-3/+3
| | | | Change-Id: I0d67e471bd68a0c356c968282535a0b3758dc95e
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-071-3/+3
| | | | | Change-Id: If50f768f8e9a9328a8b5d403143a76c30155b97f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-061-3/+3
| | | | | Change-Id: Idfd65db4f975bbce154b632b670d11daa4c91f89 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-061-3/+3
| | | | | Change-Id: I131948065ed55e4536b6228f2238b454292b9f31 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-061-3/+3
| | | | | Change-Id: Ic99477f844d64f1034c0c03ad7a31b7288690e94 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-061-1/+1
| | | | | Change-Id: I554e290a5c5f8a5c005388e5d794754132b9e691 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-051-3/+3
| | | | | Change-Id: I2ac748690e989738deed7c42194ecab121d3c9cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qt3dQt Submodule Update Bot2021-05-051-3/+3
| | | | | Change-Id: I7b87aa73e04f3d3dad8966dfa9611bf9f27c342e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QShaderNode: use rule with highest version numberMauro Persano2021-05-041-5/+8
| | | | | | | | | | | | Pick the supported rule with highest version number. For instance, if we're looking for a rule for OpenGL ES 3.2, and there's a rule for ES 2.0 and another one for ES 3.0, make sure the rule for ES 3 is selected. Change-Id: Ie517206948bc0422f6254472de43cda4dd2ce982 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit e5276cd4cdc6b7b2e37c14e6983eaf4ce31b5a1c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 19:47:38 +0000