gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-05 05:18:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #74416 from SlugFiller/fix-skeleton2d-aabb

Browse source 
Fix AABB calculation for meshes using Skeleton2D
This commit is contained in:
Rémi Verschelde 2023-03-08 08:56:12 +01:00
parent 1a5239ff1e 06a1fe0364
commit a0ff87f48d
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -327,6 +327,7 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface)
} else {
mesh->aabb.merge_with(p_surface.aabb);
}
mesh->skeleton_aabb_version = 0;
s->material = p_surface.material;
@ -541,12 +542,12 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
Transform3D mtx;
mtx.basis.rows[0].x = dataptr[0];
mtx.basis.rows[1].x = dataptr[1];
mtx.basis.rows[0][0] = dataptr[0];
mtx.basis.rows[0][1] = dataptr[1];
mtx.origin.x = dataptr[3];
mtx.basis.rows[0].y = dataptr[4];
mtx.basis.rows[1].y = dataptr[5];
mtx.basis.rows[1][0] = dataptr[4];
mtx.basis.rows[1][1] = dataptr[5];
mtx.origin.y = dataptr[7];
AABB baabb = mtx.xform(skbones[j]);
@ -1438,12 +1439,12 @@ void MeshStorage::_multimesh_re_create_aabb(MultiMesh *multimesh, const float *p
t.origin.z = data[11];
} else {
t.basis.rows[0].x = data[0];
t.basis.rows[1].x = data[1];
t.basis.rows[0][0] = data[0];
t.basis.rows[0][1] = data[1];
t.origin.x = data[3];
t.basis.rows[0].y = data[4];
t.basis.rows[1].y = data[5];
t.basis.rows[1][0] = data[4];
t.basis.rows[1][1] = data[5];
t.origin.y = data[7];
}

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

@ -438,6 +438,7 @@ void MeshStorage::mesh_add_surface(RID p_mesh, const RS::SurfaceData &p_surface)
} else {
mesh->aabb.merge_with(p_surface.aabb);
}
mesh->skeleton_aabb_version = 0;
s->material = p_surface.material;
@ -634,12 +635,12 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
Transform3D mtx;
mtx.basis.rows[0].x = dataptr[0];
mtx.basis.rows[1].x = dataptr[1];
mtx.basis.rows[0][0] = dataptr[0];
mtx.basis.rows[0][1] = dataptr[1];
mtx.origin.x = dataptr[3];
mtx.basis.rows[0].y = dataptr[4];
mtx.basis.rows[1].y = dataptr[5];
mtx.basis.rows[1][0] = dataptr[4];
mtx.basis.rows[1][1] = dataptr[5];
mtx.origin.y = dataptr[7];
AABB baabb = mtx.xform(skbones[j]);
@ -1501,12 +1502,12 @@ void MeshStorage::_multimesh_re_create_aabb(MultiMesh *multimesh, const float *p
t.origin.z = data[11];
} else {
t.basis.rows[0].x = data[0];
t.basis.rows[1].x = data[1];
t.basis.rows[0][0] = data[0];
t.basis.rows[0][1] = data[1];
t.origin.x = data[3];
t.basis.rows[0].y = data[4];
t.basis.rows[1].y = data[5];
t.basis.rows[1][0] = data[4];
t.basis.rows[1][1] = data[5];
t.origin.y = data[7];
}