diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-09-08 23:14:27 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-09-08 23:14:27 +0200 |
| commit | 3815b2f98e51f918d6d4526547fdcedd40491c76 (patch) | |
| tree | 09cfbf731532d0c4612ea20758e143ead64a94f5 | |
| parent | 5fef875cd85492ab15177f5b3ff8a8b177c6656c (diff) | |
| parent | 9ecafcc491515665430cb862f9ad59229b2c02cd (diff) | |
| download | redot-engine-3815b2f98e51f918d6d4526547fdcedd40491c76.tar.gz | |
Merge pull request #81315 from conorlawton/z-billboard-y-velocity-no-scale
Fix z-billboard + y to velocity transform alignment to correctly respect non-uniform scale
| -rw-r--r-- | drivers/gles3/shaders/particles_copy.glsl | 7 | ||||
| -rw-r--r-- | servers/rendering/renderer_rd/shaders/particles_copy.glsl | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/drivers/gles3/shaders/particles_copy.glsl b/drivers/gles3/shaders/particles_copy.glsl index 774aa139b3..0bb8efc52d 100644 --- a/drivers/gles3/shaders/particles_copy.glsl +++ b/drivers/gles3/shaders/particles_copy.glsl @@ -84,7 +84,6 @@ void main() { } break; case TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY: { vec3 sv = velocity_flags.xyz - sort_direction * dot(sort_direction, velocity_flags.xyz); //screen velocity - float s = (length(txform[0]) + length(txform[1]) + length(txform[2])) / 3.0; if (length(sv) == 0.0) { sv = align_up; @@ -92,9 +91,9 @@ void main() { sv = normalize(sv); - txform[0].xyz = normalize(cross(sv, sort_direction)) * s; - txform[1].xyz = sv * s; - txform[2].xyz = sort_direction * s; + txform[0].xyz = normalize(cross(sv, sort_direction)) * length(txform[0]); + txform[1].xyz = sv * length(txform[1]); + txform[2].xyz = sort_direction * length(txform[2]); } break; } diff --git a/servers/rendering/renderer_rd/shaders/particles_copy.glsl b/servers/rendering/renderer_rd/shaders/particles_copy.glsl index 6a06979c2c..93c4d1009d 100644 --- a/servers/rendering/renderer_rd/shaders/particles_copy.glsl +++ b/servers/rendering/renderer_rd/shaders/particles_copy.glsl @@ -182,7 +182,6 @@ void main() { case TRANSFORM_ALIGN_Z_BILLBOARD_Y_TO_VELOCITY: { vec3 v = particles.data[particle].velocity; vec3 sv = v - params.sort_direction * dot(params.sort_direction, v); //screen velocity - float s = (length(txform[0]) + length(txform[1]) + length(txform[2])) / 3.0; if (length(sv) == 0) { sv = params.align_up; @@ -190,9 +189,9 @@ void main() { sv = normalize(sv); - txform[0].xyz = normalize(cross(sv, params.sort_direction)) * s; - txform[1].xyz = sv * s; - txform[2].xyz = params.sort_direction * s; + txform[0].xyz = normalize(cross(sv, params.sort_direction)) * length(txform[0]); + txform[1].xyz = sv * length(txform[1]); + txform[2].xyz = params.sort_direction * length(txform[2]); } break; } |