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

Merge pull request #64581 from aaronfranke/aabb

Browse source 
Use a const ref for the bone AABB in rendering code
This commit is contained in:
Clay John 2022-08-18 14:04:46 -06:00 committed by GitHub
commit 54eaf662b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gles3/storage/mesh_storage.cpp
View file

@ -255,9 +255,9 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface)
mesh->bone_aabbs.resize(p_surface.bone_aabbs.size());
}
for (int i = 0; i < p_surface.bone_aabbs.size(); i++) {
AABB bone = p_surface.bone_aabbs[i];
const AABB &bone = p_surface.bone_aabbs[i];
if (!bone.has_no_volume()) {
mesh->bone_aabbs.write[i].merge_with(p_surface.bone_aabbs[i]);
mesh->bone_aabbs.write[i].merge_with(bone);
}
}
mesh->aabb.merge_with(p_surface.aabb);

4
servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp
View file

@ -416,9 +416,9 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface)
mesh->bone_aabbs.resize(p_surface.bone_aabbs.size());
}
for (int i = 0; i < p_surface.bone_aabbs.size(); i++) {
AABB bone = p_surface.bone_aabbs[i];
const AABB &bone = p_surface.bone_aabbs[i];
if (!bone.has_no_volume()) {
mesh->bone_aabbs.write[i].merge_with(p_surface.bone_aabbs[i]);
mesh->bone_aabbs.write[i].merge_with(bone);
}
}
mesh->aabb.merge_with(p_surface.aabb);