Merge branch 'feature/queryColShapePosition'

Author: qaisjp

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -6804,6 +6804,13 @@ CClientColShape* CStaticFunctionDefinitions::GetElementColShape(CClientEntity* p
     return pColShape;
 }
 
+bool CStaticFunctionDefinitions::IsInsideColShape(CClientColShape* pColShape, const CVector& vecPosition, bool& inside)
+{
+    inside = pColShape->DoHitDetection(vecPosition, 0);
+
+    return true;
+}
+
 bool CStaticFunctionDefinitions::GetWeaponNameFromID(unsigned char ucID, SString& strOutName)
 {
     if (ucID <= 59)

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -633,6 +633,7 @@ class CStaticFunctionDefinitions
     static CClientColPolygon*   CreateColPolygon(CResource& Resource, const CVector2D& vecPosition);
     static CClientColTube*      CreateColTube(CResource& Resource, const CVector& vecPosition, float fRadius, float fHeight);
     static CClientColShape*     GetElementColShape(CClientEntity* pEntity);
+    static bool                 IsInsideColShape(CClientColShape* pColShape, const CVector& vecPosition, bool& inside);
     static void                 RefreshColShapeColliders(CClientColShape* pColShape);
 
     // Weapon funcs

Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp

@@ -19,6 +19,8 @@ void CLuaColShapeDefs::LoadFunctions(void)
     CLuaCFunctions::AddFunction("createColRectangle", CreateColRectangle);
     CLuaCFunctions::AddFunction("createColPolygon", CreateColPolygon);
     CLuaCFunctions::AddFunction("createColTube", CreateColTube);
+
+    CLuaCFunctions::AddFunction("isInsideColShape", IsInsideColShape);
     CLuaCFunctions::AddFunction("getColShapeType", GetColShapeType);
 }
 
@@ -34,8 +36,10 @@ void CLuaColShapeDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "Polygon", "createColPolygon");
 
     lua_classfunction(luaVM, "getElementsWithin", "getElementsWithinColShape");
+    lua_classfunction(luaVM, "isInside", "isInsideColShape");
     lua_classfunction(luaVM, "getShapeType", "getColShapeType");
 
+    lua_classvariable(luaVM, "elementsWithin", nullptr, "getElementsWithinColShape");
     lua_classvariable(luaVM, "shapeType", nullptr, "getColShapeType");
 
     lua_registerclass(luaVM, "ColShape", "Element");
@@ -336,3 +340,29 @@ int CLuaColShapeDefs::CreateColTube(lua_State* luaVM)
     lua_pushboolean(luaVM, false);
     return 1;
 }
+
+int CLuaColShapeDefs::IsInsideColShape(lua_State* luaVM)
+{
+    //  bool isInsideColShape ( colshape theColShape, float posX, float posY, float posZ )
+    CClientColShape* pColShape;
+    CVector         vecPosition;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pColShape);
+    argStream.ReadVector3D(vecPosition);
+
+    if (!argStream.HasErrors())
+    {
+        bool bInside = false;
+        if (CStaticFunctionDefinitions::IsInsideColShape(pColShape, vecPosition, bInside))
+        {
+            lua_pushboolean(luaVM, bInside);
+            return 1;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+
+    lua_pushboolean(luaVM, false);
+    return 1;
+}

Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.h

@@ -25,5 +25,6 @@ class CLuaColShapeDefs : public CLuaDefs
     LUA_DECLARE(CreateColPolygon);
     LUA_DECLARE(CreateColTube);
 
+    LUA_DECLARE(IsInsideColShape);
     LUA_DECLARE(GetColShapeType);
 };

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -9323,6 +9323,13 @@ CColTube* CStaticFunctionDefinitions::CreateColTube(CResource* pResource, const
     return pColShape;
 }
 
+bool CStaticFunctionDefinitions::IsInsideColShape(CColShape* pColShape, const CVector& vecPosition, bool& inside)
+{
+    inside = pColShape->DoHitDetection(vecPosition);
+
+    return true;
+}
+
 // Make sure all colliders for a colshape are up to date
 void CStaticFunctionDefinitions::RefreshColShapeColliders(CColShape* pColShape)
 {

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -442,6 +442,7 @@ class CStaticFunctionDefinitions
     static CColRectangle* CreateColRectangle(CResource* pResource, const CVector2D& vecPosition, const CVector2D& vecSize);
     static CColPolygon*   CreateColPolygon(CResource* pResource, const std::vector<CVector2D>& vecPointList);
     static CColTube*      CreateColTube(CResource* pResource, const CVector& vecPosition, float fRadius, float fHeight);
+    static bool           IsInsideColShape(CColShape* pColShape, const CVector& vecPosition, bool& inside);
     static void           RefreshColShapeColliders(CColShape* pColShape);
 
     // Weapon funcs

Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp

@@ -19,6 +19,8 @@ void CLuaColShapeDefs::LoadFunctions()
     CLuaCFunctions::AddFunction("createColRectangle", CreateColRectangle);
     CLuaCFunctions::AddFunction("createColPolygon", CreateColPolygon);
     CLuaCFunctions::AddFunction("createColTube", CreateColTube);
+
+    CLuaCFunctions::AddFunction("isInsideColShape", IsInsideColShape);
     CLuaCFunctions::AddFunction("getColShapeType", GetColShapeType);
 }
 
@@ -34,8 +36,9 @@ void CLuaColShapeDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "Polygon", "createColPolygon");
 
     lua_classfunction(luaVM, "getElementsWithin", "getElementsWithinColShape");
-    lua_classfunction(luaVM, "getShapeType", "getColShapeType");
+    lua_classfunction(luaVM, "isInside", "isInsideColShape");
 
+    lua_classfunction(luaVM, "getShapeType", "getColShapeType");
     lua_classvariable(luaVM, "shapeType", nullptr, "getColShapeType");
 
     lua_registerclass(luaVM, "ColShape", "Element");
@@ -326,3 +329,29 @@ int CLuaColShapeDefs::CreateColTube(lua_State* luaVM)
     lua_pushboolean(luaVM, false);
     return 1;
 }
+
+int CLuaColShapeDefs::IsInsideColShape(lua_State* luaVM)
+{
+    //  bool isInsideColShape ( colshape theColShape, float posX, float posY, float posZ )
+    CColShape* pColShape;
+    CVector         vecPosition;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pColShape);
+    argStream.ReadVector3D(vecPosition);
+
+    if (!argStream.HasErrors())
+    {
+        bool bInside = false;
+        if (CStaticFunctionDefinitions::IsInsideColShape(pColShape, vecPosition, bInside))
+        {
+            lua_pushboolean(luaVM, bInside);
+            return 1;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+
+    lua_pushboolean(luaVM, false);
+    return 1;
+}

Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.h

@@ -26,5 +26,6 @@ class CLuaColShapeDefs : public CLuaDefs
     LUA_DECLARE(CreateColPolygon);
     LUA_DECLARE(CreateColTube);
 
+    LUA_DECLARE(IsInsideColShape);
     LUA_DECLARE(GetColShapeType);
 };