godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Merge pull request #89046 from permelin/fix-particle-aabb-recalc-with-userdata

Browse Source 
Fix error in AABB calculation for particles with USERDATA
This commit is contained in:
Rémi Verschelde
2024-03-04 13:33:33 +01:00
parent 2af237b2d5 853935a5c9
commit 3be5d9b01a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gles3/storage/particles_storage.cpp
View File

@@ -395,7 +395,7 @@ AABB ParticlesStorage::particles_get_current_aabb(RID p_particles) {
bool first = true; bool first = true;
const uint8_t *data_ptr = (const uint8_t *)buffer.ptr(); const uint8_t *data_ptr = (const uint8_t *)buffer.ptr();
uint32_t particle_data_size = sizeof(ParticleInstanceData3D) + sizeof(float) * particles->userdata_count; uint32_t particle_data_size = sizeof(ParticleInstanceData3D);
for (int i = 0; i < total_amount; i++) { for (int i = 0; i < total_amount; i++) {
const ParticleInstanceData3D &particle_data = *(const ParticleInstanceData3D *)&data_ptr[particle_data_size * i]; const ParticleInstanceData3D &particle_data = *(const ParticleInstanceData3D *)&data_ptr[particle_data_size * i];

4
servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
View File

@@ -620,8 +620,9 @@ AABB ParticlesStorage::particles_get_current_aabb(RID p_particles) {
total_amount *= particles->trail_bind_poses.size(); total_amount *= particles->trail_bind_poses.size();
} }
uint32_t particle_data_size = sizeof(ParticleData) + sizeof(float) * 4 * particles->userdata_count;
Vector<uint8_t> buffer = RD::get_singleton()->buffer_get_data(particles->particle_buffer); Vector<uint8_t> buffer = RD::get_singleton()->buffer_get_data(particles->particle_buffer);
ERR_FAIL_COND_V(buffer.size() != (int)(total_amount * sizeof(ParticleData)), AABB()); ERR_FAIL_COND_V(buffer.size() != (int)(total_amount * particle_data_size), AABB());
Transform3D inv = particles->emission_transform.affine_inverse(); Transform3D inv = particles->emission_transform.affine_inverse();
@@ -630,7 +631,6 @@ AABB ParticlesStorage::particles_get_current_aabb(RID p_particles) {
bool first = true; bool first = true;
const uint8_t *data_ptr = (const uint8_t *)buffer.ptr(); const uint8_t *data_ptr = (const uint8_t *)buffer.ptr();
uint32_t particle_data_size = sizeof(ParticleData) + sizeof(float) * particles->userdata_count;
for (int i = 0; i < total_amount; i++) { for (int i = 0; i < total_amount; i++) {
const ParticleData &particle_data = *(const ParticleData *)&data_ptr[particle_data_size * i]; const ParticleData &particle_data = *(const ParticleData *)&data_ptr[particle_data_size * i];