gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-15 21:49:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87320 from Rudolph-B/main

Browse source 
Fix collided particles getting stuck with zero velocity.
This commit is contained in:
Rémi Verschelde 2024-05-15 12:09:27 +02:00
parent 4971b71899 45e5b151b6
commit ca2ed80539
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scene/resources/particle_process_material.cpp
View file

@ -991,13 +991,15 @@ void ParticleProcessMaterial::_update_shader() {
code += " \n";
if (collision_mode == COLLISION_RIGID) {
code += " if (COLLIDED) {\n";
code += " if (length(VELOCITY) > 3.0) {\n";
code += " TRANSFORM[3].xyz += COLLISION_NORMAL * COLLISION_DEPTH;\n";
code += " VELOCITY -= COLLISION_NORMAL * dot(COLLISION_NORMAL, VELOCITY) * (1.0 + collision_bounce);\n";
code += " VELOCITY = mix(VELOCITY,vec3(0.0),clamp(collision_friction, 0.0, 1.0));\n";
code += " } else {\n";
code += " VELOCITY = vec3(0.0);\n";
code += " }\n";
code += " float collision_response = dot(COLLISION_NORMAL, VELOCITY);\n";
code += " float slide_to_bounce_trigger = step(2.0/clamp(collision_bounce + 1.0, 1.0, 2.0), abs(collision_response));\n";
code += " TRANSFORM[3].xyz += COLLISION_NORMAL * COLLISION_DEPTH;\n";
code += " // Remove all components of VELOCITY that is not tangent to COLLISION_NORMAL\n";
code += " VELOCITY -= COLLISION_NORMAL * collision_response;\n";
code += " // Apply friction only to VELOCITY across the surface (Effectively decouples friction and bounce behavior).\n";
code += " VELOCITY = mix(VELOCITY,vec3(0.0),clamp(collision_friction, 0.0, 1.0));\n";
code += " // Add bounce velocity to VELOCITY\n";
code += " VELOCITY -= COLLISION_NORMAL * collision_response * (collision_bounce * slide_to_bounce_trigger);\n";
code += " }\n";
} else if (collision_mode == COLLISION_HIDE_ON_CONTACT) {
code += " if (COLLIDED) {\n";