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

Merge pull request #607 from TheoXD/_reimport_anim_merge

Browse source 
Merge animations during reimport
This commit is contained in:
Juan Linietsky 2014-09-17 10:01:18 -03:00
commit 2f79107b9a
1 changed files with 60 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
tools/editor/io_plugins/editor_scene_import_plugin.cpp
View file

@ -1548,22 +1548,74 @@ void EditorSceneImportPlugin::_merge_existing_node(Node *p_node,Node *p_imported
skeleton_node->add_bone(skeleton_imported->get_bone_name(i)); skeleton_node->add_bone(skeleton_imported->get_bone_name(i));
skeleton_node->set_bone_parent(i,skeleton_imported->get_bone_parent(i)); skeleton_node->set_bone_parent(i,skeleton_imported->get_bone_parent(i));
skeleton_node->set_bone_rest(i,skeleton_imported->get_bone_rest(i)); skeleton_node->set_bone_rest(i,skeleton_imported->get_bone_rest(i));
skeleton_node->set_bone_pose(i,skeleton_imported->get_bone_pose(i)); //skeleton_node->set_bone_pose(i,skeleton_imported->get_bone_pose(i)); // not in a scene, will throw errors
} }
} else if (p_node->get_type()=="AnimationPlayer") { }
else if (p_node->get_type() == "AnimationPlayer") {
//for paths, overwrite path //for paths, overwrite path
AnimationPlayer *aplayer_imported = imported_node->cast_to<AnimationPlayer>();
AnimationPlayer *aplayer_imported =imported_node->cast_to<AnimationPlayer>(); AnimationPlayer *aplayer_node = p_node->cast_to<AnimationPlayer>();
AnimationPlayer *aplayer_node =p_node->cast_to<AnimationPlayer>();
//use imported bones, obviously //use imported bones, obviously
List<StringName> anims; List<StringName> anims;
List<StringName> existing_anims;
aplayer_imported->get_animation_list(&anims); aplayer_imported->get_animation_list(&anims);
//use imported animations, could merge some stuff though aplayer_node->get_animation_list(&existing_anims);
for (List<StringName>::Element *E=anims.front();E;E=E->next()) {
//use imported animations
for (List<StringName>::Element *N = anims.front(); N; N = N->next()) {
aplayer_node->add_animation(E->get(),aplayer_imported->get_animation(E->get())); Ref<Animation> candidate = aplayer_imported->get_animation(N->get());
if (aplayer_node->has_animation(N->get())) {
Ref<Animation> found = aplayer_node->get_animation(N->get());
candidate->set_loop(found->has_loop());
candidate->set_step(found->get_step());
//For each track candidate
for (int i = 0; i < candidate->get_track_count(); i++) {
NodePath track_path = candidate->track_get_path(i);
// For each track existing
for (int x = 0; x < found->get_track_count(); x++) {
NodePath path_to_compare = found->track_get_path(x);
if (track_path.hash() == path_to_compare.hash() && candidate->track_get_type(x) == found->track_get_type(i)) {
//Tracks matches
if (candidate->track_get_interpolation_type(i) != found->track_get_interpolation_type(x))
candidate->track_set_interpolation_type(i, found->track_get_interpolation_type(x));
if (candidate->track_get_type(i) == Animation::TYPE_VALUE && candidate->value_track_is_continuous(i) != found->value_track_is_continuous(x))
candidate->value_track_set_continuous(i, found->value_track_is_continuous(x));
//Key transitions might have changed, but the animation remained unchanged
if (candidate->track_get_key_count(i) == found->track_get_key_count(x)) {
for (int k = 0; k < candidate->track_get_key_count(i); k++) {
if (candidate->track_get_key_transition(i, k) != found->track_get_key_transition(x, k))
candidate->track_set_key_transition(i, k, found->track_get_key_transition(x, k));
}
}
}
}
}
// Append function callbacks and values
for (int x = 0; x < found->get_track_count(); x++) {
if (found->track_get_type(x) == Animation::TYPE_METHOD || found->track_get_type(x) == Animation::TYPE_VALUE)
candidate->add_track(found->track_get_type(x), candidate->get_track_count());
for (int k = 0; k < found->track_get_key_count(x); k++)
candidate->track_insert_key(x, found->track_get_key_time(x, k), found->track_get_key_value(x, k), found->track_get_key_transition(x, k));
}
}
aplayer_node->add_animation(N->get(), candidate);
} }
} else if (p_node->get_type()=="CollisionShape") { } else if (p_node->get_type()=="CollisionShape") {