godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #53072 from CaptainProton42/fix-gpuparticles3d-generate-aabb

This commit is contained in:
Rémi Verschelde 2021-09-28 16:20:22 +02:00 committed by GitHub
parent 5aa099aaed 1731030b3c
commit 4296539d94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
servers/rendering/renderer_rd/renderer_storage_rd.cpp
View File

@ -4138,6 +4138,7 @@ void RendererStorageRD::particles_set_use_local_coordinates(RID p_particles, boo
ERR_FAIL_COND(!particles); ERR_FAIL_COND(!particles);
particles->use_local_coords = p_enable; particles->use_local_coords = p_enable;
particles->dependency.changed_notify(DEPENDENCY_CHANGED_PARTICLES);
} }
void RendererStorageRD::particles_set_fixed_fps(RID p_particles, int p_fps) { void RendererStorageRD::particles_set_fixed_fps(RID p_particles, int p_fps) {
@ -4352,10 +4353,8 @@ AABB RendererStorageRD::particles_get_current_aabb(RID p_particles) {
total_amount *= particles->trail_bind_poses.size(); total_amount *= particles->trail_bind_poses.size();
} }
Vector<ParticleData> data;
data.resize(total_amount);
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());
Transform3D inv = particles->emission_transform.affine_inverse(); Transform3D inv = particles->emission_transform.affine_inverse();
@ -4363,7 +4362,7 @@ AABB RendererStorageRD::particles_get_current_aabb(RID p_particles) {
if (buffer.size()) { if (buffer.size()) {
bool first = true; bool first = true;
const ParticleData *particle_data = (const ParticleData *)data.ptr(); const ParticleData *particle_data = reinterpret_cast<const ParticleData *>(buffer.ptr());
for (int i = 0; i < total_amount; i++) { for (int i = 0; i < total_amount; i++) {
if (particle_data[i].active) { if (particle_data[i].active) {
Vector3 pos = Vector3(particle_data[i].xform[12], particle_data[i].xform[13], particle_data[i].xform[14]); Vector3 pos = Vector3(particle_data[i].xform[12], particle_data[i].xform[13], particle_data[i].xform[14]);

1
servers/rendering/renderer_rd/renderer_storage_rd.h
View File

@ -621,7 +621,6 @@ private:
float color[4]; float color[4];
float custom[3]; float custom[3];
float lifetime; float lifetime;
uint32_t pad[3];
}; };
struct ParticlesFrameParams { struct ParticlesFrameParams {