thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-02-22 04:37:13 +01:00
Code Releases Activity

Improve Circle method names to be more consistent with the rest of the basic types.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2016-07-25 00:32:35 +03:00
parent d30e1210ac
commit 48485981f0
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/Base/Circle.cpp
View File

@ -387,9 +387,10 @@ void Circle::SetCircle(const Circle & nc)
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void Circle::SetPosition(const Vector2 & np) void Circle::SetCircleEx(Value nx, Value ny, Value nr)
{ {
pos = np; pos.SetVector2Ex(nx, ny);
rad = nr;
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -400,16 +401,15 @@ void Circle::SetValues(const Vector2 & np, Value nr)
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void Circle::SetPositionEx(Value nx, Value ny) void Circle::SetPosition(const Vector2 & np)
{ {
pos.SetVector2Ex(nx, ny); pos = np;
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void Circle::SetValuesEx(Value nx, Value ny, Value nr) void Circle::SetPositionEx(Value nx, Value ny)
{ {
pos.SetVector2Ex(nx, ny); pos.SetVector2Ex(nx, ny);
rad = nr;
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -527,7 +527,7 @@ const Circle & GetCircle(const Vector2 & pv, Float32 rv)
const Circle & GetCircle(Float32 xv, Float32 yv, Float32 rv) const Circle & GetCircle(Float32 xv, Float32 yv, Float32 rv)
{ {
static Circle circle; static Circle circle;
circle.SetValuesEx(xv, yv, rv); circle.SetCircleEx(xv, yv, rv);
return circle; return circle;
} }
@ -571,12 +571,12 @@ void Register_Circle(HSQUIRRELVM vm)
// Member Methods // Member Methods
.Func(_SC("SetRadius"), &Circle::SetRadius) .Func(_SC("SetRadius"), &Circle::SetRadius)
.Func(_SC("SetCircle"), &Circle::SetCircle) .Func(_SC("SetCircle"), &Circle::SetCircle)
.Func(_SC("SetCircleEx"), &Circle::SetCircleEx)
.Func(_SC("SetValues"), &Circle::SetValues)
.Func(_SC("SetPos"), &Circle::SetPosition) .Func(_SC("SetPos"), &Circle::SetPosition)
.Func(_SC("SetPosition"), &Circle::SetPosition) .Func(_SC("SetPosition"), &Circle::SetPosition)
.Func(_SC("SetValues"), &Circle::SetValues)
.Func(_SC("SetPosEx"), &Circle::SetPositionEx) .Func(_SC("SetPosEx"), &Circle::SetPositionEx)
.Func(_SC("SetPositionEx"), &Circle::SetPositionEx) .Func(_SC("SetPositionEx"), &Circle::SetPositionEx)
.Func(_SC("SetValuesEx"), &Circle::SetValuesEx)
.Func(_SC("SetStr"), &Circle::SetStr) .Func(_SC("SetStr"), &Circle::SetStr)
.Func(_SC("Clear"), &Circle::Clear) .Func(_SC("Clear"), &Circle::Clear)
// Member Overloads // Member Overloads

10
source/Base/Circle.hpp
View File

@ -327,9 +327,9 @@ struct Circle
void SetCircle(const Circle & nc); void SetCircle(const Circle & nc);
/* -------------------------------------------------------------------------------------------- /* --------------------------------------------------------------------------------------------
* Set the position from the specified position. * Set the specified position and radius.
*/ */
void SetPosition(const Vector2 & np); void SetCircleEx(Value nx, Value ny, Value nr);
/* -------------------------------------------------------------------------------------------- /* --------------------------------------------------------------------------------------------
* Set the specified position and radius. * Set the specified position and radius.
@ -339,12 +339,12 @@ struct Circle
/* -------------------------------------------------------------------------------------------- /* --------------------------------------------------------------------------------------------
* Set the specified position. * Set the specified position.
*/ */
void SetPositionEx(Value nx, Value ny); void SetPosition(const Vector2 & np);
/* -------------------------------------------------------------------------------------------- /* --------------------------------------------------------------------------------------------
* Set the specified position and radius. * Set the specified position.
*/ */
void SetValuesEx(Value nx, Value ny, Value nr); void SetPositionEx(Value nx, Value ny);
/* -------------------------------------------------------------------------------------------- /* --------------------------------------------------------------------------------------------
* Set the values extracted from the specified string using the specified delimiter. * Set the values extracted from the specified string using the specified delimiter.