Merge pull request #101237 from mihe/jolt/cache-bounce-velocity

Cache value of Jolt Physics project setting `bounce_velocity_threshold`
godotengine · Jan 7, 2025 · 0c76360 · 0c76360
2 parents a0c3798 + d6b822c
commit 0c76360
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
@@ -2464,6 +2464,7 @@
 		</member>
 		<member name="physics/jolt_physics_3d/simulation/bounce_velocity_threshold" type="float" setter="" getter="" default="1.0">
 			The minimum velocity needed before a collision can be bouncy, in meters per second.
+			[b]Note:[/b] This setting will only be read once during the lifetime of the application.
 		</member>
 		<member name="physics/jolt_physics_3d/simulation/continuous_cd_max_penetration" type="float" setter="" getter="" default="0.25">
 			Fraction of a body's inner radius that may penetrate another body while using continuous collision detection.

diff --git a/modules/jolt_physics/jolt_project_settings.cpp b/modules/jolt_physics/jolt_project_settings.cpp
@@ -119,7 +119,8 @@ float JoltProjectSettings::get_soft_body_point_radius() {
 }
 
 float JoltProjectSettings::get_bounce_velocity_threshold() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/bounce_velocity_threshold");
+	static const float value = GLOBAL_GET("physics/jolt_physics_3d/simulation/bounce_velocity_threshold");
+	return value;
 }
 
 bool JoltProjectSettings::is_sleep_allowed() {