summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-13 20:00:43 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-13 20:00:43 -0300
commit6e88b1096a6876f919f70e39638e8e24fcdefc7a (patch)
treefb08730c2735138019f1815ab9a3233bad61b1e0 /core
parent00ec16e3f3a98339ec7462675fa41b3dd240861b (diff)
Vector2.get_aspect() renamed to Vector2.aspect() to keep consistent method naming
Diffstat (limited to 'core')
-rw-r--r--core/math/math_2d.h2
-rw-r--r--core/variant_call.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/math/math_2d.h b/core/math/math_2d.h
index 7896299c24..a24c4266ee 100644
--- a/core/math/math_2d.h
+++ b/core/math/math_2d.h
@@ -154,7 +154,7 @@ struct Vector2 {
Vector2 floor() const;
Vector2 snapped(const Vector2& p_by) const;
- real_t get_aspect() const { return width/height; }
+ real_t aspect() const { return width/height; }
operator String() const { return String::num(x)+", "+String::num(y); }
diff --git a/core/variant_call.cpp b/core/variant_call.cpp
index 0c8b40539d..b20f8aafd1 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -349,7 +349,7 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var
VCALL_LOCALMEM0R(Vector2,tangent);
VCALL_LOCALMEM0R(Vector2,floor);
VCALL_LOCALMEM1R(Vector2,snapped);
- VCALL_LOCALMEM0R(Vector2,get_aspect);
+ VCALL_LOCALMEM0R(Vector2,aspect);
VCALL_LOCALMEM1R(Vector2,dot);
VCALL_LOCALMEM1R(Vector2,slide);
VCALL_LOCALMEM1R(Vector2,reflect);
@@ -1457,7 +1457,7 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
ADDFUNC0(VECTOR2,VECTOR2,Vector2,tangent,varray());
ADDFUNC0(VECTOR2,VECTOR2,Vector2,floor,varray());
ADDFUNC1(VECTOR2,VECTOR2,Vector2,snapped,VECTOR2,"by",varray());
- ADDFUNC0(VECTOR2,REAL,Vector2,get_aspect,varray());
+ ADDFUNC0(VECTOR2,REAL,Vector2,aspect,varray());
ADDFUNC1(VECTOR2,REAL,Vector2,dot,VECTOR2,"with",varray());
ADDFUNC1(VECTOR2,VECTOR2,Vector2,slide,VECTOR2,"vec",varray());
ADDFUNC1(VECTOR2,VECTOR2,Vector2,reflect,VECTOR2,"vec",varray());