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

Merge pull request #62978 from akien-mga/spriteframes-sort-anims-alphabetically

This commit is contained in:
Rémi Verschelde 2022-07-13 17:17:15 +02:00 committed by GitHub
parent dc5a6362c1 4639050c64
commit 98d5b37a4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/classes/SpriteFrames.xml
View File

@ -130,9 +130,4 @@
</description> </description>
</method> </method>
</methods> </methods>
<members>
<member name="frames" type="Array" setter="_set_frames" getter="_get_frames">
Compatibility property, always equals to an empty array.
</member>
</members>
</class> </class>

51
scene/resources/sprite_frames.cpp
View File

@ -96,17 +96,6 @@ void SpriteFrames::rename_animation(const StringName &p_prev, const StringName &
animations[p_next] = anim; animations[p_next] = anim;
} }
Vector<String> SpriteFrames::_get_animation_list() const {
Vector<String> ret;
List<StringName> al;
get_animation_list(&al);
for (const StringName &E : al) {
ret.push_back(E);
}
return ret;
}
void SpriteFrames::get_animation_list(List<StringName> *r_animations) const { void SpriteFrames::get_animation_list(List<StringName> *r_animations) const {
for (const KeyValue<StringName, Anim> &E : animations) { for (const KeyValue<StringName, Anim> &E : animations) {
r_animations->push_back(E.key); r_animations->push_back(E.key);
@ -147,31 +136,22 @@ bool SpriteFrames::get_animation_loop(const StringName &p_anim) const {
return E->value.loop; return E->value.loop;
} }
void SpriteFrames::_set_frames(const Array &p_frames) {
clear_all();
HashMap<StringName, Anim>::Iterator E = animations.find(SceneStringNames::get_singleton()->_default);
ERR_FAIL_COND(!E);
E->value.frames.resize(p_frames.size());
for (int i = 0; i < E->value.frames.size(); i++) {
E->value.frames.write[i] = p_frames[i];
}
}
Array SpriteFrames::_get_frames() const {
return Array();
}
Array SpriteFrames::_get_animations() const { Array SpriteFrames::_get_animations() const {
Array anims; Array anims;
for (const KeyValue<StringName, Anim> &E : animations) {
List<StringName> sorted_names;
get_animation_list(&sorted_names);
sorted_names.sort_custom<StringName::AlphCompare>();
for (const StringName &name : sorted_names) {
const Anim &anim = animations[name];
Dictionary d; Dictionary d;
d["name"] = E.key; d["name"] = name;
d["speed"] = E.value.speed; d["speed"] = anim.speed;
d["loop"] = E.value.loop; d["loop"] = anim.loop;
Array frames; Array frames;
for (int i = 0; i < E.value.frames.size(); i++) { for (int i = 0; i < anim.frames.size(); i++) {
frames.push_back(E.value.frames[i]); frames.push_back(anim.frames[i]);
} }
d["frames"] = frames; d["frames"] = frames;
anims.push_back(d); anims.push_back(d);
@ -225,15 +205,12 @@ void SpriteFrames::_bind_methods() {
ClassDB::bind_method(D_METHOD("clear", "anim"), &SpriteFrames::clear); ClassDB::bind_method(D_METHOD("clear", "anim"), &SpriteFrames::clear);
ClassDB::bind_method(D_METHOD("clear_all"), &SpriteFrames::clear_all); ClassDB::bind_method(D_METHOD("clear_all"), &SpriteFrames::clear_all);
ClassDB::bind_method(D_METHOD("_set_frames"), &SpriteFrames::_set_frames); // `animations` property is for serialization.
ClassDB::bind_method(D_METHOD("_get_frames"), &SpriteFrames::_get_frames);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "frames", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "_set_frames", "_get_frames"); //compatibility
ClassDB::bind_method(D_METHOD("_set_animations"), &SpriteFrames::_set_animations); ClassDB::bind_method(D_METHOD("_set_animations"), &SpriteFrames::_set_animations);
ClassDB::bind_method(D_METHOD("_get_animations"), &SpriteFrames::_get_animations); ClassDB::bind_method(D_METHOD("_get_animations"), &SpriteFrames::_get_animations);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "animations", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_animations", "_get_animations"); //compatibility ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "animations", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_animations", "_get_animations");
} }
SpriteFrames::SpriteFrames() { SpriteFrames::SpriteFrames() {

5
scene/resources/sprite_frames.h
View File

@ -44,14 +44,9 @@ class SpriteFrames : public Resource {
HashMap<StringName, Anim> animations; HashMap<StringName, Anim> animations;
Array _get_frames() const;
void _set_frames(const Array &p_frames);
Array _get_animations() const; Array _get_animations() const;
void _set_animations(const Array &p_animations); void _set_animations(const Array &p_animations);
Vector<String> _get_animation_list() const;
protected: protected:
static void _bind_methods(); static void _bind_methods();