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

Merge pull request #34994 from fire/loop-32678

Browse source 
Use cycle and loop hint flags in glTF2.
This commit is contained in:
Rémi Verschelde 2020-01-10 23:55:47 +01:00 committed by GitHub
commit 1fe56e2bfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
editor/import/editor_scene_importer_gltf.cpp
View file

@ -2329,7 +2329,11 @@ Error EditorSceneImporterGLTF::_parse_animations(GLTFState &state) {
Array samplers = d["samplers"]; Array samplers = d["samplers"];
if (d.has("name")) { if (d.has("name")) {
animation.name = _sanitize_scene_name(d["name"]); String name = d["name"];
if (name.begins_with("loop") || name.ends_with("loop") || name.begins_with("cycle") || name.ends_with("cycle")) {
animation.loop = true;
}
animation.name = _sanitize_scene_name(name);
} }
for (int j = 0; j < channels.size(); j++) { for (int j = 0; j < channels.size(); j++) {
@ -2735,6 +2739,10 @@ void EditorSceneImporterGLTF::_import_animation(GLTFState &state, AnimationPlaye
animation.instance(); animation.instance();
animation->set_name(name); animation->set_name(name);
if (anim.loop) {
animation->set_loop(true);
}
float length = 0; float length = 0;
for (Map<int, GLTFAnimation::Track>::Element *E = anim.tracks.front(); E; E = E->next()) { for (Map<int, GLTFAnimation::Track>::Element *E = anim.tracks.front(); E; E = E->next()) {

1
editor/import/editor_scene_importer_gltf.h
View file

@ -262,6 +262,7 @@ class EditorSceneImporterGLTF : public EditorSceneImporter {
}; };
struct GLTFAnimation { struct GLTFAnimation {
bool loop = false;
enum Interpolation { enum Interpolation {
INTERP_LINEAR, INTERP_LINEAR,