aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.6' in qt/qtquick3dphysics6.6Qt Submodule Update Bot2024-03-031-4/+4
| | | | | Change-Id: Ia7dc4642cfc49632cc3b56ee1617ee63a38c9c26 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2024-02-281-4/+4
| | | | | Change-Id: Ic71f07ffa497b9655fb6218f70ea35db69bff16f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2024-02-261-4/+4
| | | | | Change-Id: Id95c7b35d607ca2da69d677d3d10f57ce4a75052 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2024-02-201-4/+4
| | | | | Change-Id: I059a8e27dc9aff519cd3a8b86a1f63d21b1d7a70 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2024-02-161-4/+4
| | | | | Change-Id: Iad823000ba9b8b83c32b7a36ce296d1d8836b590 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2024-02-151-4/+4
| | | | | Change-Id: I03655690d0f8378fbc54401ef07d1a03eebd58af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2024-02-131-4/+4
| | | | | Change-Id: I013a3cd6594bdf41ed505e343b6fbe99ab944701 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2024-02-091-4/+4
| | | | | Change-Id: I6437a810d3247fd3a920c43c0764d5ad7b30d097 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2024-02-061-4/+4
| | | | | Change-Id: I5b9656fb4f816482d6a5474fda76af1d53523e06 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2024-01-291-4/+4
| | | | | Change-Id: If789b2cbbe3abcb418917db7ca50d53cafb1b3f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.6.3Jani Heikkinen2024-01-291-1/+1
| | | | | Change-Id: I1e83096740b64b7681101caca7b8bc9dd09a2d1c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* fix unity buildsTim Blechmann2024-01-284-22/+13
| | | | | | | | | | | | `fuzzyEquals` and `kMinus90YawRotation` are defined in multiple source files and can clash when using unity builds Change-Id: I7148d29c3792688b075e3d5b42c386ffe7b79ada Pick-to: 6.5 Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> (cherry picked from commit e306c2ff211e666463e960d8201743239fa934de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 94ed645aad9ec84d5b3bd74ffea23dd4df7c9423)
* Material example: don't let floor cast shadowsJonas Karlsson2024-01-251-0/+2
| | | | | | | | | | | | It is impossible for the floor to shadow anything anyway and it gives some shadow acne on windows. Pick-to: 6.5 Change-Id: I789cb402fc43aa5f387ef57b1d4b7648fd6874f1 Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit 894f7ad434308f90cd759ba540faeee9b1b47e9b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 05b898b345bf5d47c4618d0406f91bb14d3076bf)
* Fix onBodyContact being called on removed nodesJonas Karlsson2024-01-248-5/+226
| | | | | | | | | | | | | | | | | | | | | | | Since collision callbacks happen in the physx simulation thread we need to store these callbacks. Otherwise, if an object is deleted in the same frame a 'onBodyContact' signal is enqueued and a crash will happen. Therefore we save these contact callbacks and run them at the end of the physics frame when we know if the objects are deleted or not. We move the mutex in QPhysicsWorld::deregisterNode to cover also the decoupling of the physics node since this node can be read asynchronously in the 'onContact' physx callback. In the 'onContact' callback we check if the node is removed _before_ dereferencing it and checking 'm_backendObject'. Fixes: QTBUG-121033 Pick-to: 6.5 Change-Id: I2412502baa6ede1897a4d1377e8c52a8339471d2 Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit 87d7c334002997ea54a10670009b0a8a49b0a436) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit c14104f4761675e37e030b7d617f664da327980f)
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2024-01-221-4/+4
| | | | | Change-Id: I1c7270272e149b8866092a4f1d6fcf2a96c63e08 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2024-01-181-4/+4
| | | | | Change-Id: I6bf9ee4d3698beac0a63a7e9b01f3e4be8460d47 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2024-01-171-4/+4
| | | | | Change-Id: I7e78ed05abe0102b363181a2ecdec107000c276b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix compilation of PxPreprocessor.h with MinGWMΓ₯rten Nordheim2024-01-163-3/+3
| | | | | | | | | | Pick-to: 6.5 Change-Id: I3e43a0820ad57ec4eb9bcd4caf574814adab2276 Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit f8da6e14710c147df8fd40addb0939921d5f75b5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 8351627b72aa71d8faaf46a58cdeaaa482f02bd8)
* Various lancelot test fixesJonas Karlsson2024-01-103-2/+7
| | | | | | | | | | | | | | | - Decrease all timers to 1 ms to make sure they are fired before screenshot is taken. - Scale models to avoid z-fighting with debug geometry. - QQuickView does not support using a window as a root item. Pick-to: 6.5 Change-Id: I97c976b20676c8e7d42901f0c05603bcbf7bb579 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 4db619089d89b96e36f4eb3b0d76aebfdf13fe2b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit c6573e07cf9bd4fd1babfa136fba3e52c2a9a3a8) Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2024-01-081-4/+4
| | | | | Change-Id: I63ba9e364e0f00e9b5947f19a3c30389262eb59f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix invalid isStaticShape value for triangle meshJonas Karlsson2023-12-305-1/+12
| | | | | | | | | | | | | | It should return true. Caused accidentally by f43d8bf1aed47da1ae13d73d59e439ce6ef53348 Pick-to: 6.5 Change-Id: If5a6afba470026ef522dbcaaf5c578d62edbdbdf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 7708e407de68edb8c9a1b73544b5da8fcbc91589) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 3f4959a9b496e1508b0b39d2548b5369cd591fe3) Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-12-251-4/+4
| | | | | Change-Id: I226d21e0384e1709822eb183e7148075cae0f9f3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-12-191-4/+4
| | | | | Change-Id: Ie1b6eabc727f3fbc18b2b4d585bf0badc0cd7828 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix crash in Cannon example on MSVCJonas Karlsson2023-12-141-2/+2
| | | | | | | | | | | | | A QML list should be cleared by setting it to '[]', not '{}'. Fixes: QTBUG-120045 Pick-to: 6.5 Change-Id: Icd2650cd25082413f5d359346b32c47879bc7e83 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Inho Lee <inho.lee@qt.io> (cherry picked from commit 4082f88ab174705dcfb492d3d6da32e86a8d16b1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 9f45c48c1bfc44040f301b6192173d26ee8be705)
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-12-081-4/+4
| | | | | Change-Id: I17940935b7606acd96a76779a30f897bab14eb2d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Move almost identical code into QMeshShapeJonas Karlsson2023-12-067-423/+394
| | | | | | | | | | | | | | QTriangleMeshShape and QConvexMeshShape are basically identical so move the common code into a new class QMeshShape. Using an enum ShapeType to differentiate the mesh types. Pick-to: 6.5 Task-number: QTBUG-109818 Change-Id: Ia2e72eb84d14bcf1a38fa0d2df046805d175a5ad Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit f43d8bf1aed47da1ae13d73d59e439ce6ef53348) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Rebuild debug drawing on geometry updateJonas Karlsson2023-12-042-23/+159
| | | | | | | | | | | | | | It is possible the PhysX geometries are re-cooked when changing the source or geometry of QConvexMeshShape, QTriangleMeshShape or QHeightFieldShape. Now we store a pointer to the cooked geometry and rebuild the debug model if it is different. Pick-to: 6.5 Change-Id: Iac94440b6539cf4c45a81c779c510ece09dde8bc Reviewed-by: Andy Nichols <andy.nichols@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit fecc364ba770aac80037bb40b01a28b0277c9a7d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-12-011-4/+4
| | | | | Change-Id: I191654c5b43df53dd07ec4f863027865881659ce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-11-271-4/+4
| | | | | Change-Id: Ib1ac315f42d0600fd9a503f2670486fd9536d4e8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-11-211-4/+4
| | | | | Change-Id: I099054dab664b58a2886f1de102d376f2ee4b2e2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.6.2Jani Heikkinen2023-11-171-1/+1
| | | | | Change-Id: I0662574a6a7b4591a1f6d4058babce6f7a99bcc0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-11-171-4/+4
| | | | | Change-Id: I96fba3df5a0082e3bf58381ee4eb69531f3e8c44 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* PhysX: Check for SSE to define __intXX_tKhem Raj2023-11-142-1/+28
| | | | | | | | | | | This helps to compile on x86 platforms as these defines are not available there Pick-to: 6.5 Change-Id: I3215166f3817a47f45985450c58703b8eef3c6e8 Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> (cherry picked from commit 9cfce4e33e2b745c15b465d5da932353036e7bcf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-11-101-4/+4
| | | | | Change-Id: I6d73dfc024f2365e2777bd0e071300fd6ae1ff6a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-11-081-4/+4
| | | | | Change-Id: I88e2e51f2245bac7b3d010bf35c730c3ec7fcdf6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-11-031-4/+4
| | | | | Change-Id: I9795544865c4c86c0c399432d90701d14682b4b1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-11-021-4/+4
| | | | | Change-Id: Ib9e3e19f64587e55631e779552205babfd23ca68 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-10-301-4/+4
| | | | | Change-Id: I653c9351af698395238711de3052390f3788d3ce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Highlight example for Data Viz &3D categoryKai KΓΆhne2023-10-261-0/+3
| | | | | | | | | Pick-to: 6.5 Task-number: QTBUG-117219 Change-Id: I2e2c86a58fa9262a0068ca65f915e9c06da9b36c Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> (cherry picked from commit bb4e9c901c7766864773205ad7cab3501eb30a2b) Reviewed-by: Topi ReiniΓΆ <topi.reinio@qt.io>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-10-241-4/+4
| | | | | Change-Id: I5bfdb4617a6232d1fd8b8c895afe955aa82f3478 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-10-201-4/+4
| | | | | Change-Id: I183be54930f176a9cf15c766d5c0aeb16059ff6d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-10-181-4/+4
| | | | | Change-Id: If59e965bb3179dd0093689fd9da4c3ac7af64c4c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-10-121-4/+4
| | | | | Change-Id: Id5f3643cd961c0052225e984a7e3303284644174 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-10-091-4/+4
| | | | | Change-Id: I2e38302c8869ab988a080a10c0c3e1a58c0af234 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-10-061-4/+4
| | | | | Change-Id: I60bf956a9990a04f5f7cf98f7a7f45fc4f7dc844 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-10-031-4/+4
| | | | | Change-Id: I742e86dd53bff4a1c01cf0299463c265c2897b49 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-10-021-4/+4
| | | | | Change-Id: I59544cafb2b87a89149f2b04aee14a6e7b3d28d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-09-281-4/+4
| | | | | Change-Id: Ic95b7300b7d61e527519308597c7334bdc047db9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-09-261-4/+4
| | | | | Change-Id: I4304bde205e29633675aed499373d58311674cc1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtquick3dphysicsQt Submodule Update Bot2023-09-251-4/+4
| | | | | Change-Id: I1a039f60c2f3e7c236a7060e1bb9ac548dff4343 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>