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

Small fixes

This commit is contained in:
Juan Linietsky 2018-06-29 09:13:20 -03:00
parent b7f17a100d
commit 0ffec7daf7
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scene/animation/animation_player.cpp
View File

@ -419,14 +419,26 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
pa->capture = pa->object->get_indexed(pa->subpath); pa->capture = pa->object->get_indexed(pa->subpath);
} }
if (a->track_get_key_count(i) == 0) int key_count = a->track_get_key_count(i);
if (key_count == 0)
continue; //eeh not worth it continue; //eeh not worth it
float first_key_time = a->track_get_key_time(i, 0); float first_key_time = a->track_get_key_time(i, 0);
float transition = 1.0;
int first_key = 0;
if (first_key_time == 0.0) {
//ignore, use for transition
if (key_count == 1)
continue; //with one key we cant do anything
transition = a->track_get_key_transition(i, 0);
first_key_time = a->track_get_key_time(i, 1);
first_key = 1;
}
if (p_time < first_key_time) { if (p_time < first_key_time) {
float c = p_time / first_key_time; float c = Math::ease(p_time / first_key_time, transition);
Variant first_value = a->track_get_key_value(i, 0); Variant first_value = a->track_get_key_value(i, first_key);
Variant interp_value; Variant interp_value;
Variant::interpolate(pa->capture, first_value, c, interp_value); Variant::interpolate(pa->capture, first_value, c, interp_value);

4
scene/animation/animation_tree.cpp
View File

@ -1287,6 +1287,10 @@ void AnimationTree::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_root_motion_track", "path"), &AnimationTree::set_root_motion_track); ClassDB::bind_method(D_METHOD("set_root_motion_track", "path"), &AnimationTree::set_root_motion_track);
ClassDB::bind_method(D_METHOD("get_root_motion_track"), &AnimationTree::get_root_motion_track); ClassDB::bind_method(D_METHOD("get_root_motion_track"), &AnimationTree::get_root_motion_track);
ClassDB::bind_method(D_METHOD("get_root_motion_transform"), &AnimationTree::get_root_motion_transform);
ClassDB::bind_method(D_METHOD("_node_removed"), &AnimationTree::_node_removed); ClassDB::bind_method(D_METHOD("_node_removed"), &AnimationTree::_node_removed);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "tree_root", PROPERTY_HINT_RESOURCE_TYPE, "AnimationRootNode", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_DO_NOT_SHARE_ON_DUPLICATE), "set_tree_root", "get_tree_root"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "tree_root", PROPERTY_HINT_RESOURCE_TYPE, "AnimationRootNode", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_DO_NOT_SHARE_ON_DUPLICATE), "set_tree_root", "get_tree_root");

4
scene/resources/animation.cpp
View File

@ -134,8 +134,8 @@ bool Animation::_set(const StringName &p_name, const Variant &p_value) {
int um = d["update"]; int um = d["update"];
if (um < 0) if (um < 0)
um = 0; um = 0;
else if (um > 2) else if (um > 3)
um = 2; um = 3;
vt->update_mode = UpdateMode(um); vt->update_mode = UpdateMode(um);
} }