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

Merge pull request #32973 from KoBeWi/sprite_gps 

Show preview of frame_coords in AnimationPlayer
This commit is contained in:
Rémi Verschelde 2019-10-22 19:44:41 +02:00 committed by GitHub
parent aafd5dd5c1 4b9860ea94
commit d5fd3b6554
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
editor/animation_track_editor_plugins.cpp
View File

@ -337,7 +337,7 @@ AnimationTrackEditAudio::AnimationTrackEditAudio() {
AudioStreamPreviewGenerator::get_singleton()->connect("preview_updated", this, "_preview_changed"); AudioStreamPreviewGenerator::get_singleton()->connect("preview_updated", this, "_preview_changed");
} }
/// SPRITE FRAME /// /// SPRITE FRAME / FRAME_COORDS ///
int AnimationTrackEditSpriteFrame::get_key_height() const { int AnimationTrackEditSpriteFrame::get_key_height() const {
@ -439,14 +439,24 @@ void AnimationTrackEditSpriteFrame::draw_key(int p_index, float p_pixels_sec, in
if (Object::cast_to<Sprite>(object) || Object::cast_to<Sprite3D>(object)) { if (Object::cast_to<Sprite>(object) || Object::cast_to<Sprite3D>(object)) {
int frame = get_animation()->track_get_key_value(get_track(), p_index);
texture = object->call("get_texture"); texture = object->call("get_texture");
if (!texture.is_valid()) { if (!texture.is_valid()) {
AnimationTrackEdit::draw_key(p_index, p_pixels_sec, p_x, p_selected, p_clip_left, p_clip_right); AnimationTrackEdit::draw_key(p_index, p_pixels_sec, p_x, p_selected, p_clip_left, p_clip_right);
return; return;
} }
int hframes = object->call("get_hframes");
int vframes = object->call("get_vframes");
Vector2 coords;
if (is_coords) {
coords = get_animation()->track_get_key_value(get_track(), p_index);
} else {
int frame = get_animation()->track_get_key_value(get_track(), p_index);
coords.x = frame % hframes;
coords.y = frame / hframes;
}
region.size = texture->get_size(); region.size = texture->get_size();
if (bool(object->call("is_region"))) { if (bool(object->call("is_region"))) {
@ -454,9 +464,6 @@ void AnimationTrackEditSpriteFrame::draw_key(int p_index, float p_pixels_sec, in
region = Rect2(object->call("get_region_rect")); region = Rect2(object->call("get_region_rect"));
} }
int hframes = object->call("get_hframes");
int vframes = object->call("get_vframes");
if (hframes > 1) { if (hframes > 1) {
region.size.x /= hframes; region.size.x /= hframes;
} }
@ -464,8 +471,8 @@ void AnimationTrackEditSpriteFrame::draw_key(int p_index, float p_pixels_sec, in
region.size.y /= vframes; region.size.y /= vframes;
} }
region.position.x += region.size.x * (frame % hframes); region.position.x += region.size.x * coords.x;
region.position.y += region.size.y * (frame / hframes); region.position.y += region.size.y * coords.y;
} else if (Object::cast_to<AnimatedSprite>(object) || Object::cast_to<AnimatedSprite3D>(object)) { } else if (Object::cast_to<AnimatedSprite>(object) || Object::cast_to<AnimatedSprite3D>(object)) {
@ -532,6 +539,11 @@ void AnimationTrackEditSpriteFrame::set_node(Object *p_object) {
id = p_object->get_instance_id(); id = p_object->get_instance_id();
} }
void AnimationTrackEditSpriteFrame::set_as_coords() {
is_coords = true;
}
/// SUB ANIMATION /// /// SUB ANIMATION ///
int AnimationTrackEditSubAnim::get_key_height() const { int AnimationTrackEditSubAnim::get_key_height() const {
@ -1297,6 +1309,14 @@ AnimationTrackEdit *AnimationTrackEditDefaultPlugin::create_value_track_edit(Obj
return sprite; return sprite;
} }
if (p_property == "frame_coords" && (p_object->is_class("Sprite") || p_object->is_class("Sprite3D"))) {
AnimationTrackEditSpriteFrame *sprite = memnew(AnimationTrackEditSpriteFrame);
sprite->set_as_coords();
sprite->set_node(p_object);
return sprite;
}
if (p_property == "current_animation" && (p_object->is_class("AnimationPlayer"))) { if (p_property == "current_animation" && (p_object->is_class("AnimationPlayer"))) {
AnimationTrackEditSubAnim *player = memnew(AnimationTrackEditSubAnim); AnimationTrackEditSubAnim *player = memnew(AnimationTrackEditSubAnim);

4
editor/animation_track_editor_plugins.h
View File

@ -81,6 +81,7 @@ class AnimationTrackEditSpriteFrame : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditSpriteFrame, AnimationTrackEdit); GDCLASS(AnimationTrackEditSpriteFrame, AnimationTrackEdit);
ObjectID id; ObjectID id;
bool is_coords;
public: public:
virtual int get_key_height() const; virtual int get_key_height() const;
@ -89,6 +90,9 @@ public:
virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right); virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right);
void set_node(Object *p_object); void set_node(Object *p_object);
void set_as_coords();
AnimationTrackEditSpriteFrame() { is_coords = false; }
}; };
class AnimationTrackEditSubAnim : public AnimationTrackEdit { class AnimationTrackEditSubAnim : public AnimationTrackEdit {