Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix error in AABB calculation for particles with USERDATA #89046

Merged
merged 1 commit into from
Mar 4, 2024
+3 −3
Merged

Fix error in AABB calculation for particles with USERDATA #89046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/gles3/storage/particles_storage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ AABB ParticlesStorage::particles_get_current_aabb(RID p_particles) {
bool first = true;

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++) {
const ParticleInstanceData3D &particle_data = *(const ParticleInstanceData3D *)&data_ptr[particle_data_size * i];
Expand Down
4 changes: 2 additions & 2 deletions servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,9 @@ AABB ParticlesStorage::particles_get_current_aabb(RID p_particles) {
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);
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();

Expand All @@ -630,7 +631,6 @@ AABB ParticlesStorage::particles_get_current_aabb(RID p_particles) {
bool first = true;

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++) {
const ParticleData &particle_data = *(const ParticleData *)&data_ptr[particle_data_size * i];
Expand Down
Loading