diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-08-02 19:11:47 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-08-02 19:11:47 -0300 |
commit | 3d1d190dcd2993f87d5804de8a60e8bf5fc2cf49 (patch) | |
tree | aa2c814b744ab970ae79931b419908ff7ebc850e /core/math/math_2d.h | |
parent | ad313097ebcb2a0c02c956fdf74a6610c3f7c9a8 (diff) | |
parent | cea949180688add09eb9e69f5e405f361dc96d40 (diff) |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'core/math/math_2d.h')
-rw-r--r-- | core/math/math_2d.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/math/math_2d.h b/core/math/math_2d.h index ad4655b8f7..fbf700fb9c 100644 --- a/core/math/math_2d.h +++ b/core/math/math_2d.h @@ -157,7 +157,7 @@ struct Vector2 { float get_aspect() const { return width/height; } - operator String() const { return String::num(x)+","+String::num(y); } + operator String() const { return String::num(x)+", "+String::num(y); } _FORCE_INLINE_ Vector2(float p_x,float p_y) { x=p_x; y=p_y; } _FORCE_INLINE_ Vector2() { x=0; y=0; } @@ -356,7 +356,7 @@ struct Rect2 { } - operator String() const { return String(pos)+","+String(size); } + operator String() const { return String(pos)+", "+String(size); } Rect2() {} Rect2( float p_x, float p_y, float p_width, float p_height) { pos=Point2(p_x,p_y); size=Size2( p_width, p_height ); } @@ -409,7 +409,7 @@ struct Point2i { float get_aspect() const { return width/(float)height; } - operator String() const { return String::num(x)+","+String::num(y); } + operator String() const { return String::num(x)+", "+String::num(y); } operator Vector2() const { return Vector2(x,y); } inline Point2i(const Vector2& p_vec2) { x=(int)p_vec2.x; y=(int)p_vec2.y; } @@ -540,7 +540,7 @@ struct Rect2i { } - operator String() const { return String(pos)+","+String(size); } + operator String() const { return String(pos)+", "+String(size); } operator Rect2() const { return Rect2(pos,size); } Rect2i(const Rect2& p_r2) { pos=p_r2.pos; size=p_r2.size; } |