Skip to content

Commit 964cd65

Browse files
committed
Fix: Mass property particle shader error
1 parent a013481 commit 964cd65

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

drivers/gles3/shaders/particles.glsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ void main() {
342342
mediump float attractor_attenuation = attractors[i].attenuation;
343343
amount = pow(amount, attractor_attenuation);
344344
dir = safe_normalize(mix(dir, attractors[i].transform[2].xyz, attractors[i].directionality));
345-
attractor_force -= amount * dir * attractors[i].strength;
345+
attractor_force -= mass * amount * dir * attractors[i].strength;
346346
}
347347

348348
float particle_size = particle_size;

drivers/gles3/storage/material_storage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,7 @@ MaterialStorage::MaterialStorage() {
13921392

13931393
actions.renames["COLOR"] = "out_color";
13941394
actions.renames["VELOCITY"] = "out_velocity_flags.xyz";
1395-
//actions.renames["MASS"] = "mass"; ?
1395+
actions.renames["MASS"] = "mass";
13961396
actions.renames["ACTIVE"] = "particle_active";
13971397
actions.renames["RESTART"] = "restart";
13981398
actions.renames["CUSTOM"] = "out_custom";

servers/rendering/renderer_rd/shaders/particles.glsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ void main() {
488488
}
489489
amount = pow(amount, FRAME.attractors[i].attenuation);
490490
dir = safe_normalize(mix(dir, FRAME.attractors[i].transform[2].xyz, FRAME.attractors[i].directionality));
491-
attractor_force -= amount * dir * FRAME.attractors[i].strength;
491+
attractor_force -= mass * amount * dir * FRAME.attractors[i].strength;
492492
}
493493

494494
float particle_size = FRAME.particle_size;

servers/rendering/renderer_rd/storage_rd/particles_storage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ParticlesStorage::ParticlesStorage() {
6868

6969
actions.renames["COLOR"] = "PARTICLE.color";
7070
actions.renames["VELOCITY"] = "PARTICLE.velocity";
71-
//actions.renames["MASS"] = "mass"; ?
71+
actions.renames["MASS"] = "mass";
7272
actions.renames["ACTIVE"] = "particle_active";
7373
actions.renames["RESTART"] = "restart";
7474
actions.renames["CUSTOM"] = "PARTICLE.custom";

0 commit comments

Comments
 (0)