asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #61214 from somnathsarkar/particle-attractor-fix

Browse source 
Fix GPUParticles3D disappearance at attractor origins
This commit is contained in:
Rémi Verschelde 2022-05-21 08:48:36 +02:00 committed by GitHub
commit a53434639f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
servers/rendering/renderer_rd/shaders/particles.glsl
View file

@ -228,6 +228,14 @@ bool emit_subparticle(mat4 p_xform, vec3 p_velocity, vec4 p_color, vec4 p_custom
return true; return true;
} }
vec3 safe_normalize(vec3 direction) {
const float EPSILON = 0.001;
if (length(direction) < EPSILON) {
return vec3(0.0);
}
return normalize(direction);
}
#GLOBALS #GLOBALS
void main() { void main() {
@ -431,7 +439,7 @@ void main() {
switch (FRAME.attractors[i].type) { switch (FRAME.attractors[i].type) {
case ATTRACTOR_TYPE_SPHERE: { case ATTRACTOR_TYPE_SPHERE: {
dir = normalize(rel_vec); dir = safe_normalize(rel_vec);
float d = length(local_pos) / FRAME.attractors[i].extents.x; float d = length(local_pos) / FRAME.attractors[i].extents.x;
if (d > 1.0) { if (d > 1.0) {
continue; continue;
@ -439,7 +447,7 @@ void main() {
amount = max(0.0, 1.0 - d); amount = max(0.0, 1.0 - d);
} break; } break;
case ATTRACTOR_TYPE_BOX: { case ATTRACTOR_TYPE_BOX: {
dir = normalize(rel_vec); dir = safe_normalize(rel_vec);
vec3 abs_pos = abs(local_pos / FRAME.attractors[i].extents); vec3 abs_pos = abs(local_pos / FRAME.attractors[i].extents);
float d = max(abs_pos.x, max(abs_pos.y, abs_pos.z)); float d = max(abs_pos.x, max(abs_pos.y, abs_pos.z));
@ -455,13 +463,13 @@ void main() {
continue; continue;
} }
vec3 s = texture(sampler3D(sdf_vec_textures[FRAME.attractors[i].texture_index], material_samplers[SAMPLER_LINEAR_CLAMP]), uvw_pos).xyz; vec3 s = texture(sampler3D(sdf_vec_textures[FRAME.attractors[i].texture_index], material_samplers[SAMPLER_LINEAR_CLAMP]), uvw_pos).xyz;
dir = mat3(FRAME.attractors[i].transform) * normalize(s); //revert direction dir = mat3(FRAME.attractors[i].transform) * safe_normalize(s); //revert direction
amount = length(s); amount = length(s);
} break; } break;
} }
amount = pow(amount, FRAME.attractors[i].attenuation); amount = pow(amount, FRAME.attractors[i].attenuation);
dir = normalize(mix(dir, FRAME.attractors[i].transform[2].xyz, FRAME.attractors[i].directionality)); dir = safe_normalize(mix(dir, FRAME.attractors[i].transform[2].xyz, FRAME.attractors[i].directionality));
attractor_force -= amount * dir * FRAME.attractors[i].strength; attractor_force -= amount * dir * FRAME.attractors[i].strength;
} }