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

Fix `SpriteFrames` data loss on 3-to-4 conversion

This commit is contained in:
Danil Alexeev 2023-02-22 10:45:00 +03:00
parent e13fae1414
commit d49ac0466f
No known key found for this signature in database
GPG Key ID: 124453E157DA8DC7
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/classes/SpriteFrames.xml
View File

@ -73,9 +73,9 @@
<description> <description>
Returns a relative duration of the frame [param idx] in the [param anim] animation (defaults to [code]1.0[/code]). For example, a frame with a duration of [code]2.0[/code] is displayed twice as long as a frame with a duration of [code]1.0[/code]. You can calculate the absolute duration (in seconds) of a frame using the following formula: Returns a relative duration of the frame [param idx] in the [param anim] animation (defaults to [code]1.0[/code]). For example, a frame with a duration of [code]2.0[/code] is displayed twice as long as a frame with a duration of [code]1.0[/code]. You can calculate the absolute duration (in seconds) of a frame using the following formula:
[codeblock] [codeblock]
absolute_duration = relative_duration / (animation_fps * abs(speed_scale)) absolute_duration = relative_duration / (animation_fps * abs(playing_speed))
[/codeblock] [/codeblock]
In this example, [code]speed_scale[/code] refers to either [member AnimatedSprite2D.speed_scale] or [member AnimatedSprite3D.speed_scale]. In this example, [code]playing_speed[/code] refers to either [method AnimatedSprite2D.get_playing_speed] or [method AnimatedSprite3D.get_playing_speed].
</description> </description>
</method> </method>
<method name="get_frame_texture" qualifiers="const"> <method name="get_frame_texture" qualifiers="const">

2
editor/renames_map_3_to_4.cpp
View File

@ -1174,7 +1174,7 @@ const char *RenamesMap3To4::gdscript_properties_renames[][2] = {
{ "unit_db", "volume_db" }, // AudioStreamPlayer3D { "unit_db", "volume_db" }, // AudioStreamPlayer3D
{ "unit_offset", "progress_ratio" }, // PathFollow2D, PathFollow3D { "unit_offset", "progress_ratio" }, // PathFollow2D, PathFollow3D
{ "vseparation", "v_separation" }, // Theme { "vseparation", "v_separation" }, // Theme
{ "frames", "sprite_frames" }, // AnimatedSprite2D, AnimatedSprite3D // { "frames", "sprite_frames" }, // AnimatedSprite2D, AnimatedSprite3D -- GH-73696
{ nullptr, nullptr }, { nullptr, nullptr },
}; };

2
scene/resources/sprite_frames.cpp
View File

@ -201,6 +201,7 @@ void SpriteFrames::_set_animations(const Array &p_animations) {
anim.loop = d["loop"]; anim.loop = d["loop"];
Array frames = d["frames"]; Array frames = d["frames"];
for (int j = 0; j < frames.size(); j++) { for (int j = 0; j < frames.size(); j++) {
#ifndef DISABLE_DEPRECATED
// For compatibility. // For compatibility.
Ref<Resource> res = frames[j]; Ref<Resource> res = frames[j];
if (res.is_valid()) { if (res.is_valid()) {
@ -208,6 +209,7 @@ void SpriteFrames::_set_animations(const Array &p_animations) {
anim.frames.push_back(frame); anim.frames.push_back(frame);
continue; continue;
} }
#endif
Dictionary f = frames[j]; Dictionary f = frames[j];