Merge pull request #110965 from mihe/jolt/v5.4.0

Jolt: Update to 5.4.0

Author: Repiteo

modules/jolt_physics/objects/jolt_soft_body_3d.cpp

@@ -78,6 +78,7 @@ void JoltSoftBody3D::_space_changing() {
 	if (jolt_body != nullptr) {
 		jolt_settings = new JPH::SoftBodyCreationSettings(jolt_body->GetSoftBodyCreationSettings());
 		jolt_settings->mSettings = nullptr;
+		jolt_settings->mVertexRadius = JoltProjectSettings::soft_body_point_radius;
 	}
 
 	_deref_shared_data();
@@ -146,8 +147,6 @@ bool JoltSoftBody3D::_ref_shared_data() {
 		LocalVector<int> &mesh_to_physics = iter_shared_data->value.mesh_to_physics;
 
 		JPH::SoftBodySharedSettings &settings = *iter_shared_data->value.settings;
-		settings.mVertexRadius = JoltProjectSettings::soft_body_point_radius;
-
 		JPH::Array<JPH::SoftBodySharedSettings::Vertex> &physics_vertices = settings.mVertices;
 		JPH::Array<JPH::SoftBodySharedSettings::Face> &physics_faces = settings.mFaces;
 

thirdparty/README.md

@@ -492,7 +492,7 @@ Files generated from upstream source:
 ## jolt_physics
 
 - Upstream: https://github.com/jrouwe/JoltPhysics
-- Version: 5.3.0 (0373ec0dd762e4bc2f6acdb08371ee84fa23c6db, 2025)
+- Version: 5.4.0 (036ea7b1d717b3e713ac9d8cbd47118fb9cd5d60, 2025)
 - License: MIT
 
 Files extracted from upstream source:

thirdparty/jolt_physics/Jolt/ConfigurationString.h

@@ -83,6 +83,9 @@ inline const char *GetConfigurationString()
 #ifdef JPH_PROFILE_ENABLED
 		"(Profile) "
 #endif
+#ifdef JPH_EXTERNAL_PROFILE
+		"(External Profile) "
+#endif
 #if defined(JPH_OBJECT_LAYER_BITS) && JPH_OBJECT_LAYER_BITS == 32
 		"(32-bit ObjectLayer) "
 #else

thirdparty/jolt_physics/Jolt/Core/Array.h

@@ -69,8 +69,8 @@ class [[nodiscard]] Array : private Allocator
 		rev_it &			operator -- ()					{ ++mValue; return *this; }
 		rev_it				operator -- (int)				{ return rev_it(mValue++); }
 
-		rev_it				operator + (int inValue)		{ return rev_it(mValue - inValue); }
-		rev_it				operator - (int inValue)		{ return rev_it(mValue + inValue); }
+		rev_it				operator + (int inValue) const	{ return rev_it(mValue - inValue); }
+		rev_it				operator - (int inValue) const	{ return rev_it(mValue + inValue); }
 
 		rev_it &			operator += (int inValue)		{ mValue -= inValue; return *this; }
 		rev_it &			operator -= (int inValue)		{ mValue += inValue; return *this; }

thirdparty/jolt_physics/Jolt/Core/Core.h

@@ -6,7 +6,7 @@
 
 // Jolt library version
 #define JPH_VERSION_MAJOR 5
-#define JPH_VERSION_MINOR 3
+#define JPH_VERSION_MINOR 4
 #define JPH_VERSION_PATCH 0
 
 // Determine which features the library was compiled with
@@ -437,6 +437,11 @@
 #define JPH_SUPPRESS_WARNINGS_STD_END															\
 	JPH_SUPPRESS_WARNING_POP
 
+// MSVC STL requires _HAS_EXCEPTIONS=0 if exceptions are turned off
+#if defined(JPH_COMPILER_MSVC) && (!defined(__cpp_exceptions) || !__cpp_exceptions) && !defined(_HAS_EXCEPTIONS)
+	#define _HAS_EXCEPTIONS 0
+#endif
+
 // Standard C++ includes
 JPH_SUPPRESS_WARNINGS_STD_BEGIN
 #include <float.h>
@@ -448,7 +453,7 @@ JPH_SUPPRESS_WARNINGS_STD_BEGIN
 #include <functional>
 #include <algorithm>
 #include <cstdint>
-#ifdef JPH_COMPILER_MSVC
+#if defined(JPH_COMPILER_MSVC) || (defined(JPH_COMPILER_CLANG) && defined(_MSC_VER)) // MSVC or clang-cl
 	#include <malloc.h> // for alloca
 #endif
 #if defined(JPH_USE_SSE)

thirdparty/jolt_physics/Jolt/Core/HashTable.h

@@ -364,6 +364,8 @@ class HashTable
 		using Base = IteratorBase<HashTable, iterator>;
 
 	public:
+		using IteratorBase<HashTable, iterator>::operator ==;
+
 		/// Properties
 		using reference = typename Base::value_type &;
 		using pointer = typename Base::value_type *;
@@ -401,6 +403,8 @@ class HashTable
 		using Base = IteratorBase<const HashTable, const_iterator>;
 
 	public:
+		using IteratorBase<const HashTable, const_iterator>::operator ==;
+
 		/// Properties
 		using reference = const typename Base::value_type &;
 		using pointer = const typename Base::value_type *;

thirdparty/jolt_physics/Jolt/Core/TickCounter.h

@@ -11,6 +11,8 @@
 	#include <x86intrin.h>
 #elif defined(JPH_CPU_E2K)
 	#include <x86intrin.h>
+#elif defined(JPH_CPU_LOONGARCH)
+	#include <larchintrin.h>
 #endif
 
 JPH_NAMESPACE_BEGIN
@@ -35,7 +37,16 @@ JPH_INLINE uint64 GetProcessorTickCount()
 	uint64 val;
 	asm volatile("mrs %0, cntvct_el0" : "=r" (val));
 	return val;
-#elif defined(JPH_CPU_ARM) || defined(JPH_CPU_RISCV) || defined(JPH_CPU_WASM) || defined(JPH_CPU_PPC) || defined(JPH_CPU_LOONGARCH)
+#elif defined(JPH_CPU_LOONGARCH)
+	#if JPH_CPU_ADDRESS_BITS == 64
+		__drdtime_t t = __rdtime_d();
+		return t.dvalue;
+	#else
+		__rdtime_t h = __rdtimeh_w();
+		__rdtime_t l = __rdtimel_w();
+		return ((uint64)h.value << 32) + l.value;
+	#endif
+#elif defined(JPH_CPU_ARM) || defined(JPH_CPU_RISCV) || defined(JPH_CPU_WASM) || defined(JPH_CPU_PPC)
 	return 0; // Not supported
 #else
 	#error Undefined

thirdparty/jolt_physics/Jolt/Geometry/EPAPenetrationDepth.h

@@ -103,8 +103,6 @@ class EPAPenetrationDepth
 	template <typename AE, typename BE>
 	EStatus				GetPenetrationDepthStepGJK(const AE &inAExcludingConvexRadius, float inConvexRadiusA, const BE &inBExcludingConvexRadius, float inConvexRadiusB, float inTolerance, Vec3 &ioV, Vec3 &outPointA, Vec3 &outPointB)
 	{
-		JPH_PROFILE_FUNCTION();
-
 		JPH_IF_ENABLE_ASSERTS(mGJKTolerance = inTolerance;)
 
 		// Don't supply a zero ioV, we only want to get points on the hull of the Minkowsky sum and not internal points.

thirdparty/jolt_physics/Jolt/Geometry/GJKClosestPoint.h

@@ -551,7 +551,7 @@ class GJKClosestPoint : public NonCopyable
 #ifdef JPH_GJK_DEBUG
 				Trace("v . r = %g", (double)v_dot_r);
 #endif
-				if (v_dot_r >= 0.0f)
+				if (v_dot_r >= -1.0e-18f) // Instead of checking >= 0, check with epsilon as we don't want the division below to overflow to infinity as it can cause a float exception
 					return false;
 
 				// Update the lower bound for lambda
@@ -744,7 +744,7 @@ class GJKClosestPoint : public NonCopyable
 #ifdef JPH_GJK_DEBUG
 				Trace("v . r = %g", (double)v_dot_r);
 #endif
-				if (v_dot_r >= 0.0f)
+				if (v_dot_r >= -1.0e-18f) // Instead of checking >= 0, check with epsilon as we don't want the division below to overflow to infinity as it can cause a float exception
 					return false;
 
 				// Update the lower bound for lambda

thirdparty/jolt_physics/Jolt/Geometry/Plane.h

@@ -32,6 +32,9 @@ class [[nodiscard]] Plane
 	float			GetConstant() const														{ return mNormalAndConstant.GetW(); }
 	void			SetConstant(float inConstant)											{ mNormalAndConstant.SetW(inConstant); }
 
+	/// Store as 4 floats
+	void			StoreFloat4(Float4 *outV) const											{ mNormalAndConstant.StoreFloat4(outV); }
+
 	/// Offset the plane (positive value means move it in the direction of the plane normal)
 	Plane			Offset(float inDistance) const											{ return Plane(mNormalAndConstant - Vec4(Vec3::sZero(), inDistance)); }