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

Merge pull request #16756 from willnationsdev/shifted-rect-sprite

Browse source 
Simplify detection of Sprite clicks
This commit is contained in:
Rémi Verschelde 2018-02-21 10:42:47 +01:00 committed by GitHub
commit 222516a815
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/2d/sprite.cpp
View file

@ -297,7 +297,7 @@ bool Sprite::_edit_is_selected_on_click(const Point2 &p_point, double p_toleranc
return c.a > 0.01;
}
Rect2 Sprite::_edit_get_rect() const {
Rect2 Sprite::get_rect() const {
if (texture.is_null())
return Rect2(0, 0, 1, 1);
@ -374,6 +374,8 @@ void Sprite::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_hframes", "hframes"), &Sprite::set_hframes);
ClassDB::bind_method(D_METHOD("get_hframes"), &Sprite::get_hframes);
ClassDB::bind_method(D_METHOD("get_rect"), &Sprite::get_rect);
ADD_SIGNAL(MethodInfo("frame_changed"));
ADD_SIGNAL(MethodInfo("texture_changed"));

4
scene/2d/sprite.h
View file

@ -72,7 +72,7 @@ public:
virtual Point2 _edit_get_pivot() const;
virtual bool _edit_use_pivot() const;
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const;
virtual Rect2 _edit_get_rect() const;
virtual Rect2 _edit_get_rect() const { return get_rect(); }
void set_texture(const Ref<Texture> &p_texture);
Ref<Texture> get_texture() const;
@ -110,6 +110,8 @@ public:
void set_hframes(int p_amount);
int get_hframes() const;
Rect2 get_rect() const;
Sprite();
};