UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for float modulo operator (#1953)

Browse Source
This commit is contained in:
Mikusch 2023-03-19 17:19:42 +01:00 committed by GitHub
parent a9a1939f75
commit 5539484f92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/logic/smn_float.cpp
View File

@ -231,6 +231,13 @@ static cell_t sm_FloatFraction(IPluginContext *pCtx, const cell_t *params)
return sp_ftoc(val); return sp_ftoc(val);
} }
static cell_t sm_FloatMod(IPluginContext* pCtx, const cell_t* params)
{
float val = fmodf(sp_ctof(params[1]), sp_ctof(params[2]));
return sp_ftoc(val);
}
static cell_t sm_Sine(IPluginContext *pCtx, const cell_t *params) static cell_t sm_Sine(IPluginContext *pCtx, const cell_t *params)
{ {
float val = sp_ctof(params[1]); float val = sp_ctof(params[1]);
@ -358,6 +365,7 @@ REGISTER_NATIVES(floatnatives)
{"FloatAdd", sm_FloatAdd}, {"FloatAdd", sm_FloatAdd},
{"FloatSub", sm_FloatSub}, {"FloatSub", sm_FloatSub},
{"FloatFraction", sm_FloatFraction}, {"FloatFraction", sm_FloatFraction},
{"FloatMod", sm_FloatMod},
{"RoundToZero", sm_RoundToZero}, {"RoundToZero", sm_RoundToZero},
{"RoundToCeil", sm_RoundToCeil}, {"RoundToCeil", sm_RoundToCeil},
{"RoundToFloor", sm_RoundToFloor}, {"RoundToFloor", sm_RoundToFloor},

30
plugins/include/float.inc
View File

@ -97,6 +97,19 @@ native float FloatAdd(float oper1, float oper2);
#pragma deprecated This native is internal implementation. For subtraction use the '-' operator. #pragma deprecated This native is internal implementation. For subtraction use the '-' operator.
native float FloatSub(float oper1, float oper2); native float FloatSub(float oper1, float oper2);
/**
* Returns the modulus of oper1 and oper2.
*
* Note: This native is internal implementation. For modulo use the '%' operator.
*
* @param oper1 First value.
* @param oper2 Second value.
* @return oper1%oper2.
* @deprecated This native is internal implementation. For modulo use the '%' operator.
*/
#pragma deprecated This native is internal implementation. For modulo use the '%' operator.
native float FloatMod(float oper1, float oper2);
/** /**
* Returns the decimal part of a float. * Returns the decimal part of a float.
* *
@ -269,6 +282,7 @@ native float __FLOAT_MUL__(float a, float b) = FloatMul;
native float __FLOAT_DIV__(float a, float b) = FloatDiv; native float __FLOAT_DIV__(float a, float b) = FloatDiv;
native float __FLOAT_ADD__(float a, float b) = FloatAdd; native float __FLOAT_ADD__(float a, float b) = FloatAdd;
native float __FLOAT_SUB__(float a, float b) = FloatSub; native float __FLOAT_SUB__(float a, float b) = FloatSub;
native float __FLOAT_MOD__(float a, float b) = FloatMod;
native bool __FLOAT_GT__(float a, float b); native bool __FLOAT_GT__(float a, float b);
native bool __FLOAT_GE__(float a, float b); native bool __FLOAT_GE__(float a, float b);
@ -282,6 +296,7 @@ native float operator*(float oper1, float oper2) = FloatMul;
native float operator/(float oper1, float oper2) = FloatDiv; native float operator/(float oper1, float oper2) = FloatDiv;
native float operator+(float oper1, float oper2) = FloatAdd; native float operator+(float oper1, float oper2) = FloatAdd;
native float operator-(float oper1, float oper2) = FloatSub; native float operator-(float oper1, float oper2) = FloatSub;
native float operator%(float oper1, float oper2) = FloatMod;
native bool operator!(float oper1) = __FLOAT_NOT__; native bool operator!(float oper1) = __FLOAT_NOT__;
native bool operator>(float oper1, float oper2) = __FLOAT_GT__; native bool operator>(float oper1, float oper2) = __FLOAT_GT__;
native bool operator>=(float oper1, float oper2) = __FLOAT_GE__; native bool operator>=(float oper1, float oper2) = __FLOAT_GE__;
@ -387,12 +402,15 @@ stock bool operator<=(int oper1, float oper2)
return __FLOAT_LE__(float(oper1), oper2); return __FLOAT_LE__(float(oper1), oper2);
} }
/** stock float operator%(float oper1, int oper2)
* Forbidden operators. {
*/ return __FLOAT_MOD__(oper1, float(oper2));
forward float operator%(float oper1, float oper2); }
forward float operator%(float oper1, int oper2);
forward float operator%(int oper1, float oper2); stock float operator%(int oper1, float oper2)
{
return __FLOAT_MOD__(float(oper1), oper2);
}
#endif // __sourcepawn2__ #endif // __sourcepawn2__
#define FLOAT_PI 3.1415926535897932384626433832795 #define FLOAT_PI 3.1415926535897932384626433832795