asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CPUParticles initialize data on set_amount

Browse source 
Fills particle data with zeroes on resize using set_amount(), to prevent garbage data including Nans being sent to VisualServer, which can corrupt the spatial partitioning.
This commit is contained in:
lawnjelly 2022-09-19 16:53:01 +01:00
parent cf157a804f
commit fdd82f4754
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scene/2d/cpu_particles_2d.cpp
View file

@ -62,6 +62,11 @@ void CPUParticles2D::set_amount(int p_amount) {
} }
particle_data.resize((8 + 4 + 1) * p_amount); particle_data.resize((8 + 4 + 1) * p_amount);
// We must fill immediately to prevent garbage data and Nans
// being sent to the visual server with set_as_bulk_array,
// if this is sent before being regularly updated.
particle_data.fill(0);
VS::get_singleton()->multimesh_allocate(multimesh, p_amount, VS::MULTIMESH_TRANSFORM_2D, VS::MULTIMESH_COLOR_8BIT, VS::MULTIMESH_CUSTOM_DATA_FLOAT); VS::get_singleton()->multimesh_allocate(multimesh, p_amount, VS::MULTIMESH_TRANSFORM_2D, VS::MULTIMESH_COLOR_8BIT, VS::MULTIMESH_CUSTOM_DATA_FLOAT);
particle_order.resize(p_amount); particle_order.resize(p_amount);

7
scene/3d/cpu_particles.cpp
View file

@ -85,6 +85,13 @@ void CPUParticles::set_amount(int p_amount) {
particle_data.resize((12 + 4 + 1) * p_amount); particle_data.resize((12 + 4 + 1) * p_amount);
particle_data_prev.resize(particle_data.size()); particle_data_prev.resize(particle_data.size());
// We must fill immediately to prevent garbage data and Nans
// being sent to the visual server with set_as_bulk_array,
// if this is sent before being regularly updated.
particle_data.fill(0);
particle_data_prev.fill(0);
VS::get_singleton()->multimesh_allocate(multimesh, p_amount, VS::MULTIMESH_TRANSFORM_3D, VS::MULTIMESH_COLOR_8BIT, VS::MULTIMESH_CUSTOM_DATA_FLOAT); VS::get_singleton()->multimesh_allocate(multimesh, p_amount, VS::MULTIMESH_TRANSFORM_3D, VS::MULTIMESH_COLOR_8BIT, VS::MULTIMESH_CUSTOM_DATA_FLOAT);
particle_order.resize(p_amount); particle_order.resize(p_amount);