godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Skeletons are working now.

Browse Source
This commit is contained in:
Juan Linietsky
2016-11-21 19:03:39 -03:00
parent a2505542ff
commit 70d095d8f2
8 changed files with 305 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
servers/visual_server.cpp
View File

@@ -1007,12 +1007,26 @@ void VisualServer::mesh_add_surface_from_arrays(RID p_mesh,PrimitiveType p_primi
} break;
case VS::ARRAY_BONES: {
if (p_compress_format&ARRAY_FLAG_USE_16_BIT_BONES) {
elem_size=sizeof(uint32_t);
} else {
elem_size=sizeof(uint16_t)*4;
DVector<int> bones = p_arrays[VS::ARRAY_BONES];
int max_bone=0;
{
int bc = bones.size();
DVector<int>::Read r=bones.read();
for(int j=0;j<bc;j++) {
max_bone=MAX(r[j],max_bone);
}
}
if (max_bone > 255) {
p_compress_format|=ARRAY_FLAG_USE_16_BIT_BONES;
elem_size=sizeof(uint16_t)*4;
} else {
p_compress_format&=~ARRAY_FLAG_USE_16_BIT_BONES;
elem_size=sizeof(uint32_t);
}
} break;
case VS::ARRAY_INDEX: {
@@ -1043,7 +1057,7 @@ void VisualServer::mesh_add_surface_from_arrays(RID p_mesh,PrimitiveType p_primi
}
uint32_t mask = (1<<ARRAY_MAX)-1;
format|=~mask&p_compress_format; //make the full format
format|=(~mask)&p_compress_format; //make the full format
int array_size = total_elem_size * array_len;