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

Ensure bone AABBs are properly transformed to affect mesh AABB, fixes #19281

Browse source
This commit is contained in:
Juan Linietsky 2018-11-19 10:42:27 -03:00
parent 5d152cc42d
commit 634aa4fc24
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/gles3/rasterizer_storage_gles3.cpp
View file

@ -3787,12 +3787,14 @@ AABB RasterizerStorageGLES3::mesh_get_aabb(RID p_mesh, RID p_skeleton) const {
Mesh *mesh = mesh_owner.get(p_mesh); Mesh *mesh = mesh_owner.get(p_mesh);
ERR_FAIL_COND_V(!mesh, AABB()); ERR_FAIL_COND_V(!mesh, AABB());
if (mesh->custom_aabb != AABB()) if (mesh->custom_aabb != AABB()) {
return mesh->custom_aabb; return mesh->custom_aabb;
}
Skeleton *sk = NULL; Skeleton *sk = NULL;
if (p_skeleton.is_valid()) if (p_skeleton.is_valid()) {
sk = skeleton_owner.get(p_skeleton); sk = skeleton_owner.get(p_skeleton);
}
AABB aabb; AABB aabb;
@ -3831,6 +3833,7 @@ AABB RasterizerStorageGLES3::mesh_get_aabb(RID p_mesh, RID p_skeleton) const {
mtx.origin.y = texture[base_ofs + 3]; mtx.origin.y = texture[base_ofs + 3];
AABB baabb = mtx.xform(skbones[j]); AABB baabb = mtx.xform(skbones[j]);
if (first) { if (first) {
laabb = baabb; laabb = baabb;
first = false; first = false;
@ -3863,6 +3866,8 @@ AABB RasterizerStorageGLES3::mesh_get_aabb(RID p_mesh, RID p_skeleton) const {
mtx.basis[2].z = texture[base_ofs + 2]; mtx.basis[2].z = texture[base_ofs + 2];
mtx.origin.z = texture[base_ofs + 3]; mtx.origin.z = texture[base_ofs + 3];
print_line("surface " + itos(i) + " bone " + itos(j) + " aabb: " + skbones[j]);
AABB baabb = mtx.xform(skbones[j]); AABB baabb = mtx.xform(skbones[j]);
if (first) { if (first) {
laabb = baabb; laabb = baabb;

1
scene/resources/mesh.cpp
View file

@ -706,6 +706,7 @@ bool ArrayMesh::_get(const StringName &p_name, Variant &r_ret) const {
Vector<AABB> skel_aabb = VS::get_singleton()->mesh_surface_get_skeleton_aabb(mesh, idx); Vector<AABB> skel_aabb = VS::get_singleton()->mesh_surface_get_skeleton_aabb(mesh, idx);
Array arr; Array arr;
arr.resize(skel_aabb.size());
for (int i = 0; i < skel_aabb.size(); i++) { for (int i = 0; i < skel_aabb.size(); i++) {
arr[i] = skel_aabb[i]; arr[i] = skel_aabb[i];
} }

2
servers/visual_server.cpp
View file

@ -343,7 +343,7 @@ RID VisualServer::get_white_texture() {
#define SMALL_VEC2 Vector2(0.00001, 0.00001) #define SMALL_VEC2 Vector2(0.00001, 0.00001)
#define SMALL_VEC3 Vector3(0.00001, 0.00001, 0.00001) #define SMALL_VEC3 Vector3(0.00001, 0.00001, 0.00001)
Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_t *p_offsets, uint32_t p_stride, PoolVector<uint8_t> &r_vertex_array, int p_vertex_array_len, PoolVector<uint8_t> &r_index_array, int p_index_array_len, AABB &r_aabb, Vector<AABB> r_bone_aabb) { Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_t *p_offsets, uint32_t p_stride, PoolVector<uint8_t> &r_vertex_array, int p_vertex_array_len, PoolVector<uint8_t> &r_index_array, int p_index_array_len, AABB &r_aabb, Vector<AABB> &r_bone_aabb) {
PoolVector<uint8_t>::Write vw = r_vertex_array.write(); PoolVector<uint8_t>::Write vw = r_vertex_array.write();

2
servers/visual_server.h
View file

@ -61,7 +61,7 @@ protected:
RID white_texture; RID white_texture;
RID test_material; RID test_material;
Error _surface_set_data(Array p_arrays, uint32_t p_format, uint32_t *p_offsets, uint32_t p_stride, PoolVector<uint8_t> &r_vertex_array, int p_vertex_array_len, PoolVector<uint8_t> &r_index_array, int p_index_array_len, AABB &r_aabb, Vector<AABB> r_bone_aabb); Error _surface_set_data(Array p_arrays, uint32_t p_format, uint32_t *p_offsets, uint32_t p_stride, PoolVector<uint8_t> &r_vertex_array, int p_vertex_array_len, PoolVector<uint8_t> &r_index_array, int p_index_array_len, AABB &r_aabb, Vector<AABB> &r_bone_aabb);
static VisualServer *(*create_func)(); static VisualServer *(*create_func)();
static void _bind_methods(); static void _bind_methods();