Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add element/table ignore arg to getElementsWithinRange #3871

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+65 −34
Open

Add element/table ignore arg to getElementsWithinRange #3871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44efbae
add element/table ignore arg to getElementsWithinRange (shared)
Fernando-A-Rocha Nov 26, 2024
7520eca
Merge branch 'master' into get-elements-range-arg
Fernando-A-Rocha Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 32 additions & 17 deletions Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,38 +961,53 @@ int CLuaElementDefs::GetElementsWithinColShape(lua_State* luaVM)
}

CClientEntityResult CLuaElementDefs::GetElementsWithinRange(CVector pos, float radius, std::optional<std::string> type, std::optional<unsigned short> interior,
std::optional<unsigned short> dimension)
std::optional<unsigned short> dimension, std::optional<std::variant<std::vector<CClientEntity*>, CClientEntity*>> ignore)
{
const auto typeHash = (type.has_value() && !type.value().empty()) ? CClientEntity::GetTypeHashFromString(type.value()) : 0;

const std::vector<CClientEntity*> ignoreEntities = [&]()
{
if (ignore.has_value())
{
if (ignore.value().index() == 0)
return std::get<std::vector<CClientEntity*>>(ignore.value());
else
return std::vector<CClientEntity*>{std::get<CClientEntity*>(ignore.value())};
}
return std::vector<CClientEntity*>{};
}();

CClientEntityResult result;
GetClientSpatialDatabase()->SphereQuery(result, CSphere{pos, radius});

// Remove elements that do not match the criterias
if (interior || dimension || typeHash)
{
result.erase(std::remove_if(result.begin(), result.end(),
[&, radiusSq = radius * radius](CElement* pElement) {
if (typeHash && typeHash != pElement->GetTypeHash())
return true;
[&, radiusSq = radius * radius](CElement* pElement) {
if (typeHash && typeHash != pElement->GetTypeHash())
return true;

if (interior.has_value() && interior != pElement->GetInterior())
return true;
if (interior.has_value() && interior != pElement->GetInterior())
return true;

if (dimension.has_value() && dimension != pElement->GetDimension())
return true;
if (dimension.has_value() && dimension != pElement->GetDimension())
return true;

// Check if element is within the sphere, because the spatial database is 2D
CVector elementPos;
pElement->GetPosition(elementPos);
if ((elementPos - pos).LengthSquared() > radiusSq)
return true;
// Check if element is within the sphere, because the spatial database is 2D
CVector elementPos;
pElement->GetPosition(elementPos);
if ((elementPos - pos).LengthSquared() > radiusSq)
return true;

return pElement->IsBeingDeleted();
}),
result.end());
}
// Check if element is in the ignore list
if (std::find(ignoreEntities.begin(), ignoreEntities.end(), pElement) != ignoreEntities.end())
return true;

return pElement->IsBeingDeleted();
}),
result.end());
}
return result;
}

Expand Down
3 changes: 2 additions & 1 deletion Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ class CLuaElementDefs : public CLuaDefs
LUA_DECLARE(IsElementWithinMarker);
LUA_DECLARE(GetElementsWithinColShape);
static CClientEntityResult GetElementsWithinRange(CVector pos, float radius, std::optional<std::string> type, std::optional<unsigned short> interior,
std::optional<unsigned short> dimension);
std::optional<unsigned short> dimension,
std::optional<std::variant<std::vector<CClientEntity*>, CClientEntity*>> ignore);
LUA_DECLARE(GetElementDimension);
LUA_DECLARE(GetElementZoneName);
LUA_DECLARE_OOP(GetElementBoundingBox);
Expand Down
45 changes: 30 additions & 15 deletions Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,36 +995,51 @@ int CLuaElementDefs::getElementsWithinColShape(lua_State* luaVM)
}

CElementResult CLuaElementDefs::getElementsWithinRange(CVector pos, float radius, std::optional<std::string> type, std::optional<unsigned short> interior,
std::optional<unsigned short> dimension)
std::optional<unsigned short> dimension, std::optional<std::variant<std::vector<CElement*>, CElement*>> ignore)
{
const auto typeHash = (type.has_value() && !type.value().empty()) ? CElement::GetTypeHashFromString(type.value()) : 0;

const std::vector<CElement*> ignoreEntities = [&]()
{
if (ignore.has_value())
{
if (ignore.value().index() == 0)
return std::get<std::vector<CElement*>>(ignore.value());
else
return std::vector<CElement*>{std::get<CElement*>(ignore.value())};
}
return std::vector<CElement*>{};
}();

CElementResult result;
GetSpatialDatabase()->SphereQuery(result, CSphere{pos, radius});

// Remove elements that do not match the criterias
if (interior || dimension || typeHash)
{
result.erase(std::remove_if(result.begin(), result.end(),
[&, radiusSq = radius * radius](CElement* pElement) {
if (typeHash && typeHash != pElement->GetTypeHash())
return true;
[&, radiusSq = radius * radius](CElement* pElement) {
if (typeHash && typeHash != pElement->GetTypeHash())
return true;

if (interior.has_value() && interior != pElement->GetInterior())
return true;
if (interior.has_value() && interior != pElement->GetInterior())
return true;

if (dimension.has_value() && dimension != pElement->GetDimension())
return true;
if (dimension.has_value() && dimension != pElement->GetDimension())
return true;

// Check if element is within the sphere, because the spatial database is 2D
if ((pElement->GetPosition() - pos).LengthSquared() > radiusSq)
return true;
// Check if element is within the sphere, because the spatial database is 2D
if ((pElement->GetPosition() - pos).LengthSquared() > radiusSq)
return true;

return pElement->IsBeingDeleted();
}),
result.end());
}
// Check if element is in the ignore list
if (std::find(ignoreEntities.begin(), ignoreEntities.end(), pElement) != ignoreEntities.end())
return true;

return pElement->IsBeingDeleted();
}),
result.end());
}
return result;
}

Expand Down
2 changes: 1 addition & 1 deletion Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class CLuaElementDefs : public CLuaDefs
LUA_DECLARE(getElementInterior);
LUA_DECLARE(getElementsWithinColShape);
static CElementResult getElementsWithinRange(CVector pos, float radius, std::optional<std::string> type, std::optional<unsigned short> interior,
std::optional<unsigned short> dimension);
std::optional<unsigned short> dimension, std::optional<std::variant<std::vector<CElement*>, CElement*>> ignore);
LUA_DECLARE(getElementDimension);
LUA_DECLARE(getElementZoneName);
LUA_DECLARE(getElementColShape);
Expand Down
Loading