noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #117909 from QbieShay/qbe/fix-trimmed-transform

Browse Source 
Fix incorrectly stored emission transform for GPUParticles2D
This commit is contained in:
Thaddeus Crews
2026-04-01 18:10:11 -05:00
parent b91e6caf5e df081fc7c1
commit 7e3bf93f8a
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servers/rendering/renderer_rd/shaders/particles_copy.glsl
+1 -1
View File
@@ -318,7 +318,7 @@ void main() {
inv_emission_transform[1] = vec4(params.inv_emission_transform[3], params.inv_emission_transform[4], params.inv_emission_transform[5], 0.0);
inv_emission_transform[2] = vec4(params.inv_emission_transform[6], params.inv_emission_transform[7], params.inv_emission_transform[8], 0.0);
inv_emission_transform[3] = vec4(params.inv_emission_transform[9], params.inv_emission_transform[10], params.inv_emission_transform[11], 1.0);
inv_emission_transform = transpose(inv_emission_transform);
txform = inv_emission_transform * txform;
}
} else {
servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
+13 -1
View File
@@ -1649,7 +1649,19 @@ void ParticlesStorage::update_particles() {
// In local mode, particle positions are calculated locally (relative to the node position)
// and they're also drawn locally.
// It works as expected, so we just pass an identity transform.
RendererRD::MaterialStorage::store_transform(Transform3D(), copy_push_constant.inv_emission_transform);
//RendererRD::MaterialStorage::store_transform(Transform3D(), copy_push_constant.inv_emission_transform);
copy_push_constant.inv_emission_transform[0] = 1.0;
copy_push_constant.inv_emission_transform[1] = 0.0;
copy_push_constant.inv_emission_transform[2] = 0.0;
copy_push_constant.inv_emission_transform[3] = 0.0;
copy_push_constant.inv_emission_transform[4] = 1.0;
copy_push_constant.inv_emission_transform[5] = 0.0;
copy_push_constant.inv_emission_transform[6] = 0.0;
copy_push_constant.inv_emission_transform[7] = 0.0;
copy_push_constant.inv_emission_transform[8] = 1.0;
copy_push_constant.inv_emission_transform[9] = 0.0;
copy_push_constant.inv_emission_transform[10] = 0.0;
copy_push_constant.inv_emission_transform[11] = 0.0;
} else {
// In global mode, particle positions are calculated globally (relative to the canvas origin)
// but they're drawn locally.