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

Merge pull request #68770 from TokageItLab/add-track-validator

Browse source 
Add track validator to AnimationPlayerEditor to detect tracks which have error
This commit is contained in:
Rémi Verschelde 2022-12-05 00:06:06 +01:00
commit 408bd0aa92
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 53 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
editor/plugins/animation_player_editor_plugin.cpp
View file

@ -199,6 +199,7 @@ void AnimationPlayerEditor::_play_pressed() {
if (current == player->get_assigned_animation()) { if (current == player->get_assigned_animation()) {
player->stop(); //so it won't blend with itself player->stop(); //so it won't blend with itself
} }
ERR_FAIL_COND_EDMSG(!_validate_tracks(player->get_animation(current)), "Animation tracks may have any invalid key, abort playing.");
player->play(current); player->play(current);
} }
@ -211,11 +212,10 @@ void AnimationPlayerEditor::_play_from_pressed() {
if (!current.is_empty()) { if (!current.is_empty()) {
float time = player->get_current_animation_position(); float time = player->get_current_animation_position();
if (current == player->get_assigned_animation() && player->is_playing()) { if (current == player->get_assigned_animation() && player->is_playing()) {
player->stop(); //so it won't blend with itself player->stop(); //so it won't blend with itself
} }
ERR_FAIL_COND_EDMSG(!_validate_tracks(player->get_animation(current)), "Animation tracks may have any invalid key, abort playing.");
player->play(current); player->play(current);
player->seek(time); player->seek(time);
} }
@ -237,6 +237,7 @@ void AnimationPlayerEditor::_play_bw_pressed() {
if (current == player->get_assigned_animation()) { if (current == player->get_assigned_animation()) {
player->stop(); //so it won't blend with itself player->stop(); //so it won't blend with itself
} }
ERR_FAIL_COND_EDMSG(!_validate_tracks(player->get_animation(current)), "Animation tracks may have any invalid key, abort playing.");
player->play(current, -1, -1, true); player->play(current, -1, -1, true);
} }
@ -252,7 +253,7 @@ void AnimationPlayerEditor::_play_bw_from_pressed() {
if (current == player->get_assigned_animation()) { if (current == player->get_assigned_animation()) {
player->stop(); //so it won't blend with itself player->stop(); //so it won't blend with itself
} }
ERR_FAIL_COND_EDMSG(!_validate_tracks(player->get_animation(current)), "Animation tracks may have any invalid key, abort playing.");
player->play(current, -1, -1, true); player->play(current, -1, -1, true);
player->seek(time); player->seek(time);
} }
@ -1564,6 +1565,53 @@ void AnimationPlayerEditor::_pin_pressed() {
SceneTreeDock::get_singleton()->get_tree_editor()->update_tree(); SceneTreeDock::get_singleton()->get_tree_editor()->update_tree();
} }
bool AnimationPlayerEditor::_validate_tracks(const Ref<Animation> p_anim) {
bool is_valid = true;
if (!p_anim.is_valid()) {
return true; // There is a problem outside of the animation track.
}
int len = p_anim->get_track_count();
for (int i = 0; i < len; i++) {
Animation::TrackType ttype = p_anim->track_get_type(i);
if (ttype == Animation::TYPE_ROTATION_3D) {
int key_len = p_anim->track_get_key_count(i);
for (int j = 0; j < key_len; j++) {
Quaternion q;
p_anim->rotation_track_get_key(i, j, &q);
ERR_BREAK_EDMSG(!q.is_normalized(), "AnimationPlayer: '" + player->get_name() + "', Animation: '" + player->get_current_animation() + "', rotation track: '" + p_anim->track_get_path(i) + "' contains unnormalized Quaternion key.");
}
} else if (ttype == Animation::TYPE_VALUE) {
int key_len = p_anim->track_get_key_count(i);
if (key_len == 0) {
continue;
}
switch (p_anim->track_get_key_value(i, 0).get_type()) {
case Variant::QUATERNION: {
for (int j = 0; j < key_len; j++) {
Quaternion q = Quaternion(p_anim->track_get_key_value(i, j));
if (!q.is_normalized()) {
is_valid = false;
ERR_BREAK_EDMSG(true, "AnimationPlayer: '" + player->get_name() + "', Animation: '" + player->get_current_animation() + "', value track: '" + p_anim->track_get_path(i) + "' contains unnormalized Quaternion key.");
}
}
} break;
case Variant::TRANSFORM3D: {
for (int j = 0; j < key_len; j++) {
Transform3D t = Transform3D(p_anim->track_get_key_value(i, j));
if (!t.basis.orthonormalized().is_rotation()) {
is_valid = false;
ERR_BREAK_EDMSG(true, "AnimationPlayer: '" + player->get_name() + "', Animation: '" + player->get_current_animation() + "', value track: '" + p_anim->track_get_path(i) + "' contains corrupted basis (some axes are too close other axis or scaled by zero) Transform3D key.");
}
}
} break;
default: {
} break;
}
}
}
return is_valid;
}
void AnimationPlayerEditor::_bind_methods() { void AnimationPlayerEditor::_bind_methods() {
ClassDB::bind_method(D_METHOD("_animation_new"), &AnimationPlayerEditor::_animation_new); ClassDB::bind_method(D_METHOD("_animation_new"), &AnimationPlayerEditor::_animation_new);
ClassDB::bind_method(D_METHOD("_animation_rename"), &AnimationPlayerEditor::_animation_rename); ClassDB::bind_method(D_METHOD("_animation_rename"), &AnimationPlayerEditor::_animation_rename);

2
editor/plugins/animation_player_editor_plugin.h
View file

@ -212,6 +212,8 @@ class AnimationPlayerEditor : public VBoxContainer {
void _start_onion_skinning(); void _start_onion_skinning();
void _stop_onion_skinning(); void _stop_onion_skinning();
bool _validate_tracks(const Ref<Animation> p_anim);
void _pin_pressed(); void _pin_pressed();
String _get_current() const; String _get_current() const;