Browse Source

Add int versions of Max, Min & Clamp to the AngelScript API.

Lasse Öörni 12 years ago
parent
commit
f02650d10e
3 changed files with 9 additions and 0 deletions
  1. 3 0
      Docs/AngelScriptAPI.h
  2. 3 0
      Docs/ScriptAPI.dox
  3. 3 0
      Source/Engine/Script/MathAPI.cpp

+ 3 - 0
Docs/AngelScriptAPI.h

@@ -8304,8 +8304,11 @@ float Abs(float);
 float Sqrt(float);
 float Sqrt(float);
 float Pow(float);
 float Pow(float);
 float Min(float, float);
 float Min(float, float);
+int Min(int, int);
 float Max(float, float);
 float Max(float, float);
+int Max(int, int);
 float Clamp(float, float, float);
 float Clamp(float, float, float);
+int Clamp(int, int, int);
 float Lerp(float, float, float);
 float Lerp(float, float, float);
 float Mod(float, float);
 float Mod(float, float);
 float Floor(float);
 float Floor(float);

+ 3 - 0
Docs/ScriptAPI.dox

@@ -7042,8 +7042,11 @@ Properties:
 - float Sqrt(float)
 - float Sqrt(float)
 - float Pow(float)
 - float Pow(float)
 - float Min(float, float)
 - float Min(float, float)
+- int Min(int, int)
 - float Max(float, float)
 - float Max(float, float)
+- int Max(int, int)
 - float Clamp(float, float, float)
 - float Clamp(float, float, float)
+- int Clamp(int, int, int)
 - float Lerp(float, float, float)
 - float Lerp(float, float, float)
 - float Mod(float, float)
 - float Mod(float, float)
 - float Floor(float)
 - float Floor(float)

+ 3 - 0
Source/Engine/Script/MathAPI.cpp

@@ -59,8 +59,11 @@ static void RegisterMathFunctions(asIScriptEngine* engine)
     engine->RegisterGlobalFunction("float Sqrt(float)", asFUNCTION(sqrtf), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Sqrt(float)", asFUNCTION(sqrtf), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Pow(float)", asFUNCTION(powf), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Pow(float)", asFUNCTION(powf), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Min(float, float)", asFUNCTIONPR(Min, (float, float), float), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Min(float, float)", asFUNCTIONPR(Min, (float, float), float), asCALL_CDECL);
+    engine->RegisterGlobalFunction("int Min(int, int)", asFUNCTIONPR(Min, (int, int), int), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Max(float, float)", asFUNCTIONPR(Max, (float, float), float), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Max(float, float)", asFUNCTIONPR(Max, (float, float), float), asCALL_CDECL);
+    engine->RegisterGlobalFunction("int Max(int, int)", asFUNCTIONPR(Max, (int, int), int), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Clamp(float, float, float)", asFUNCTIONPR(Clamp, (float, float, float), float), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Clamp(float, float, float)", asFUNCTIONPR(Clamp, (float, float, float), float), asCALL_CDECL);
+    engine->RegisterGlobalFunction("int Clamp(int, int, int)", asFUNCTIONPR(Clamp, (int, int, int), int), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Lerp(float, float, float)", asFUNCTIONPR(Lerp, (float, float, float), float), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Lerp(float, float, float)", asFUNCTIONPR(Lerp, (float, float, float), float), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Mod(float, float)", asFUNCTION(fmodf), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Mod(float, float)", asFUNCTION(fmodf), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Floor(float)", asFUNCTION(floorf), asCALL_CDECL);
     engine->RegisterGlobalFunction("float Floor(float)", asFUNCTION(floorf), asCALL_CDECL);