marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

unify two implementations of Angle in the engine 

There seems to be no reason to have two different implementation and the one in FnAngle seemed the most sane and complete one.
install-platforms
Maikel de Vries 2017-07-19 22:01:53 +02:00
parent e5b15a494c
commit 0d58380dbf
3 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/lib/Standard.cpp
View File

@ -33,13 +33,35 @@ int32_t Distance(int32_t iX1, int32_t iY1, int32_t iX2, int32_t iY2)
return dist;
}
int Angle(int iX1, int iY1, int iX2, int iY2)
// Angle between points (iX1, iY1) and (iX2, iY2) with range [0, 360), angle = 0 means vertically upward and increasing angles in clockwise direction.
int32_t Angle(int32_t iX1, int32_t iY1, int32_t iX2, int32_t iY2, int32_t iPrec)
{
int iAngle = (int) ( 180.0 * atan2( float(Abs(iY1-iY2)), float(Abs(iX1-iX2)) ) / M_PI );
if (iX2>iX1 )
{ if (iY2<iY1) iAngle = 90-iAngle; else iAngle = 90+iAngle; }
int32_t iAngle;
int32_t dx = iX2 - iX1, dy = iY2 - iY1;
if (!dx)
{
if (dy > 0) return 180 * iPrec;
else return 0;
}
if (!dy)
{
if (dx > 0) return 90 * iPrec;
else return 270 * iPrec;
}
iAngle = static_cast<int32_t>(180.0 * iPrec * atan2(static_cast<double>(Abs(dy)), static_cast<double>(Abs(dx))) / M_PI);
if (iX2 > iX1)
{
if (iY2 < iY1) iAngle = (90 * iPrec) - iAngle;
else iAngle = (90 * iPrec) + iAngle;
}
else
{ if (iY2<iY1) iAngle = 270+iAngle; else iAngle = 270-iAngle; }
{
if (iY2 < iY1) iAngle = (270 * iPrec) + iAngle;
else iAngle = (270 * iPrec) - iAngle;
}
return iAngle;
}

2
src/lib/Standard.h
View File

@ -51,7 +51,7 @@ inline int DWordAligned(int val)
}
int32_t Distance(int32_t iX1, int32_t iY1, int32_t iX2, int32_t iY2);
int Angle(int iX1, int iY1, int iX2, int iY2);
int32_t Angle(int32_t iX1, int32_t iY1, int32_t iX2, int32_t iY2, int32_t iPrec = 1);
int Pow(int base, int exponent);
int32_t StrToI32(const char *s, int base, const char **scan_end);

30
src/script/C4Script.cpp
View File

@ -660,37 +660,9 @@ static long FnSqrt(C4PropList * _this, long iValue)
static long FnAngle(C4PropList * _this, long iX1, long iY1, long iX2, long iY2, long iPrec)
{
long iAngle;
// Standard prec
if (!iPrec) iPrec = 1;
long dx=iX2-iX1,dy=iY2-iY1;
if (!dx)
{
if (dy>0) return 180 * iPrec;
else return 0;
}
if (!dy)
{
if (dx>0) return 90 * iPrec;
else return 270 * iPrec;
}
iAngle = static_cast<long>(180.0 * iPrec * atan2(static_cast<double>(Abs(dy)), static_cast<double>(Abs(dx))) / M_PI);
if (iX2>iX1 )
{
if (iY2<iY1) iAngle = (90 * iPrec) - iAngle;
else iAngle = (90 * iPrec) + iAngle;
}
else
{
if (iY2<iY1) iAngle = (270 * iPrec) + iAngle;
else iAngle = (270 * iPrec) - iAngle;
}
return iAngle;
return Angle(iX1, iY1, iX2, iY2, iPrec);
}
static long FnArcSin(C4PropList * _this, long iVal, long iRadius)