mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-04-25 01:48:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from MathdudeMan/shader-error

Browse Source 
Fix: Mass property particle shader bug
This commit is contained in:
Thaddeus Crews 2025-01-29 17:45:13 -06:00
commit 3ba6ac0f66
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
4 changed files with 4 additions and 4 deletions
drivers/gles3
shaders
particles.glsl
storage
material_storage.cpp
servers/rendering/renderer_rd
shaders
particles.glsl
storage_rd
particles_storage.cpp

2
drivers/gles3/shaders/particles.glsl

@ -342,7 +342,7 @@ void main() {
mediump float attractor_attenuation = attractors[i].attenuation;
amount = pow(amount, attractor_attenuation);
dir = safe_normalize(mix(dir, attractors[i].transform[2].xyz, attractors[i].directionality));
attractor_force -= amount * dir * attractors[i].strength;
attractor_force -= mass * amount * dir * attractors[i].strength;
}
float particle_size = particle_size;

2
drivers/gles3/storage/material_storage.cpp

@ -1392,7 +1392,7 @@ MaterialStorage::MaterialStorage() {
actions.renames["COLOR"] = "out_color";
actions.renames["VELOCITY"] = "out_velocity_flags.xyz";
//actions.renames["MASS"] = "mass"; ?
actions.renames["MASS"] = "mass";
actions.renames["ACTIVE"] = "particle_active";
actions.renames["RESTART"] = "restart";
actions.renames["CUSTOM"] = "out_custom";

2
servers/rendering/renderer_rd/shaders/particles.glsl

@ -488,7 +488,7 @@ void main() {
}
amount = pow(amount, FRAME.attractors[i].attenuation);
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 -= mass * amount * dir * FRAME.attractors[i].strength;
}
float particle_size = FRAME.particle_size;

2
servers/rendering/renderer_rd/storage_rd/particles_storage.cpp

@ -68,7 +68,7 @@ ParticlesStorage::ParticlesStorage() {
actions.renames["COLOR"] = "PARTICLE.color";
actions.renames["VELOCITY"] = "PARTICLE.velocity";
//actions.renames["MASS"] = "mass"; ?
actions.renames["MASS"] = "mass";
actions.renames["ACTIVE"] = "particle_active";
actions.renames["RESTART"] = "restart";
actions.renames["CUSTOM"] = "PARTICLE.custom";