Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-quick3dphysics for openSUSE:Factory checked in at 2023-03-17 17:03:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-quick3dphysics (Old) and /work/SRC/openSUSE:Factory/.qt6-quick3dphysics.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-quick3dphysics" Fri Mar 17 17:03:21 2023 rev:4 rq:1072411 version:6.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-quick3dphysics/qt6-quick3dphysics.changes 2023-01-11 14:35:05.437243171 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-quick3dphysics.new.31432/qt6-quick3dphysics.changes 2023-03-17 17:03:58.761591413 +0100 @@ -1,0 +2,6 @@ +Thu Mar 16 10:00:05 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 6.4.3: + * https://www.qt.io/blog/qt-6.4.3-released + +------------------------------------------------------------------- Old: ---- qtquick3dphysics-everywhere-src-6.4.2.tar.xz New: ---- qtquick3dphysics-everywhere-src-6.4.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-quick3dphysics.spec ++++++ --- /var/tmp/diff_new_pack.38oHaz/_old 2023-03-17 17:03:59.189593656 +0100 +++ /var/tmp/diff_new_pack.38oHaz/_new 2023-03-17 17:03:59.193593677 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.4.2 +%define real_version 6.4.3 %define short_version 6.4 %define tar_name qtquick3dphysics-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-quick3dphysics%{?pkg_suffix} -Version: 6.4.2 +Version: 6.4.3 Release: 0 Summary: Qt 6 Quick3D Physics Extensions License: GPL-3.0-only @@ -148,10 +148,8 @@ # CMake files are not needed for plugins rm -r %{buildroot}%{_qt6_cmakedir}/Qt6Qml/QmlPlugins -%post -n libQt6Quick3DPhysicsHelpers6 -p /sbin/ldconfig -%post -n libQt6Quick3DPhysics6 -p /sbin/ldconfig -%postun -n libQt6Quick3DPhysicsHelpers6 -p /sbin/ldconfig -%postun -n libQt6Quick3DPhysics6 -p /sbin/ldconfig +%ldconfig_scriptlets -n libQt6Quick3DPhysicsHelpers6 +%ldconfig_scriptlets -n libQt6Quick3DPhysics6 %files %{_bindir}/cooker6 ++++++ qtquick3dphysics-everywhere-src-6.4.2.tar.xz -> qtquick3dphysics-everywhere-src-6.4.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/.QT-ENTERPRISE-LICENSE-AGREEMENT new/qtquick3dphysics-everywhere-src-6.4.3/.QT-ENTERPRISE-LICENSE-AGREEMENT --- old/qtquick3dphysics-everywhere-src-6.4.2/.QT-ENTERPRISE-LICENSE-AGREEMENT 2022-12-13 08:05:13.656465800 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/.QT-ENTERPRISE-LICENSE-AGREEMENT 2023-03-12 11:00:44.750255800 +0100 @@ -1061,6 +1061,7 @@ - Appendix 8: Intentionally left blank (optional) - Appendix 9: Support Terms - Appendix 10: Conversion from legacy Licenses to Subscription (optional) +- Appendix 11: TERMS OF USE - QT INSIGHT TRACKER LIBRARY APPENDIX 1: LICENSED SOFTWARE @@ -1975,3 +1976,46 @@ will continue to make such payments in accordance with the applicable order documentation, notwithstanding the fact that the Current Licenses are being converted to Development Licenses pursuant to this Appendix. + +APPENDIX 11: TERMS OF USE - QT INSIGHT TRACKER LIBRARY +Version 1.0 + +Qt Insight Tracker Library ("Tracker Library") is a software module used to +collect end user data from Customer's Application and Devices relating to The +Qt Company's Qt Insight online service the Customer is ordering from The Qt +Company under a separate service agreement ("Service Agreement"). + +Unless otherwise set forth herein, definitions written in capital letters used +herein shall have the meaning set forth in the Service Agreement. + +Subject to these terms The Qt Company grants to Customer a worldwide, +non-exclusive, non-transferable, royalty-free, revocable (for cause) right and +license, valid for the term of the Service Agreement, to + (i) use, copy and modify Tracker Library for the purpose of including it + into the Devices and Applications and solely for the purpose of being + used only in conjunction with Insight Cloud or Insight Private Cloud, + and + (ii) distribute, by itself or through its Contractors, Tracker Library as + installed, incorporated, or integrated into Applications and/or + Devices. + +Use of Tracker Library in a way or for the purpose other than the above is +strictly prohibited. Tracker Library is licensed to the Customer in all +respects "as is". + +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF +ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER +WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND +NON-INFRINGEMENT WITH REGARD TO THE TRACKER LIBRARY. THE QT COMPANY DOES NOT +WARRANT THAT THE TRACKER LIBRARY WILL SATISFY CUSTOMER'S REQUIREMENTS OR THAT +IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE +UNINTERRUPTED. +IN NO EVENT SHALL THE QT COMPANY BE LIABLE TO THE CUSTOMER FOR ANY LOSS OF +PROFIT, LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, +SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY +KIND, HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THE USE OF THE TRACKER +LIBRARY. + +THE TOTAL MAXIMUM LIABILITY OF THE QT COMPANY UNDER THESE TERMS SHALL IN NO +EVENT EXCEED 10,000 EUROS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/.cmake.conf new/qtquick3dphysics-everywhere-src-6.4.3/.cmake.conf --- old/qtquick3dphysics-everywhere-src-6.4.2/.cmake.conf 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/.cmake.conf 2023-03-12 04:46:02.000000000 +0100 @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.4.2") +set(QT_REPO_MODULE_VERSION "6.4.3") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/.tag new/qtquick3dphysics-everywhere-src-6.4.3/.tag --- old/qtquick3dphysics-everywhere-src-6.4.2/.tag 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/.tag 2023-03-12 04:46:02.000000000 +0100 @@ -1 +1 @@ -d889de63aa1b6f95613558ac2989362a259047de +2f071386de9793e41b883321190e8f1809577849 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/dependencies.yaml new/qtquick3dphysics-everywhere-src-6.4.3/dependencies.yaml --- old/qtquick3dphysics-everywhere-src-6.4.2/dependencies.yaml 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/dependencies.yaml 2023-03-12 04:46:02.000000000 +0100 @@ -1,13 +1,13 @@ dependencies: ../qtbase: - ref: e3e40c44d3f998a433a6a1080297c5f28e9a768f + ref: 519d2d8f442409e86a0ee2fa16bd543342180861 required: true ../qtdeclarative: - ref: 1b58f30087eedf42f16572d8ae1d6a5b18f3d698 + ref: 7161b3a04d08aea891bd7c7e459437260d29c3f3 required: true ../qtquick3d: - ref: e32bf04d53d2d8748f4d462efb97a9b49fbad934 + ref: cb7c2d87819d8afec18bd8e247d413b97b95c997 required: true ../qtshadertools: - ref: 84b29dbc1d8ec567917c46eaedfc1cabb94fca9d + ref: f950fddfb1fc95339972f1c8cf4335f7190280e0 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qabstractcollisionnode_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qabstractcollisionnode_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qabstractcollisionnode_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qabstractcollisionnode_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qabstractcollisionnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qabstractcollisionshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qabstractcollisionshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qabstractcollisionshape_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qabstractcollisionshape_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qabstractcollisionshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qabstractphysicsbody_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qabstractphysicsbody_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qabstractphysicsbody_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qabstractphysicsbody_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qabstractphysicsbody_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qboxshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qboxshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qboxshape_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qboxshape_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qboxshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcacheutils_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcacheutils_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcacheutils_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcacheutils_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qcacheutils_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcapsuleshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcapsuleshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcapsuleshape_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcapsuleshape_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qcapsuleshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcharactercontroller_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcharactercontroller_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcharactercontroller_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcharactercontroller_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qcharactercontroller_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcollisiondebugmeshbuilder_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcollisiondebugmeshbuilder_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcollisiondebugmeshbuilder_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qcollisiondebugmeshbuilder_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qcollisiondebugmeshbuilder_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qconvexmeshshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qconvexmeshshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qconvexmeshshape_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qconvexmeshshape_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qconvexmeshshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qdebugdrawhelper_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qdebugdrawhelper_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qdebugdrawhelper_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qdebugdrawhelper_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qdebugdrawhelper_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qdynamicsworld_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qdynamicsworld_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qdynamicsworld_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qdynamicsworld_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qdynamicsworld_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qheightfieldshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qheightfieldshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qheightfieldshape_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qheightfieldshape_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qheightfieldshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicscommands_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicscommands_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicscommands_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicscommands_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qphysicscommands_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicsmaterial_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicsmaterial_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicsmaterial_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicsmaterial_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qphysicsmaterial_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicsmeshutils_p_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicsmeshutils_p_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicsmeshutils_p_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicsmeshutils_p_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qphysicsmeshutils_p_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicsutils_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicsutils_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicsutils_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qphysicsutils_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qphysicsutils_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qplaneshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qplaneshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qplaneshape_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qplaneshape_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qplaneshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qrigidbody_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qrigidbody_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qrigidbody_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qrigidbody_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qrigidbody_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qsphereshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qsphereshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qsphereshape_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qsphereshape_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qsphereshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qtquick3dphysicsglobal_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qtquick3dphysicsglobal_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qtquick3dphysicsglobal_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qtquick3dphysicsglobal_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qtquick3dphysicsglobal_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qtrianglemeshshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qtrianglemeshshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qtrianglemeshshape_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qtrianglemeshshape_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qtrianglemeshshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qtriggerbody_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qtriggerbody_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qtriggerbody_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.2/QtQuick3DPhysics/private/qtriggerbody_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/quick3dphysics/qtriggerbody_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qabstractcollisionnode_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qabstractcollisionnode_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qabstractcollisionnode_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qabstractcollisionnode_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qabstractcollisionnode_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qabstractcollisionshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qabstractcollisionshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qabstractcollisionshape_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qabstractcollisionshape_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qabstractcollisionshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qabstractphysicsbody_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qabstractphysicsbody_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qabstractphysicsbody_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qabstractphysicsbody_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qabstractphysicsbody_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qboxshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qboxshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qboxshape_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qboxshape_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qboxshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcacheutils_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcacheutils_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcacheutils_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcacheutils_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qcacheutils_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcapsuleshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcapsuleshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcapsuleshape_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcapsuleshape_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qcapsuleshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcharactercontroller_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcharactercontroller_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcharactercontroller_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcharactercontroller_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qcharactercontroller_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcollisiondebugmeshbuilder_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcollisiondebugmeshbuilder_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcollisiondebugmeshbuilder_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qcollisiondebugmeshbuilder_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qcollisiondebugmeshbuilder_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qconvexmeshshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qconvexmeshshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qconvexmeshshape_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qconvexmeshshape_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qconvexmeshshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qdebugdrawhelper_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qdebugdrawhelper_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qdebugdrawhelper_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qdebugdrawhelper_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qdebugdrawhelper_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qdynamicsworld_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qdynamicsworld_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qdynamicsworld_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qdynamicsworld_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qdynamicsworld_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qheightfieldshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qheightfieldshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qheightfieldshape_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qheightfieldshape_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qheightfieldshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicscommands_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicscommands_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicscommands_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicscommands_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qphysicscommands_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicsmaterial_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicsmaterial_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicsmaterial_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicsmaterial_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qphysicsmaterial_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicsmeshutils_p_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicsmeshutils_p_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicsmeshutils_p_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicsmeshutils_p_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qphysicsmeshutils_p_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicsutils_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicsutils_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicsutils_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qphysicsutils_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qphysicsutils_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qplaneshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qplaneshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qplaneshape_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qplaneshape_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qplaneshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qrigidbody_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qrigidbody_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qrigidbody_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qrigidbody_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qrigidbody_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qsphereshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qsphereshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qsphereshape_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qsphereshape_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qsphereshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qtquick3dphysicsglobal_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qtquick3dphysicsglobal_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qtquick3dphysicsglobal_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qtquick3dphysicsglobal_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qtquick3dphysicsglobal_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qtrianglemeshshape_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qtrianglemeshshape_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qtrianglemeshshape_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qtrianglemeshshape_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qtrianglemeshshape_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qtriggerbody_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qtriggerbody_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qtriggerbody_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/6.4.3/QtQuick3DPhysics/private/qtriggerbody_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/quick3dphysics/qtriggerbody_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/qtquick3dphysicsversion.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/qtquick3dphysicsversion.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysics/qtquick3dphysicsversion.h 2022-12-13 08:05:12.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysics/qtquick3dphysicsversion.h 2023-03-12 11:00:44.742255700 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTQUICK3DPHYSICS_VERSION_H #define QT_QTQUICK3DPHYSICS_VERSION_H -#define QTQUICK3DPHYSICS_VERSION_STR "6.4.2" +#define QTQUICK3DPHYSICS_VERSION_STR "6.4.3" -#define QTQUICK3DPHYSICS_VERSION 0x060402 +#define QTQUICK3DPHYSICS_VERSION 0x060403 #endif // QT_QTQUICK3DPHYSICS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysicsHelpers/6.4.2/QtQuick3DPhysicsHelpers/private/qcapsulegeometry_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysicsHelpers/6.4.2/QtQuick3DPhysicsHelpers/private/qcapsulegeometry_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysicsHelpers/6.4.2/QtQuick3DPhysicsHelpers/private/qcapsulegeometry_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysicsHelpers/6.4.2/QtQuick3DPhysicsHelpers/private/qcapsulegeometry_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/helpers/qcapsulegeometry_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysicsHelpers/6.4.3/QtQuick3DPhysicsHelpers/private/qcapsulegeometry_p.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysicsHelpers/6.4.3/QtQuick3DPhysicsHelpers/private/qcapsulegeometry_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysicsHelpers/6.4.3/QtQuick3DPhysicsHelpers/private/qcapsulegeometry_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysicsHelpers/6.4.3/QtQuick3DPhysicsHelpers/private/qcapsulegeometry_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/helpers/qcapsulegeometry_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysicsHelpers/qtquick3dphysicshelpersversion.h new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysicsHelpers/qtquick3dphysicshelpersversion.h --- old/qtquick3dphysics-everywhere-src-6.4.2/include/QtQuick3DPhysicsHelpers/qtquick3dphysicshelpersversion.h 2022-12-13 08:05:12.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/include/QtQuick3DPhysicsHelpers/qtquick3dphysicshelpersversion.h 2023-03-12 11:00:44.734255800 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTQUICK3DPHYSICSHELPERS_VERSION_H #define QT_QTQUICK3DPHYSICSHELPERS_VERSION_H -#define QTQUICK3DPHYSICSHELPERS_VERSION_STR "6.4.2" +#define QTQUICK3DPHYSICSHELPERS_VERSION_STR "6.4.3" -#define QTQUICK3DPHYSICSHELPERS_VERSION 0x060402 +#define QTQUICK3DPHYSICSHELPERS_VERSION 0x060403 #endif // QT_QTQUICK3DPHYSICSHELPERS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/src/3rdparty/PhysX/0004-Fix-Windows-openapi-icx-compilation.patch new/qtquick3dphysics-everywhere-src-6.4.3/src/3rdparty/PhysX/0004-Fix-Windows-openapi-icx-compilation.patch --- old/qtquick3dphysics-everywhere-src-6.4.2/src/3rdparty/PhysX/0004-Fix-Windows-openapi-icx-compilation.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/src/3rdparty/PhysX/0004-Fix-Windows-openapi-icx-compilation.patch 2023-03-12 04:46:02.000000000 +0100 @@ -0,0 +1,74 @@ +From cb7e44afcb474bce9050aceeb6fd38271aeee90c Mon Sep 17 00:00:00 2001 +From: Jonas Karlsson <jonas.karls...@qt.io> +Date: Thu, 1 Dec 2022 13:30:21 +0100 +Subject: [PATCH 1/1] Fix Windows openapi icx compilation + +Pick-to: 6.4 +Fixes: QTBUG-109015 +Change-Id: Iac37dda4deba489ff5ff5dd16548485573957474 +--- + .../include/windows/PsWindowsInlineAoS.h | 22 +++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/src/3rdparty/PhysX/source/foundation/include/windows/PsWindowsInlineAoS.h b/src/3rdparty/PhysX/source/foundation/include/windows/PsWindowsInlineAoS.h +index 14f93eed..d5389698 100644 +--- a/src/3rdparty/PhysX/source/foundation/include/windows/PsWindowsInlineAoS.h ++++ b/src/3rdparty/PhysX/source/foundation/include/windows/PsWindowsInlineAoS.h +@@ -3043,6 +3043,16 @@ PX_FORCE_INLINE VecU16V V4U16CompareGt(VecU16V a, VecU16V b) + // _mm_cmpgt_epi16 doesn't work for unsigned values unfortunately + // return m128_I2F(_mm_cmpgt_epi16(internalWindowsSimd::m128_F2I(a), internalWindowsSimd::m128_F2I(b))); + VecU16V result; ++#ifdef __INTEL_LLVM_COMPILER ++ result[0] = PxU16(a[0] > b[0]); ++ result[1] = PxU16(a[1] > b[1]); ++ result[2] = PxU16(a[2] > b[2]); ++ result[3] = PxU16(a[3] > b[3]); ++ result[4] = PxU16(a[4] > b[4]); ++ result[5] = PxU16(a[5] > b[5]); ++ result[6] = PxU16(a[6] > b[6]); ++ result[7] = PxU16(a[7] > b[7]); ++#else + result.m128_u16[0] = PxU16((a).m128_u16[0] > (b).m128_u16[0]); + result.m128_u16[1] = PxU16((a).m128_u16[1] > (b).m128_u16[1]); + result.m128_u16[2] = PxU16((a).m128_u16[2] > (b).m128_u16[2]); +@@ -3051,6 +3061,7 @@ PX_FORCE_INLINE VecU16V V4U16CompareGt(VecU16V a, VecU16V b) + result.m128_u16[5] = PxU16((a).m128_u16[5] > (b).m128_u16[5]); + result.m128_u16[6] = PxU16((a).m128_u16[6] > (b).m128_u16[6]); + result.m128_u16[7] = PxU16((a).m128_u16[7] > (b).m128_u16[7]); ++#endif // __INTEL_LLVM_COMPILER + return result; + } + +@@ -3062,7 +3073,11 @@ PX_FORCE_INLINE VecU16V V4I16CompareGt(VecU16V a, VecU16V b) + + PX_FORCE_INLINE Vec4V Vec4V_From_VecU32V(VecU32V a) + { ++#ifdef __INTEL_LLVM_COMPILER ++ Vec4V result = V4LoadXYZW(PxF32(a[0]), PxF32(a[1]), PxF32(a[2]), PxF32(a[3])); ++#else + Vec4V result = V4LoadXYZW(PxF32(a.m128_u32[0]), PxF32(a.m128_u32[1]), PxF32(a.m128_u32[2]), PxF32(a.m128_u32[3])); ++#endif + return result; + } + +@@ -3113,10 +3128,17 @@ PX_FORCE_INLINE Vec4V V4SplatElement(Vec4V a) + PX_FORCE_INLINE VecU32V U4LoadXYZW(PxU32 x, PxU32 y, PxU32 z, PxU32 w) + { + VecU32V result; ++#ifdef __INTEL_LLVM_COMPILER ++ result[0] = x; ++ result[1] = y; ++ result[2] = z; ++ result[3] = w; ++#else + result.m128_u32[0] = x; + result.m128_u32[1] = y; + result.m128_u32[2] = z; + result.m128_u32[3] = w; ++#endif + return result; + } + +-- +2.38.1 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/src/3rdparty/PhysX/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.4.3/src/3rdparty/PhysX/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.4.2/src/3rdparty/PhysX/CMakeLists.txt 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/src/3rdparty/PhysX/CMakeLists.txt 2023-03-12 04:46:02.000000000 +0100 @@ -1210,6 +1210,10 @@ source/physx/src/windows/NpWindowsDelayLoadHook.cpp source/physxcooking/src/windows/WindowsCookingDelayLoadHook.cpp ) + if(MSVC AND "${MSVC_TOOLSET_VERSION}" LESS_EQUAL 142) + # there's an ICE on MSVC 2019 (corresponds to 142) + set_property(TARGET BundledPhysX PROPERTY CXX_STANDARD 17) + endif() endif(WIN32 OR MSVC) if(UNIX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/src/3rdparty/PhysX/source/foundation/include/windows/PsWindowsInlineAoS.h new/qtquick3dphysics-everywhere-src-6.4.3/src/3rdparty/PhysX/source/foundation/include/windows/PsWindowsInlineAoS.h --- old/qtquick3dphysics-everywhere-src-6.4.2/src/3rdparty/PhysX/source/foundation/include/windows/PsWindowsInlineAoS.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/src/3rdparty/PhysX/source/foundation/include/windows/PsWindowsInlineAoS.h 2023-03-12 04:46:02.000000000 +0100 @@ -3043,6 +3043,16 @@ // _mm_cmpgt_epi16 doesn't work for unsigned values unfortunately // return m128_I2F(_mm_cmpgt_epi16(internalWindowsSimd::m128_F2I(a), internalWindowsSimd::m128_F2I(b))); VecU16V result; +#ifdef __INTEL_LLVM_COMPILER + result[0] = PxU16(a[0] > b[0]); + result[1] = PxU16(a[1] > b[1]); + result[2] = PxU16(a[2] > b[2]); + result[3] = PxU16(a[3] > b[3]); + result[4] = PxU16(a[4] > b[4]); + result[5] = PxU16(a[5] > b[5]); + result[6] = PxU16(a[6] > b[6]); + result[7] = PxU16(a[7] > b[7]); +#else result.m128_u16[0] = PxU16((a).m128_u16[0] > (b).m128_u16[0]); result.m128_u16[1] = PxU16((a).m128_u16[1] > (b).m128_u16[1]); result.m128_u16[2] = PxU16((a).m128_u16[2] > (b).m128_u16[2]); @@ -3051,6 +3061,7 @@ result.m128_u16[5] = PxU16((a).m128_u16[5] > (b).m128_u16[5]); result.m128_u16[6] = PxU16((a).m128_u16[6] > (b).m128_u16[6]); result.m128_u16[7] = PxU16((a).m128_u16[7] > (b).m128_u16[7]); +#endif // __INTEL_LLVM_COMPILER return result; } @@ -3062,7 +3073,11 @@ PX_FORCE_INLINE Vec4V Vec4V_From_VecU32V(VecU32V a) { +#ifdef __INTEL_LLVM_COMPILER + Vec4V result = V4LoadXYZW(PxF32(a[0]), PxF32(a[1]), PxF32(a[2]), PxF32(a[3])); +#else Vec4V result = V4LoadXYZW(PxF32(a.m128_u32[0]), PxF32(a.m128_u32[1]), PxF32(a.m128_u32[2]), PxF32(a.m128_u32[3])); +#endif return result; } @@ -3113,10 +3128,17 @@ PX_FORCE_INLINE VecU32V U4LoadXYZW(PxU32 x, PxU32 y, PxU32 z, PxU32 w) { VecU32V result; +#ifdef __INTEL_LLVM_COMPILER + result[0] = x; + result[1] = y; + result[2] = z; + result[3] = w; +#else result.m128_u32[0] = x; result.m128_u32[1] = y; result.m128_u32[2] = z; result.m128_u32[3] = w; +#endif return result; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/src/quick3dphysics/qabstractcollisionnode.cpp new/qtquick3dphysics-everywhere-src-6.4.3/src/quick3dphysics/qabstractcollisionnode.cpp --- old/qtquick3dphysics-everywhere-src-6.4.2/src/quick3dphysics/qabstractcollisionnode.cpp 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/src/quick3dphysics/qabstractcollisionnode.cpp 2023-03-12 04:46:02.000000000 +0100 @@ -62,7 +62,9 @@ QAbstractCollisionNode::~QAbstractCollisionNode() { - disconnect(m_rebuildConnection); + for (auto shape : std::as_const(m_collisionShapes)) + shape->disconnect(this); + if (auto world = QDynamicsWorld::getWorld(); world != nullptr) world->deregisterNode(this); } @@ -189,7 +191,7 @@ &QAbstractCollisionNode::onShapeDestroyed); // Connect to rebuild signal - self->m_rebuildConnection = connect(shape, &QAbstractCollisionShape::needsRebuild, self, + connect(shape, &QAbstractCollisionShape::needsRebuild, self, &QAbstractCollisionNode::onShapeNeedsRebuild); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/src/quick3dphysics/qabstractcollisionnode_p.h new/qtquick3dphysics-everywhere-src-6.4.3/src/quick3dphysics/qabstractcollisionnode_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/src/quick3dphysics/qabstractcollisionnode_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/src/quick3dphysics/qabstractcollisionnode_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -96,8 +96,6 @@ friend class QAbstractPhysXNode; friend class QDynamicsWorld; // for register/deregister TODO: cleaner mechanism QAbstractPhysXNode *m_backendObject = nullptr; - - QMetaObject::Connection m_rebuildConnection; }; QT_END_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/src/quick3dphysics/qabstractcollisionshape.cpp new/qtquick3dphysics-everywhere-src-6.4.3/src/quick3dphysics/qabstractcollisionshape.cpp --- old/qtquick3dphysics-everywhere-src-6.4.2/src/quick3dphysics/qabstractcollisionshape.cpp 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/src/quick3dphysics/qabstractcollisionshape.cpp 2023-03-12 04:46:02.000000000 +0100 @@ -20,7 +20,7 @@ */ /*! - \qmlproperty bool CollisionNode::enableDebugView + \qmlproperty bool CollisionShape::enableDebugView This property enables drawing the shape's debug view. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/src/quick3dphysics/qdynamicsworld.cpp new/qtquick3dphysics-everywhere-src-6.4.3/src/quick3dphysics/qdynamicsworld.cpp --- old/qtquick3dphysics-everywhere-src-6.4.2/src/quick3dphysics/qdynamicsworld.cpp 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/src/quick3dphysics/qdynamicsworld.cpp 2023-03-12 04:46:02.000000000 +0100 @@ -374,6 +374,8 @@ { public: QPhysXCharacterController(QCharacterController *frontEnd) : QAbstractPhysXNode(frontEnd) { } + void cleanup(PhysXWorld *physX) override; + void init(QDynamicsWorld *world, PhysXWorld *physX) override; void sync(float deltaTime) override; @@ -525,6 +527,12 @@ setShapesDirty(true); } +void QPhysXCharacterController::cleanup(PhysXWorld *physX) +{ + PHYSX_RELEASE(controller); + QAbstractPhysXNode::cleanup(physX); +} + void QPhysXCharacterController::init(QDynamicsWorld *world, PhysXWorld *physX) { Q_ASSERT(!controller); @@ -797,6 +805,50 @@ QPhysXActorBody::sync(deltaTime); } +///////////////////////////////////////////////////////////////////////////// + +class SimulationWorker : public QObject +{ + Q_OBJECT +public: + SimulationWorker(PhysXWorld *physx) : m_physx(physx) { } + +public slots: + void simulateFrame(float minTimestep, float maxTimestep) + { + if (!m_physx->isRunning) { + m_timer.start(); + m_physx->isRunning = true; + } + + constexpr auto MILLIONTH = 0.000001; + + // If not enough time has elapsed we sleep until it has + auto deltaMS = m_timer.nsecsElapsed() * MILLIONTH; + while (deltaMS < minTimestep) { + auto sleepUSecs = (minTimestep - deltaMS) * 1000.f; + QThread::usleep(sleepUSecs); + deltaMS = m_timer.nsecsElapsed() * MILLIONTH; + } + m_timer.restart(); + + auto deltaSecs = qMin(float(deltaMS), maxTimestep) * 0.001f; + m_physx->scene->simulate(deltaSecs); + m_physx->scene->fetchResults(true); + + emit frameDone(deltaSecs); + } + +signals: + void frameDone(float deltaTime); + +private: + PhysXWorld *m_physx = nullptr; + QElapsedTimer m_timer; +}; + +///////////////////////////////////////////////////////////////////////////// + QDynamicsWorld::QDynamicsWorld(QObject *parent) : QObject(parent) { m_physx = new PhysXWorld; @@ -813,13 +865,12 @@ #endif self = this; // TODO: make a better internal access mechanism - maintainTimer(); } QDynamicsWorld::~QDynamicsWorld() { - if (m_physx->isRunning) - m_physx->scene->fetchResults(true); + m_workerThread.quit(); + m_workerThread.wait(); PHYSX_RELEASE(m_physx->dispatcher); PHYSX_RELEASE(m_physx->controllerManager); @@ -838,6 +889,16 @@ } } +void QDynamicsWorld::classBegin() {} + +void QDynamicsWorld::componentComplete() +{ + if (!m_running || m_physicsInitialized) + return; + initPhysics(); + emit simulateFrame(m_minTimestep, m_maxTimestep); +} + QVector3D QDynamicsWorld::gravity() const { return m_gravity; @@ -935,7 +996,10 @@ return; m_running = running; - maintainTimer(); + if (m_running && !m_physicsInitialized) + initPhysics(); + if (m_running) + emit simulateFrame(m_minTimestep, m_maxTimestep); emit runningChanged(m_running); } @@ -986,14 +1050,6 @@ return; m_minTimestep = minTimestep; - - // Change timer refresh rate if running - if (m_running && m_updateTimer.isActive()) { - m_updateTimer.stop(); - const int freq = qMax(1, int(m_minTimestep)); - m_updateTimer.start(freq, this); - } - emit minTimestepChanged(minTimestep); } @@ -1008,7 +1064,12 @@ void QDynamicsWorld::updateDebugDraw() { - if (m_sceneView == nullptr || !(m_forceDebugView || m_hasIndividualDebugView)) + if (!(m_forceDebugView || m_hasIndividualDebugView)) + return; + + findSceneView(); + + if (m_sceneView == nullptr) return; auto sceneRoot = m_sceneView->scene(); @@ -1303,12 +1364,6 @@ emit defaultDensityChanged(defaultDensity); } -void QDynamicsWorld::timerEvent(QTimerEvent *event) -{ - if (event->timerId() == m_updateTimer.timerId()) - updatePhysics(); -} - void QDynamicsWorld::findSceneView() { // If we have not specified a scene view we find the first available one @@ -1373,24 +1428,19 @@ m_physx->scene = m_physx->physics->createScene(sceneDesc); m_physx->scene->setGravity(QPhysicsUtils::toPhysXType(m_gravity)); - findSceneView(); + // Setup worker thread + SimulationWorker *worker = new SimulationWorker(m_physx); + worker->moveToThread(&m_workerThread); + connect(&m_workerThread, &QThread::finished, worker, &QObject::deleteLater); + connect(this, &QDynamicsWorld::simulateFrame, worker, &SimulationWorker::simulateFrame); + connect(worker, &SimulationWorker::frameDone, this, &QDynamicsWorld::frameFinished); + m_workerThread.start(); m_physicsInitialized = true; } -void QDynamicsWorld::updatePhysics() +void QDynamicsWorld::frameFinished(float deltaTime) { - if (!m_physicsInitialized) - initPhysics(); - - // If not enough time has elapsed we return - if (m_deltaTime.elapsed() < m_minTimestep) - return; - - // Check if simulation is done - if (m_physx->isRunning && !m_physx->scene->fetchResults()) - return; - cleanupRemovedNodes(); for (auto *node : std::as_const(m_newCollisionNodes)) { auto *body = QPhysXFactory::createBackend(node); @@ -1399,10 +1449,6 @@ } m_newCollisionNodes.clear(); - // Calculate time step - const auto deltaMS = m_deltaTime.restart(); - const auto deltaTime = qMin(float(deltaMS), m_maxTimestep) * 0.001f; - // TODO: Use dirty flag/dirty list to avoid redoing things that didn't change for (auto *physXBody : std::as_const(m_physXBodies)) { physXBody->markDirtyShapes(); @@ -1414,24 +1460,8 @@ updateDebugDraw(); - // Start simulating next frame - - m_physx->scene->simulate(deltaTime); - m_physx->isRunning = true; -} - -void QDynamicsWorld::maintainTimer() -{ - if (m_running == m_updateTimer.isActive()) - return; - - if (m_running) { - const int freq = qMax(1, int(m_minTimestep)); - m_updateTimer.start(freq, this); - m_deltaTime.start(); - } else { - m_updateTimer.stop(); - } + if (m_running) + emit simulateFrame(m_minTimestep, m_maxTimestep); } QDynamicsWorld *QDynamicsWorld::self = nullptr; @@ -1465,3 +1495,5 @@ return m_physx->controllerManager; } QT_END_NAMESPACE + +#include "qdynamicsworld.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.4.2/src/quick3dphysics/qdynamicsworld_p.h new/qtquick3dphysics-everywhere-src-6.4.3/src/quick3dphysics/qdynamicsworld_p.h --- old/qtquick3dphysics-everywhere-src-6.4.2/src/quick3dphysics/qdynamicsworld_p.h 2022-12-12 20:36:44.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.4.3/src/quick3dphysics/qdynamicsworld_p.h 2023-03-12 04:46:02.000000000 +0100 @@ -50,9 +50,10 @@ class QQuick3DDefaultMaterial; struct PhysXWorld; -class Q_QUICK3DPHYSICS_EXPORT QDynamicsWorld : public QObject +class Q_QUICK3DPHYSICS_EXPORT QDynamicsWorld : public QObject, public QQmlParserStatus { Q_OBJECT + Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QVector3D gravity READ gravity WRITE setGravity NOTIFY gravityChanged) Q_PROPERTY(bool running READ running WRITE setRunning NOTIFY runningChanged) Q_PROPERTY(bool forceDebugView READ forceDebugView WRITE setForceDebugView NOTIFY @@ -75,6 +76,9 @@ explicit QDynamicsWorld(QObject *parent = nullptr); ~QDynamicsWorld(); + void classBegin() override; + void componentComplete() override; + QVector3D gravity() const; bool running() const; @@ -129,14 +133,11 @@ void sceneViewChanged(QQuick3DViewport *sceneView); void minTimestepChanged(float minTimestep); void maxTimestepChanged(float maxTimestep); - -protected: - void timerEvent(QTimerEvent *event) override; + void simulateFrame(float minTimestep, float maxTimestep); private: - void updatePhysics(); + void frameFinished(float deltaTime); void initPhysics(); - void maintainTimer(); void cleanupRemovedNodes(); void updateDebugDraw(); void disableDebugDraw(); @@ -185,8 +186,6 @@ bool m_physicsInitialized = false; bool m_enableCCD = false; - QBasicTimer m_updateTimer; - QElapsedTimer m_deltaTime; PhysXWorld *m_physx = nullptr; QQuick3DViewport *m_sceneView = nullptr; QQuick3DDefaultMaterial *m_debugMaterial = nullptr; @@ -200,6 +199,7 @@ static physx::PxCooking *getCooking(); physx::PxCooking *cooking(); void findSceneView(); + QThread m_workerThread; }; QT_END_NAMESPACE
