godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47074 from fire/unlock-bone-names

Browse Source 
Expand bone name possibilities.
This commit is contained in:
Rémi Verschelde 2021-03-16 23:31:34 +01:00 committed by GitHub
commit d06a624a2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/gltf/gltf_document.cpp
View File

@ -63,7 +63,6 @@
#ifdef MODULE_GRIDMAP_ENABLED
#include "modules/gridmap/grid_map.h"
#endif // MODULE_GRIDMAP_ENABLED
#include "modules/regex/regex.h"
#include "scene/2d/node_2d.h"
#include "scene/3d/bone_attachment_3d.h"
#include "scene/3d/camera_3d.h"
@ -505,25 +504,11 @@ String GLTFDocument::_gen_unique_animation_name(Ref<GLTFState> state, const Stri
return name;
}
String GLTFDocument::_sanitize_bone_name(const String &name) {
String p_name = name.camelcase_to_underscore(true);
RegEx pattern_nocolon(":");
p_name = pattern_nocolon.sub(p_name, "_", true);
RegEx pattern_noslash("/");
p_name = pattern_noslash.sub(p_name, "_", true);
RegEx pattern_nospace(" +");
p_name = pattern_nospace.sub(p_name, "_", true);
RegEx pattern_multiple("_+");
p_name = pattern_multiple.sub(p_name, "_", true);
RegEx pattern_padded("0+(\\d+)");
p_name = pattern_padded.sub(p_name, "$1", true);
return p_name;
String GLTFDocument::_sanitize_bone_name(const String &p_name) {
String name = p_name;
name = name.replace(":", "_");
name = name.replace("/", "_");
return name;
}
String GLTFDocument::_gen_unique_bone_name(Ref<GLTFState> state, const GLTFSkeletonIndex skel_i, const String &p_name) {