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

Merge pull request #8244 from RandomShaper/improve-touch-button

Browse source 
Improve TouchScreenButton
This commit is contained in:
Rémi Verschelde 2017-04-04 00:19:47 +02:00 committed by GitHub
commit 41986b2092
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
scene/2d/screen_button.cpp
View file

@ -65,12 +65,14 @@ Ref<BitMap> TouchScreenButton::get_bitmask() const {
void TouchScreenButton::set_shape(const Ref<Shape2D> &p_shape) { void TouchScreenButton::set_shape(const Ref<Shape2D> &p_shape) {
if (shape.is_valid())
shape->disconnect("changed", this, "update");
shape = p_shape; shape = p_shape;
if (!is_inside_tree()) if (shape.is_valid())
return; shape->connect("changed", this, "update");
if (!get_tree()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint())
return;
update(); update();
} }
@ -82,11 +84,17 @@ Ref<Shape2D> TouchScreenButton::get_shape() const {
void TouchScreenButton::set_shape_centered(bool p_shape_centered) { void TouchScreenButton::set_shape_centered(bool p_shape_centered) {
shape_centered = p_shape_centered; shape_centered = p_shape_centered;
update();
}
if (!is_inside_tree()) bool TouchScreenButton::is_shape_visible() const {
return;
if (!get_tree()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) return shape_visible;
return; }
void TouchScreenButton::set_shape_visible(bool p_shape_visible) {
shape_visible = p_shape_visible;
update(); update();
} }
@ -118,6 +126,8 @@ void TouchScreenButton::_notification(int p_what) {
draw_texture(texture, Point2()); draw_texture(texture, Point2());
} }
if (!shape_visible)
return;
if (!get_tree()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) if (!get_tree()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint())
return; return;
if (shape.is_valid()) { if (shape.is_valid()) {
@ -375,6 +385,9 @@ void TouchScreenButton::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_shape_centered", "bool"), &TouchScreenButton::set_shape_centered); ClassDB::bind_method(D_METHOD("set_shape_centered", "bool"), &TouchScreenButton::set_shape_centered);
ClassDB::bind_method(D_METHOD("is_shape_centered"), &TouchScreenButton::is_shape_centered); ClassDB::bind_method(D_METHOD("is_shape_centered"), &TouchScreenButton::is_shape_centered);
ClassDB::bind_method(D_METHOD("set_shape_visible", "bool"), &TouchScreenButton::set_shape_visible);
ClassDB::bind_method(D_METHOD("is_shape_visible"), &TouchScreenButton::is_shape_visible);
ClassDB::bind_method(D_METHOD("set_action", "action"), &TouchScreenButton::set_action); ClassDB::bind_method(D_METHOD("set_action", "action"), &TouchScreenButton::set_action);
ClassDB::bind_method(D_METHOD("get_action"), &TouchScreenButton::get_action); ClassDB::bind_method(D_METHOD("get_action"), &TouchScreenButton::get_action);
@ -393,6 +406,7 @@ void TouchScreenButton::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "bitmask", PROPERTY_HINT_RESOURCE_TYPE, "BitMap"), "set_bitmask", "get_bitmask"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "bitmask", PROPERTY_HINT_RESOURCE_TYPE, "BitMap"), "set_bitmask", "get_bitmask");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, "Shape2D"), "set_shape", "get_shape"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, "Shape2D"), "set_shape", "get_shape");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shape_centered"), "set_shape_centered", "is_shape_centered"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shape_centered"), "set_shape_centered", "is_shape_centered");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shape_visible"), "set_shape_visible", "is_shape_visible");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "passby_press"), "set_passby_press", "is_passby_press_enabled"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "passby_press"), "set_passby_press", "is_passby_press_enabled");
ADD_PROPERTY(PropertyInfo(Variant::STRING, "action"), "set_action", "get_action"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "action"), "set_action", "get_action");
ADD_PROPERTY(PropertyInfo(Variant::INT, "visibility_mode", PROPERTY_HINT_ENUM, "Always,TouchScreen Only"), "set_visibility_mode", "get_visibility_mode"); ADD_PROPERTY(PropertyInfo(Variant::INT, "visibility_mode", PROPERTY_HINT_ENUM, "Always,TouchScreen Only"), "set_visibility_mode", "get_visibility_mode");
@ -408,6 +422,7 @@ TouchScreenButton::TouchScreenButton() {
passby_press = false; passby_press = false;
visibility = VISIBILITY_ALWAYS; visibility = VISIBILITY_ALWAYS;
shape_centered = true; shape_centered = true;
shape_visible = true;
unit_rect = Ref<RectangleShape2D>(memnew(RectangleShape2D)); unit_rect = Ref<RectangleShape2D>(memnew(RectangleShape2D));
unit_rect->set_extents(Vector2(0.5, 0.5)); unit_rect->set_extents(Vector2(0.5, 0.5));
} }

4
scene/2d/screen_button.h
View file

@ -50,6 +50,7 @@ private:
Ref<BitMap> bitmask; Ref<BitMap> bitmask;
Ref<Shape2D> shape; Ref<Shape2D> shape;
bool shape_centered; bool shape_centered;
bool shape_visible;
Ref<RectangleShape2D> unit_rect; Ref<RectangleShape2D> unit_rect;
@ -85,6 +86,9 @@ public:
void set_shape_centered(bool p_shape_centered); void set_shape_centered(bool p_shape_centered);
bool is_shape_centered() const; bool is_shape_centered() const;
void set_shape_visible(bool p_shape_visible);
bool is_shape_visible() const;
void set_action(const String &p_action); void set_action(const String &p_action);
String get_action() const; String get_action() const;