1
0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-12-20 23:17:18 +01:00

Allow circles to be transformed to area points.

This commit is contained in:
Sandu Liviu Catalin
2020-04-20 16:00:47 +03:00
parent 405c2920e7
commit 2f31a9495a
5 changed files with 91 additions and 0 deletions

View File

@@ -48,6 +48,28 @@ void Area::AddArray(const Sqrat::Array & a)
});
}
#pragma clang diagnostic pop
// ------------------------------------------------------------------------------------------------
void Area::AddCircleEx(SQFloat cx, SQFloat cy, SQFloat cr, SQInteger num_segments)
{
for(SQInteger i = 0; i < num_segments; ++i)
{
CheckLock();
// Get the current angle
#ifdef SQUSEDOUBLE
SQFloat theta = 2.0d * SQMOD_PI64 * static_cast< SQFloat >(i) / static_cast< SQFloat >(num_segments);
#else
SQFloat theta = 2.0f * SQMOD_PI * static_cast< SQFloat >(i) / static_cast< SQFloat >(num_segments);
#endif // SQUSEDOUBLE
// Calculate the x component
SQFloat x = (cr * std::cos(theta)) + cx;
// Calculate the y component
SQFloat y = (cr * std::sin(theta)) + cy;
// Insert the point into the list
mPoints.emplace_back(x, y);
// Update the bounding box
Expand(x, y);
}
}
// ------------------------------------------------------------------------------------------------
bool Area::Manage()
@@ -456,6 +478,8 @@ void Register_Areas(HSQUIRRELVM vm)
.Func(_SC("AddEx"), &Area::AddPointEx)
.Func(_SC("AddVirtual"), &Area::AddVirtualPoint)
.Func(_SC("AddVirtualEx"), &Area::AddVirtualPointEx)
.Func(_SC("AddCircle"), &Area::AddCircle)
.Func(_SC("AddCircleEx"), &Area::AddCircleEx)
.Func(_SC("AddFake"), &Area::AddVirtualPoint)
.Func(_SC("AddFakeEx"), &Area::AddVirtualPointEx)
.Func(_SC("AddArray"), &Area::AddArray)

View File

@@ -2,6 +2,7 @@
// ------------------------------------------------------------------------------------------------
#include "Base/Shared.hpp"
#include "Base/Circle.hpp"
#include "Base/Vector2.hpp"
#include "Base/Vector4.hpp"
#include "Base/Vector2i.hpp"
@@ -402,6 +403,19 @@ struct Area
*/
void AddArray(const Sqrat::Array & a);
/* --------------------------------------------------------------------------------------------
* Add a 2D circle to the point list.
*/
void AddCircle(const Circle & c, SQInteger num_segments)
{
AddCircleEx(c.pos.x, c.pos.y, c.rad, num_segments);
}
/* --------------------------------------------------------------------------------------------
* Add a 2D circle to the point list.
*/
void AddCircleEx(SQFloat cx, SQFloat cy, SQFloat cr, SQInteger num_segments);
/* --------------------------------------------------------------------------------------------
* Test if a point is inside the bounding box and then the area.
*/