Add getElementsWithinRange

Author: jushar

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

@@ -36,6 +36,7 @@ void CLuaElementDefs::LoadFunctions(void)
     CLuaCFunctions::AddFunction("isElementWithinColShape", IsElementWithinColShape);
     CLuaCFunctions::AddFunction("isElementWithinMarker", IsElementWithinMarker);
     CLuaCFunctions::AddFunction("getElementsWithinColShape", GetElementsWithinColShape);
+    CLuaCFunctions::AddFunction("getElementsWithinRange", GetElementsWithinRange);
     CLuaCFunctions::AddFunction("getElementDimension", GetElementDimension);
     CLuaCFunctions::AddFunction("getElementBoundingBox", GetElementBoundingBox);
     CLuaCFunctions::AddFunction("getElementRadius", GetElementRadius);
@@ -139,6 +140,7 @@ void CLuaElementDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "getType", "getElementType");
     lua_classfunction(luaVM, "getInterior", "getElementInterior");
     lua_classfunction(luaVM, "getWithinColShape", "getElementsWithinColShape");
+    lua_classfunction(luaVM, "getWithinRange", "getElementsWithinRange");
     lua_classfunction(luaVM, "getDimension", "getElementDimension");
     lua_classfunction(luaVM, "getColShape", "getElementColShape");
     lua_classfunction(luaVM, "getAlpha", "getElementAlpha");
@@ -928,6 +930,40 @@ int CLuaElementDefs::GetElementsWithinColShape(lua_State* luaVM)
     return 1;
 }
 
+int CLuaElementDefs::GetElementsWithinRange(lua_State* luaVM)
+{
+    CVector position;
+    float   radius;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadVector3D(position);
+    argStream.ReadNumber(radius);
+
+    if (!argStream.HasErrors())
+    {
+        // Query the spatial database
+        CClientEntityResult result;
+        GetClientSpatialDatabase()->SphereQuery(result, CSphere{ position, radius });
+
+        lua_newtable(luaVM);
+        unsigned int index = 0;
+
+        for (CClientEntity* entity : result)
+        {
+            lua_pushnumber(luaVM, ++index);
+            lua_pushelement(luaVM, entity);
+            lua_settable(luaVM, -3);
+        }
+
+        return 1;
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+
+    lua_pushboolean(luaVM, false);
+    return 1;
+}
+
 int CLuaElementDefs::GetElementDimension(lua_State* luaVM)
 {
     // Verify the argument

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

@@ -38,6 +38,7 @@ class CLuaElementDefs : public CLuaDefs
     LUA_DECLARE(IsElementWithinColShape);
     LUA_DECLARE(IsElementWithinMarker);
     LUA_DECLARE(GetElementsWithinColShape);
+    LUA_DECLARE(GetElementsWithinRange);
     LUA_DECLARE(GetElementDimension);
     LUA_DECLARE(GetElementZoneName);
     LUA_DECLARE(GetElementBoundingBox);

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

@@ -44,6 +44,7 @@ void CLuaElementDefs::LoadFunctions(void)
     CLuaCFunctions::AddFunction("getElementType", getElementType);
     CLuaCFunctions::AddFunction("getElementInterior", getElementInterior);
     CLuaCFunctions::AddFunction("getElementsWithinColShape", getElementsWithinColShape);
+    CLuaCFunctions::AddFunction("getElementsWithinRange", getElementsWithinRange);
     CLuaCFunctions::AddFunction("getElementDimension", getElementDimension);
     CLuaCFunctions::AddFunction("getElementZoneName", getElementZoneName);
     CLuaCFunctions::AddFunction("getElementColShape", getElementColShape);
@@ -99,6 +100,7 @@ void CLuaElementDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "getByID", "getElementByID");
     lua_classfunction(luaVM, "getAllByType", "getElementsByType");
     lua_classfunction(luaVM, "getByIndex", "getElementByIndex");
+    lua_classfunction(luaVM, "getWithinRange", "getElementsWithinRange");
 
     lua_classfunction(luaVM, "create", "createElement");
     lua_classfunction(luaVM, "clone", "cloneElement");
@@ -986,6 +988,40 @@ int CLuaElementDefs::getElementsWithinColShape(lua_State* luaVM)
     return 1;
 }
 
+int CLuaElementDefs::getElementsWithinRange(lua_State* luaVM)
+{
+    CVector position;
+    float   radius;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadVector3D(position);
+    argStream.ReadNumber(radius);
+
+    if (!argStream.HasErrors())
+    {
+        // Query the spatial database
+        CElementResult result;
+        GetSpatialDatabase()->SphereQuery(result, CSphere{ position, radius });
+
+        lua_newtable(luaVM);
+        unsigned int index = 0;
+
+        for (CElement* entity : result)
+        {
+            lua_pushnumber(luaVM, ++index);
+            lua_pushelement(luaVM, entity);
+            lua_settable(luaVM, -3);
+        }
+
+        return 1;
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+
+    lua_pushboolean(luaVM, false);
+    return 1;
+}
+
 int CLuaElementDefs::getElementDimension(lua_State* luaVM)
 {
     //  int getElementDimension ( element theElement )

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

@@ -44,6 +44,7 @@ class CLuaElementDefs : public CLuaDefs
     LUA_DECLARE(getElementsByType);
     LUA_DECLARE(getElementInterior);
     LUA_DECLARE(getElementsWithinColShape);
+    LUA_DECLARE(getElementsWithinRange);
     LUA_DECLARE(getElementDimension);
     LUA_DECLARE(getElementZoneName);
     LUA_DECLARE(getElementColShape);
@@ -96,4 +97,4 @@ class CLuaElementDefs : public CLuaDefs
     LUA_DECLARE(setElementFrozen);
     LUA_DECLARE(setLowLODElement);
     LUA_DECLARE(setElementCallPropagationEnabled);
-};
+};