talezero/integration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Got rid of AnimView, added Gui

Browse Source
This commit is contained in:
Josh Yelon
2021-02-07 13:38:29 -05:00
parent 0721d29c72
commit 1ff94e2591
13 changed files with 118 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
luprex/cpp/planemap.cpp
View File

@@ -176,8 +176,11 @@ int PlaneMap::total_cells() const {
return total;
}
PlaneMap::IdVec PlaneMap::scan_radius(const std::string &plane, double x, double y, double radius) const {
PlaneMap::IdVec PlaneMap::scan_radius(const std::string &plane, double x, double y, double radius, int64_t prepend) const {
PlaneMap::IdVec result;
if (prepend != 0) {
result.push_back(prepend);
}
auto piter = planes_.find(plane);
if (piter != planes_.end()) {
const Plane &p = piter->second;
@@ -189,7 +192,9 @@ PlaneMap::IdVec PlaneMap::scan_radius(const std::string &plane, double x, double
if (liter != p.end()) {
for (PlaneItem *client : liter->second) {
if (util::distance_squared(client->x(), client->y(), x, y) <= radsq) {
result.push_back(client->id());
if (client->id() != prepend) {
result.push_back(client->id());
}
}
}
}
@@ -310,13 +315,13 @@ LuaDefine(unittests_planemap, "c") {
pia.set_id(123);
pib.set_id(456);
pib.set_pos("bar", 1100.0, 1000.0, 0.0);
ids = pm.scan_radius("bar", 1000.0, 1000.0, 1.0);
ids = pm.scan_radius("bar", 1000.0, 1000.0, 1.0, 0);
LuaAssert(L, ids.size() == 1);
LuaAssert(L, ids[0] == 123);
ids = pm.scan_radius("bar", 1000.0, 1000.0, 99.9);
ids = pm.scan_radius("bar", 1000.0, 1000.0, 99.9, 0);
LuaAssert(L, ids.size() == 1);
LuaAssert(L, ids[0] == 123);
ids = pm.scan_radius("bar", 1000.0, 1000.0, 100.0);
ids = pm.scan_radius("bar", 1000.0, 1000.0, 100.0, 0);
LuaAssert(L, ids.size() == 2);
LuaAssert(L, ids[0] == 123);
LuaAssert(L, ids[1] == 456);