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

Merge pull request #94783 from TokageItLab/validate-gltf-anim-name 

Add validation to glTF importer for Blendshape and Animation
This commit is contained in:
Rémi Verschelde 2024-09-12 09:25:10 +02:00
parent 23e51c3cb5 0235086c14
commit b9b07d619f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/fbx/fbx_document.cpp
View File

@ -288,14 +288,8 @@ String FBXDocument::_gen_unique_name(HashSet<String> &unique_names, const String
} }
String FBXDocument::_sanitize_animation_name(const String &p_name) { String FBXDocument::_sanitize_animation_name(const String &p_name) {
// Animations disallow the normal node invalid characters as well as "," and "["
// (See animation/animation_player.cpp::add_animation)
// TODO: Consider adding invalid_characters or a validate_animation_name to animation_player to mirror Node.
String anim_name = p_name.validate_node_name(); String anim_name = p_name.validate_node_name();
anim_name = anim_name.replace(",", ""); return AnimationLibrary::validate_library_name(anim_name);
anim_name = anim_name.replace("[", "");
return anim_name;
} }
String FBXDocument::_gen_unique_animation_name(Ref<FBXState> p_state, const String &p_name) { String FBXDocument::_gen_unique_animation_name(Ref<FBXState> p_state, const String &p_name) {

8
modules/gltf/gltf_document.cpp
View File

@ -491,14 +491,8 @@ String GLTFDocument::_gen_unique_name(Ref<GLTFState> p_state, const String &p_na
} }
String GLTFDocument::_sanitize_animation_name(const String &p_name) { String GLTFDocument::_sanitize_animation_name(const String &p_name) {
// Animations disallow the normal node invalid characters as well as "," and "["
// (See animation/animation_player.cpp::add_animation)
// TODO: Consider adding invalid_characters or a validate_animation_name to animation_player to mirror Node.
String anim_name = p_name.validate_node_name(); String anim_name = p_name.validate_node_name();
anim_name = anim_name.replace(",", ""); return AnimationLibrary::validate_library_name(anim_name);
anim_name = anim_name.replace("[", "");
return anim_name;
} }
String GLTFDocument::_gen_unique_animation_name(Ref<GLTFState> p_state, const String &p_name) { String GLTFDocument::_gen_unique_animation_name(Ref<GLTFState> p_state, const String &p_name) {

12
scene/resources/3d/importer_mesh.cpp
View File

@ -34,6 +34,7 @@
#include "core/math/convex_hull.h" #include "core/math/convex_hull.h"
#include "core/math/random_pcg.h" #include "core/math/random_pcg.h"
#include "core/math/static_raycaster.h" #include "core/math/static_raycaster.h"
#include "scene/resources/animation_library.h"
#include "scene/resources/surface_tool.h" #include "scene/resources/surface_tool.h"
#include <cstdint> #include <cstdint>
@ -134,9 +135,18 @@ void ImporterMesh::Surface::_split_normals(Array &r_arrays, const LocalVector<in
} }
} }
String ImporterMesh::validate_blend_shape_name(const String &p_name) {
String name = p_name;
const char *characters = ":";
for (const char *p = characters; *p; p++) {
name = name.replace(String::chr(*p), "_");
}
return name;
}
void ImporterMesh::add_blend_shape(const String &p_name) { void ImporterMesh::add_blend_shape(const String &p_name) {
ERR_FAIL_COND(surfaces.size() > 0); ERR_FAIL_COND(surfaces.size() > 0);
blend_shapes.push_back(p_name); blend_shapes.push_back(validate_blend_shape_name(p_name));
} }
int ImporterMesh::get_blend_shape_count() const { int ImporterMesh::get_blend_shape_count() const {

2
scene/resources/3d/importer_mesh.h
View File

@ -95,6 +95,8 @@ public:
int get_blend_shape_count() const; int get_blend_shape_count() const;
String get_blend_shape_name(int p_blend_shape) const; String get_blend_shape_name(int p_blend_shape) const;
static String validate_blend_shape_name(const String &p_name);
void add_surface(Mesh::PrimitiveType p_primitive, const Array &p_arrays, const TypedArray<Array> &p_blend_shapes = Array(), const Dictionary &p_lods = Dictionary(), const Ref<Material> &p_material = Ref<Material>(), const String &p_name = String(), const uint64_t p_flags = 0); void add_surface(Mesh::PrimitiveType p_primitive, const Array &p_arrays, const TypedArray<Array> &p_blend_shapes = Array(), const Dictionary &p_lods = Dictionary(), const Ref<Material> &p_material = Ref<Material>(), const String &p_name = String(), const uint64_t p_flags = 0);
int get_surface_count() const; int get_surface_count() const;