summaryrefslogtreecommitdiffstats
path: root/scene/2d/animated_sprite.h
diff options
context:
space:
mode:
authorGilles Roudiere <gilles.roudiere@gmail.com>2017-11-07 08:58:35 +0100
committerGilles Roudiere <gilles.roudiere@laas.fr>2018-02-16 10:14:52 +0100
commit8dad41e395220404fb0fdafaa0cd4ed18179231f (patch)
tree37b9190b77fa989f9d9d369b80957c3890e4164f /scene/2d/animated_sprite.h
parent68f277477b5a5f3003405e36c6b6853720cb91de (diff)
downloadredot-engine-8dad41e395220404fb0fdafaa0cd4ed18179231f.tar.gz
2D editor GUI input rework. Changes are:
- The input handling is done into several distinct functions, and the code is more consistent. - The actions' history is more precise ("Edited CanvasItem" is now "Rotated CanvasItem","Moved CanvasItem",etc...) - Fixed a little bug about input key events not forwarded correctly to plugins - IK is followed by default when you move a bone node, the alt-key allow you to move it normally
Diffstat (limited to 'scene/2d/animated_sprite.h')
-rw-r--r--scene/2d/animated_sprite.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/scene/2d/animated_sprite.h b/scene/2d/animated_sprite.h
index 2c356d619f..a38adf792c 100644
--- a/scene/2d/animated_sprite.h
+++ b/scene/2d/animated_sprite.h
@@ -150,9 +150,13 @@ protected:
virtual void _validate_property(PropertyInfo &property) const;
public:
+ virtual Dictionary _edit_get_state() const;
+ virtual void _edit_set_state(const Dictionary &p_state);
+
virtual void _edit_set_pivot(const Point2 &p_pivot);
virtual Point2 _edit_get_pivot() const;
virtual bool _edit_use_pivot() const;
+ virtual Rect2 _edit_get_rect() const;
void set_sprite_frames(const Ref<SpriteFrames> &p_frames);
Ref<SpriteFrames> get_sprite_frames() const;
@@ -182,8 +186,6 @@ public:
void set_modulate(const Color &p_color);
Color get_modulate() const;
- virtual Rect2 _edit_get_rect() const;
-
virtual String get_configuration_warning() const;
AnimatedSprite();
};