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

gltf: Allow more than 4 joints but warn and ignore them.

Browse source
This commit is contained in:
Lyuma 2022-06-10 12:39:44 -07:00
parent 4f133d2d72
commit 7d970b967e
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/gltf/gltf_document.cpp
View file

@ -2620,6 +2620,7 @@ Error GLTFDocument::_parse_meshes(Ref<GLTFState> state) {
return OK; return OK;
} }
bool has_warned = false;
Array meshes = state->json["meshes"]; Array meshes = state->json["meshes"];
for (GLTFMeshIndex i = 0; i < meshes.size(); i++) { for (GLTFMeshIndex i = 0; i < meshes.size(); i++) {
print_verbose("glTF: Parsing mesh: " + itos(i)); print_verbose("glTF: Parsing mesh: " + itos(i));
@ -2692,11 +2693,16 @@ Error GLTFDocument::_parse_meshes(Ref<GLTFState> state) {
array[Mesh::ARRAY_COLOR] = _decode_accessor_as_color(state, a["COLOR_0"], true); array[Mesh::ARRAY_COLOR] = _decode_accessor_as_color(state, a["COLOR_0"], true);
has_vertex_color = true; has_vertex_color = true;
} }
if (a.has("JOINTS_0") && !a.has("JOINTS_1")) { if (a.has("JOINTS_0")) {
array[Mesh::ARRAY_BONES] = _decode_accessor_as_ints(state, a["JOINTS_0"], true); array[Mesh::ARRAY_BONES] = _decode_accessor_as_ints(state, a["JOINTS_0"], true);
} }
ERR_CONTINUE(a.has("JOINTS_0") && a.has("JOINTS_1")); if (a.has("WEIGHTS_1") && a.has("JOINTS_1")) {
if (a.has("WEIGHTS_0") && !a.has("WEIGHTS_1")) { if (!has_warned) {
WARN_PRINT("glTF: Meshes use more than 4 bone joints");
has_warned = true;
}
}
if (a.has("WEIGHTS_0")) {
Vector<float> weights = _decode_accessor_as_floats(state, a["WEIGHTS_0"], true); Vector<float> weights = _decode_accessor_as_floats(state, a["WEIGHTS_0"], true);
{ //gltf does not seem to normalize the weights for some reason.. { //gltf does not seem to normalize the weights for some reason..
int wc = weights.size(); int wc = weights.size();
@ -2718,7 +2724,6 @@ Error GLTFDocument::_parse_meshes(Ref<GLTFState> state) {
} }
array[Mesh::ARRAY_WEIGHTS] = weights; array[Mesh::ARRAY_WEIGHTS] = weights;
} }
ERR_CONTINUE(a.has("WEIGHTS_0") && a.has("WEIGHTS_1"));
if (p.has("indices")) { if (p.has("indices")) {
Vector<int> indices = _decode_accessor_as_ints(state, p["indices"], false); Vector<int> indices = _decode_accessor_as_ints(state, p["indices"], false);