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

Merge pull request #44372 from madmiraal/rename-animation-track_remove_key_at

Browse source 
Rename Animation::track_remove_key_at_position to track_remove_key_at_time
This commit is contained in:
Rémi Verschelde 2020-12-15 13:42:54 +01:00 committed by GitHub
commit 6ccc6b6e28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/classes/Animation.xml
View file

@ -514,15 +514,15 @@
Removes a key by index in a given track. Removes a key by index in a given track.
</description> </description>
</method> </method>
<method name="track_remove_key_at_position"> <method name="track_remove_key_at_time">
<return type="void"> <return type="void">
</return> </return>
<argument index="0" name="track_idx" type="int"> <argument index="0" name="track_idx" type="int">
</argument> </argument>
<argument index="1" name="position" type="float"> <argument index="1" name="time" type="float">
</argument> </argument>
<description> <description>
Removes a key by position (seconds) in a given track. Removes a key at [code]time[/code] in a given track.
</description> </description>
</method> </method>
<method name="track_set_enabled"> <method name="track_set_enabled">

6
scene/resources/animation.cpp
View file

@ -810,8 +810,8 @@ int Animation::transform_track_insert_key(int p_track, float p_time, const Vecto
return ret; return ret;
} }
void Animation::track_remove_key_at_position(int p_track, float p_pos) { void Animation::track_remove_key_at_time(int p_track, float p_time) {
int idx = track_find_key(p_track, p_pos, true); int idx = track_find_key(p_track, p_time, true);
ERR_FAIL_COND(idx < 0); ERR_FAIL_COND(idx < 0);
track_remove_key(p_track, idx); track_remove_key(p_track, idx);
} }
@ -2608,7 +2608,7 @@ void Animation::_bind_methods() {
ClassDB::bind_method(D_METHOD("transform_track_insert_key", "track_idx", "time", "location", "rotation", "scale"), &Animation::transform_track_insert_key); ClassDB::bind_method(D_METHOD("transform_track_insert_key", "track_idx", "time", "location", "rotation", "scale"), &Animation::transform_track_insert_key);
ClassDB::bind_method(D_METHOD("track_insert_key", "track_idx", "time", "key", "transition"), &Animation::track_insert_key, DEFVAL(1)); ClassDB::bind_method(D_METHOD("track_insert_key", "track_idx", "time", "key", "transition"), &Animation::track_insert_key, DEFVAL(1));
ClassDB::bind_method(D_METHOD("track_remove_key", "track_idx", "key_idx"), &Animation::track_remove_key); ClassDB::bind_method(D_METHOD("track_remove_key", "track_idx", "key_idx"), &Animation::track_remove_key);
ClassDB::bind_method(D_METHOD("track_remove_key_at_position", "track_idx", "position"), &Animation::track_remove_key_at_position); ClassDB::bind_method(D_METHOD("track_remove_key_at_time", "track_idx", "time"), &Animation::track_remove_key_at_time);
ClassDB::bind_method(D_METHOD("track_set_key_value", "track_idx", "key", "value"), &Animation::track_set_key_value); ClassDB::bind_method(D_METHOD("track_set_key_value", "track_idx", "key", "value"), &Animation::track_set_key_value);
ClassDB::bind_method(D_METHOD("track_set_key_transition", "track_idx", "key_idx", "transition"), &Animation::track_set_key_transition); ClassDB::bind_method(D_METHOD("track_set_key_transition", "track_idx", "key_idx", "transition"), &Animation::track_set_key_transition);
ClassDB::bind_method(D_METHOD("track_set_key_time", "track_idx", "key_idx", "time"), &Animation::track_set_key_time); ClassDB::bind_method(D_METHOD("track_set_key_time", "track_idx", "key_idx", "time"), &Animation::track_set_key_time);

2
scene/resources/animation.h
View file

@ -293,7 +293,7 @@ public:
void track_set_key_time(int p_track, int p_key_idx, float p_time); void track_set_key_time(int p_track, int p_key_idx, float p_time);
int track_find_key(int p_track, float p_time, bool p_exact = false) const; int track_find_key(int p_track, float p_time, bool p_exact = false) const;
void track_remove_key(int p_track, int p_idx); void track_remove_key(int p_track, int p_idx);
void track_remove_key_at_position(int p_track, float p_pos); void track_remove_key_at_time(int p_track, float p_time);
int track_get_key_count(int p_track) const; int track_get_key_count(int p_track) const;
Variant track_get_key_value(int p_track, int p_key_idx) const; Variant track_get_key_value(int p_track, int p_key_idx) const;
float track_get_key_time(int p_track, int p_key_idx) const; float track_get_key_time(int p_track, int p_key_idx) const;