godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-26 15:46:23 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

234
scene/2d/screen_button.cpp
View File

@@ -27,45 +27,45 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "screen_button.h"
#include "os/os.h"
#include "input_map.h"
#include "os/input.h"
#include "os/os.h"
void TouchScreenButton::set_texture(const Ref<Texture>& p_texture) {
void TouchScreenButton::set_texture(const Ref<Texture> &p_texture) {
texture=p_texture;
texture = p_texture;
update();
}
Ref<Texture> TouchScreenButton::get_texture() const{
Ref<Texture> TouchScreenButton::get_texture() const {
return texture;
}
void TouchScreenButton::set_texture_pressed(const Ref<Texture>& p_texture_pressed) {
void TouchScreenButton::set_texture_pressed(const Ref<Texture> &p_texture_pressed) {
texture_pressed=p_texture_pressed;
texture_pressed = p_texture_pressed;
update();
}
Ref<Texture> TouchScreenButton::get_texture_pressed() const{
Ref<Texture> TouchScreenButton::get_texture_pressed() const {
return texture_pressed;
}
void TouchScreenButton::set_bitmask(const Ref<BitMap>& p_bitmask){
void TouchScreenButton::set_bitmask(const Ref<BitMap> &p_bitmask) {
bitmask=p_bitmask;
bitmask = p_bitmask;
}
Ref<BitMap> TouchScreenButton::get_bitmask() const{
Ref<BitMap> TouchScreenButton::get_bitmask() const {
return bitmask;
}
void TouchScreenButton::set_shape(const Ref<Shape2D>& p_shape){
void TouchScreenButton::set_shape(const Ref<Shape2D> &p_shape) {
shape=p_shape;
shape = p_shape;
if (!is_inside_tree())
return;
@@ -74,14 +74,14 @@ void TouchScreenButton::set_shape(const Ref<Shape2D>& p_shape){
update();
}
Ref<Shape2D> TouchScreenButton::get_shape() const{
Ref<Shape2D> TouchScreenButton::get_shape() const {
return shape;
}
void TouchScreenButton::set_shape_centered(bool p_shape_centered) {
shape_centered=p_shape_centered;
shape_centered = p_shape_centered;
if (!is_inside_tree())
return;
@@ -97,50 +97,50 @@ bool TouchScreenButton::is_shape_centered() const {
void TouchScreenButton::_notification(int p_what) {
switch(p_what) {
switch (p_what) {
case NOTIFICATION_DRAW: {
if (!is_inside_tree())
return;
if (!get_tree()->is_editor_hint() && !OS::get_singleton()->has_touchscreen_ui_hint() && visibility==VISIBILITY_TOUCHSCREEN_ONLY)
if (!get_tree()->is_editor_hint() && !OS::get_singleton()->has_touchscreen_ui_hint() && visibility == VISIBILITY_TOUCHSCREEN_ONLY)
return;
if (finger_pressed!=-1) {
if (finger_pressed != -1) {
if (texture_pressed.is_valid())
draw_texture(texture_pressed,Point2());
draw_texture(texture_pressed, Point2());
else if (texture.is_valid())
draw_texture(texture,Point2());
draw_texture(texture, Point2());
} else {
if (texture.is_valid())
draw_texture(texture,Point2());
draw_texture(texture, Point2());
}
if (!get_tree()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint())
return;
if (shape.is_valid()) {
Color draw_col=get_tree()->get_debug_collisions_color();
Vector2 pos=shape_centered ? get_item_rect().size*0.5f : Vector2();
Color draw_col = get_tree()->get_debug_collisions_color();
Vector2 pos = shape_centered ? get_item_rect().size * 0.5f : Vector2();
draw_set_transform_matrix(get_canvas_transform().translated(pos));
shape->draw(get_canvas_item(),draw_col);
shape->draw(get_canvas_item(), draw_col);
}
} break;
case NOTIFICATION_ENTER_TREE: {
if (!get_tree()->is_editor_hint() && !OS::get_singleton()->has_touchscreen_ui_hint() && visibility==VISIBILITY_TOUCHSCREEN_ONLY)
if (!get_tree()->is_editor_hint() && !OS::get_singleton()->has_touchscreen_ui_hint() && visibility == VISIBILITY_TOUCHSCREEN_ONLY)
return;
update();
if (!get_tree()->is_editor_hint())
set_process_input(is_visible());
if (action.operator String()!="" && InputMap::get_singleton()->has_action(action)) {
action_id=InputMap::get_singleton()->get_action_id(action);
if (action.operator String() != "" && InputMap::get_singleton()->has_action(action)) {
action_id = InputMap::get_singleton()->get_action_id(action);
} else {
action_id=-1;
action_id = -1;
}
} break;
case NOTIFICATION_EXIT_TREE: {
@@ -165,21 +165,19 @@ void TouchScreenButton::_notification(int p_what) {
}
}
bool TouchScreenButton::is_pressed() const {
bool TouchScreenButton::is_pressed() const{
return finger_pressed!=-1;
return finger_pressed != -1;
}
void TouchScreenButton::set_action(const String& p_action) {
void TouchScreenButton::set_action(const String &p_action) {
action=p_action;
if (action.operator String()!="" && InputMap::get_singleton()->has_action(action)) {
action_id=InputMap::get_singleton()->get_action_id(action);
action = p_action;
if (action.operator String() != "" && InputMap::get_singleton()->has_action(action)) {
action_id = InputMap::get_singleton()->get_action_id(action);
} else {
action_id=-1;
action_id = -1;
}
}
String TouchScreenButton::get_action() const {
@@ -187,7 +185,7 @@ String TouchScreenButton::get_action() const {
return action;
}
void TouchScreenButton::_input(const InputEvent& p_event) {
void TouchScreenButton::_input(const InputEvent &p_event) {
if (!get_tree())
return;
@@ -197,94 +195,88 @@ void TouchScreenButton::_input(const InputEvent& p_event) {
if (passby_press) {
if (p_event.type==InputEvent::SCREEN_TOUCH && !p_event.screen_touch.pressed && finger_pressed==p_event.screen_touch.index) {
if (p_event.type == InputEvent::SCREEN_TOUCH && !p_event.screen_touch.pressed && finger_pressed == p_event.screen_touch.index) {
_release();
}
if ((p_event.type==InputEvent::SCREEN_TOUCH && p_event.screen_touch.pressed)|| p_event.type==InputEvent::SCREEN_DRAG) {
if ((p_event.type == InputEvent::SCREEN_TOUCH && p_event.screen_touch.pressed) || p_event.type == InputEvent::SCREEN_DRAG) {
if (finger_pressed==-1 || p_event.screen_touch.index==finger_pressed) {
if (finger_pressed == -1 || p_event.screen_touch.index == finger_pressed) {
Point2 coord = (get_global_transform_with_canvas()).affine_inverse().xform(Point2(p_event.screen_touch.x,p_event.screen_touch.y));
Point2 coord = (get_global_transform_with_canvas()).affine_inverse().xform(Point2(p_event.screen_touch.x, p_event.screen_touch.y));
bool touched=false;
bool touched = false;
if (bitmask.is_valid()) {
if (Rect2(Point2(),bitmask->get_size()).has_point(coord)) {
if (Rect2(Point2(), bitmask->get_size()).has_point(coord)) {
if (bitmask->get_bit(coord))
touched=true;
touched = true;
}
} else {
if (texture.is_valid())
touched=Rect2(Point2(),texture->get_size()).has_point(coord);
touched = Rect2(Point2(), texture->get_size()).has_point(coord);
}
if (touched) {
if (finger_pressed==-1) {
if (finger_pressed == -1) {
_press(p_event.screen_touch.index);
}
} else {
if (finger_pressed!=-1) {
if (finger_pressed != -1) {
_release();
}
}
}
}
} else {
if (p_event.type==InputEvent::SCREEN_TOUCH) {
if (p_event.type == InputEvent::SCREEN_TOUCH) {
if (p_event.screen_touch.pressed) {
if (!is_visible())
return;
const bool can_press=finger_pressed==-1;
const bool can_press = finger_pressed == -1;
if (!can_press)
return; //already fingering
Point2 coord = (get_global_transform_with_canvas()).affine_inverse().xform(Point2(p_event.screen_touch.x,p_event.screen_touch.y));
Point2 coord = (get_global_transform_with_canvas()).affine_inverse().xform(Point2(p_event.screen_touch.x, p_event.screen_touch.y));
Rect2 item_rect = get_item_rect();
bool touched=false;
bool check_rect=true;
bool touched = false;
bool check_rect = true;
if (shape.is_valid()) {
check_rect=false;
Matrix32 xform=shape_centered ? Matrix32().translated(get_item_rect().size*0.5f) : Matrix32();
touched=shape->collide(xform, unit_rect, Matrix32(0, coord + Vector2(0.5,0.5)));
check_rect = false;
Matrix32 xform = shape_centered ? Matrix32().translated(get_item_rect().size * 0.5f) : Matrix32();
touched = shape->collide(xform, unit_rect, Matrix32(0, coord + Vector2(0.5, 0.5)));
}
if (bitmask.is_valid()) {
check_rect=false;
if (!touched && Rect2(Point2(),bitmask->get_size()).has_point(coord)) {
check_rect = false;
if (!touched && Rect2(Point2(), bitmask->get_size()).has_point(coord)) {
if (bitmask->get_bit(coord))
touched=true;
touched = true;
}
}
if (!touched && check_rect) {
if (!texture.is_null())
touched=item_rect.has_point(coord);
touched = item_rect.has_point(coord);
}
if (touched) {
_press(p_event.screen_touch.index);
}
} else {
if (p_event.screen_touch.index==finger_pressed) {
if (p_event.screen_touch.index == finger_pressed) {
_release();
}
}
@@ -294,16 +286,16 @@ void TouchScreenButton::_input(const InputEvent& p_event) {
void TouchScreenButton::_press(int p_finger_pressed) {
finger_pressed=p_finger_pressed;
finger_pressed = p_finger_pressed;
if (action_id!=-1) {
if (action_id != -1) {
Input::get_singleton()->action_press(action);
InputEvent ie;
ie.type=InputEvent::ACTION;
ie.ID=0;
ie.action.action=action_id;
ie.action.pressed=true;
ie.type = InputEvent::ACTION;
ie.ID = 0;
ie.action.action = action_id;
ie.action.pressed = true;
get_tree()->input_event(ie);
}
@@ -313,17 +305,17 @@ void TouchScreenButton::_press(int p_finger_pressed) {
void TouchScreenButton::_release(bool p_exiting_tree) {
finger_pressed=-1;
finger_pressed = -1;
if (action_id!=-1) {
if (action_id != -1) {
Input::get_singleton()->action_release(action);
if (!p_exiting_tree) {
InputEvent ie;
ie.type=InputEvent::ACTION;
ie.ID=0;
ie.action.action=action_id;
ie.action.pressed=false;
ie.type = InputEvent::ACTION;
ie.ID = 0;
ie.action.action = action_id;
ie.action.pressed = false;
get_tree()->input_event(ie);
}
}
@@ -337,16 +329,15 @@ void TouchScreenButton::_release(bool p_exiting_tree) {
Rect2 TouchScreenButton::get_item_rect() const {
if (texture.is_null())
return Rect2(0,0,1,1);
return Rect2(0, 0, 1, 1);
//if (texture.is_null())
// return CanvasItem::get_item_rect();
return Rect2(Size2(),texture->get_size());
return Rect2(Size2(), texture->get_size());
}
void TouchScreenButton::set_visibility_mode(VisibilityMode p_mode) {
visibility=p_mode;
visibility = p_mode;
update();
}
@@ -357,69 +348,64 @@ TouchScreenButton::VisibilityMode TouchScreenButton::get_visibility_mode() const
void TouchScreenButton::set_passby_press(bool p_enable) {
passby_press=p_enable;
passby_press = p_enable;
}
bool TouchScreenButton::is_passby_press_enabled() const{
bool TouchScreenButton::is_passby_press_enabled() const {
return passby_press;
}
void TouchScreenButton::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_texture","texture"),&TouchScreenButton::set_texture);
ObjectTypeDB::bind_method(_MD("get_texture"),&TouchScreenButton::get_texture);
ObjectTypeDB::bind_method(_MD("set_texture", "texture"), &TouchScreenButton::set_texture);
ObjectTypeDB::bind_method(_MD("get_texture"), &TouchScreenButton::get_texture);
ObjectTypeDB::bind_method(_MD("set_texture_pressed","texture_pressed"),&TouchScreenButton::set_texture_pressed);
ObjectTypeDB::bind_method(_MD("get_texture_pressed"),&TouchScreenButton::get_texture_pressed);
ObjectTypeDB::bind_method(_MD("set_texture_pressed", "texture_pressed"), &TouchScreenButton::set_texture_pressed);
ObjectTypeDB::bind_method(_MD("get_texture_pressed"), &TouchScreenButton::get_texture_pressed);
ObjectTypeDB::bind_method(_MD("set_bitmask","bitmask"),&TouchScreenButton::set_bitmask);
ObjectTypeDB::bind_method(_MD("get_bitmask"),&TouchScreenButton::get_bitmask);
ObjectTypeDB::bind_method(_MD("set_bitmask", "bitmask"), &TouchScreenButton::set_bitmask);
ObjectTypeDB::bind_method(_MD("get_bitmask"), &TouchScreenButton::get_bitmask);
ObjectTypeDB::bind_method(_MD("set_shape","shape"),&TouchScreenButton::set_shape);
ObjectTypeDB::bind_method(_MD("get_shape"),&TouchScreenButton::get_shape);
ObjectTypeDB::bind_method(_MD("set_shape", "shape"), &TouchScreenButton::set_shape);
ObjectTypeDB::bind_method(_MD("get_shape"), &TouchScreenButton::get_shape);
ObjectTypeDB::bind_method(_MD("set_shape_centered","bool"),&TouchScreenButton::set_shape_centered);
ObjectTypeDB::bind_method(_MD("is_shape_centered"),&TouchScreenButton::is_shape_centered);
ObjectTypeDB::bind_method(_MD("set_shape_centered", "bool"), &TouchScreenButton::set_shape_centered);
ObjectTypeDB::bind_method(_MD("is_shape_centered"), &TouchScreenButton::is_shape_centered);
ObjectTypeDB::bind_method(_MD("set_action","action"),&TouchScreenButton::set_action);
ObjectTypeDB::bind_method(_MD("get_action"),&TouchScreenButton::get_action);
ObjectTypeDB::bind_method(_MD("set_action", "action"), &TouchScreenButton::set_action);
ObjectTypeDB::bind_method(_MD("get_action"), &TouchScreenButton::get_action);
ObjectTypeDB::bind_method(_MD("set_visibility_mode","mode"),&TouchScreenButton::set_visibility_mode);
ObjectTypeDB::bind_method(_MD("get_visibility_mode"),&TouchScreenButton::get_visibility_mode);
ObjectTypeDB::bind_method(_MD("set_visibility_mode", "mode"), &TouchScreenButton::set_visibility_mode);
ObjectTypeDB::bind_method(_MD("get_visibility_mode"), &TouchScreenButton::get_visibility_mode);
ObjectTypeDB::bind_method(_MD("set_passby_press","enabled"),&TouchScreenButton::set_passby_press);
ObjectTypeDB::bind_method(_MD("is_passby_press_enabled"),&TouchScreenButton::is_passby_press_enabled);
ObjectTypeDB::bind_method(_MD("set_passby_press", "enabled"), &TouchScreenButton::set_passby_press);
ObjectTypeDB::bind_method(_MD("is_passby_press_enabled"), &TouchScreenButton::is_passby_press_enabled);
ObjectTypeDB::bind_method(_MD("is_pressed"),&TouchScreenButton::is_pressed);
ObjectTypeDB::bind_method(_MD("_input"),&TouchScreenButton::_input);
ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"normal",PROPERTY_HINT_RESOURCE_TYPE,"Texture"),_SCS("set_texture"),_SCS("get_texture"));
ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"pressed",PROPERTY_HINT_RESOURCE_TYPE,"Texture"),_SCS("set_texture_pressed"),_SCS("get_texture_pressed"));
ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"bitmask",PROPERTY_HINT_RESOURCE_TYPE,"BitMap"),_SCS("set_bitmask"),_SCS("get_bitmask"));
ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"shape",PROPERTY_HINT_RESOURCE_TYPE,"Shape2D"),_SCS("set_shape"),_SCS("get_shape"));
ADD_PROPERTY( PropertyInfo(Variant::BOOL,"shape_centered"),_SCS("set_shape_centered"),_SCS("is_shape_centered"));
ADD_PROPERTY( PropertyInfo(Variant::BOOL,"passby_press"),_SCS("set_passby_press"),_SCS("is_passby_press_enabled"));
ADD_PROPERTY( PropertyInfo(Variant::STRING,"action"),_SCS("set_action"),_SCS("get_action"));
ADD_PROPERTY( PropertyInfo(Variant::INT,"visibility_mode",PROPERTY_HINT_ENUM,"Always,TouchScreen Only"),_SCS("set_visibility_mode"),_SCS("get_visibility_mode"));
ADD_SIGNAL( MethodInfo("pressed" ) );
ADD_SIGNAL( MethodInfo("released" ) );
ObjectTypeDB::bind_method(_MD("is_pressed"), &TouchScreenButton::is_pressed);
ObjectTypeDB::bind_method(_MD("_input"), &TouchScreenButton::_input);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "normal", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), _SCS("set_texture"), _SCS("get_texture"));
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "pressed", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), _SCS("set_texture_pressed"), _SCS("get_texture_pressed"));
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "bitmask", PROPERTY_HINT_RESOURCE_TYPE, "BitMap"), _SCS("set_bitmask"), _SCS("get_bitmask"));
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, "Shape2D"), _SCS("set_shape"), _SCS("get_shape"));
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shape_centered"), _SCS("set_shape_centered"), _SCS("is_shape_centered"));
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "passby_press"), _SCS("set_passby_press"), _SCS("is_passby_press_enabled"));
ADD_PROPERTY(PropertyInfo(Variant::STRING, "action"), _SCS("set_action"), _SCS("get_action"));
ADD_PROPERTY(PropertyInfo(Variant::INT, "visibility_mode", PROPERTY_HINT_ENUM, "Always,TouchScreen Only"), _SCS("set_visibility_mode"), _SCS("get_visibility_mode"));
ADD_SIGNAL(MethodInfo("pressed"));
ADD_SIGNAL(MethodInfo("released"));
}
TouchScreenButton::TouchScreenButton() {
finger_pressed=-1;
action_id=-1;
passby_press=false;
visibility=VISIBILITY_ALWAYS;
shape_centered=true;
unit_rect=Ref<RectangleShape2D>(memnew(RectangleShape2D));
unit_rect->set_extents(Vector2(0.5,0.5));
finger_pressed = -1;
action_id = -1;
passby_press = false;
visibility = VISIBILITY_ALWAYS;
shape_centered = true;
unit_rect = Ref<RectangleShape2D>(memnew(RectangleShape2D));
unit_rect->set_extents(Vector2(0.5, 0.5));
}