diff options
| author | clayjohn <claynjohn@gmail.com> | 2023-02-14 14:37:47 -0800 |
|---|---|---|
| committer | Yuri Sizov <yuris@humnom.net> | 2023-04-24 16:28:28 +0200 |
| commit | 27df8b93aa3055d707421222eb9176964e294096 (patch) | |
| tree | b6a541c2a1ee3dc211a7fc12c91b21d3e65e516b /drivers/gles3 | |
| parent | 95f50274534563dbcb27e6ed3fcfa25a77f366e9 (diff) | |
Properly calculate lifetime_split for particles
(cherry picked from commit f35ca4a9c735e49d496c4e733e7dc9a072841f92)
Diffstat (limited to 'drivers/gles3')
| -rw-r--r-- | drivers/gles3/storage/particles_storage.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gles3/storage/particles_storage.cpp b/drivers/gles3/storage/particles_storage.cpp index 2b47271408..4b64e2aec1 100644 --- a/drivers/gles3/storage/particles_storage.cpp +++ b/drivers/gles3/storage/particles_storage.cpp @@ -919,7 +919,7 @@ void ParticlesStorage::_particles_update_instance_buffer(Particles *particles, c glBeginTransformFeedback(GL_POINTS); if (particles->draw_order == RS::PARTICLES_DRAW_ORDER_LIFETIME) { - uint32_t lifetime_split = MIN(particles->amount * particles->phase, particles->amount - 1); + uint32_t lifetime_split = (MIN(int(particles->amount * particles->phase), particles->amount - 1) + 1) % particles->amount; uint32_t stride = particles->process_buffer_stride_cache; glBindBuffer(GL_ARRAY_BUFFER, particles->back_process_buffer); @@ -1135,14 +1135,13 @@ void ParticlesStorage::_particles_reverse_lifetime_sort(Particles *particles) { glGetBufferSubData(GL_ARRAY_BUFFER, 0, buffer_size, particle_array); #endif - uint32_t lifetime_split = MIN(particles->amount * particles->sort_buffer_phase, particles->amount - 1); - + uint32_t lifetime_split = (MIN(int(particles->amount * particles->sort_buffer_phase), particles->amount - 1) + 1) % particles->amount; for (uint32_t i = 0; i < lifetime_split / 2; i++) { - SWAP(particle_array[i], particle_array[lifetime_split - i]); + SWAP(particle_array[i], particle_array[lifetime_split - i - 1]); } for (uint32_t i = 0; i < (particles->amount - lifetime_split) / 2; i++) { - SWAP(particle_array[lifetime_split + i + 1], particle_array[particles->amount - 1 - i]); + SWAP(particle_array[lifetime_split + i], particle_array[particles->amount - 1 - i]); } #ifndef __EMSCRIPTEN__ |