Skip to content

Commit

Permalink
Code Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@ExeVirus
ExeVirus committed Jun 11, 2024
1 parent 7e504cb commit 42fdaa9
Showing 1 changed file with 88 additions and 83 deletions.
171 changes: 88 additions & 83 deletions src/server/spatial_map.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@ namespace server
// all inserted entires go into the uncached vector
void SpatialMap::insert(u16 id, const v3f &pos, bool postIteration)
{
if(!m_iterators_stopping_insertion_and_deletion) {
SpatialKey key(pos);
if (postIteration)
key = SpatialKey(pos.X, pos.Y, pos.Z, true);
m_cached.insert({key, id});
} else {
m_pending_inserts.insert(SpatialKey(pos,id));
if (m_iterators_stopping_insertion_and_deletion) {
m_pending_inserts.insert(SpatialKey(pos, id));
return;
}

SpatialKey key(pos);
if (postIteration)
key = SpatialKey(pos.X, pos.Y, pos.Z, true);
m_cached.insert({key, id});
}

// Invalidates upon position update
Expand All @@ -53,115 +54,119 @@ void SpatialMap::updatePosition(u16 id, const v3f &oldPos, const v3f &newPos)

void SpatialMap::remove(u16 id, const v3f &pos, bool postIteration)
{
if(!m_iterators_stopping_insertion_and_deletion) {
SpatialKey key(pos);
if (postIteration)
key = SpatialKey(pos.X, pos.Y, pos.Z, true);
if(m_cached.find(key) != m_cached.end()) {
auto range = m_cached.equal_range(key);
for (auto it = range.first; it != range.second; ++it) {
if (it->second == id) {
m_cached.erase(it);
return; // Erase and leave early
}
}
}
} else {
if (m_iterators_stopping_insertion_and_deletion) {
m_pending_deletes.insert(SpatialKey(pos, id));
return;
}
remove(id); // should never be hit
}

void SpatialMap::remove(u16 id)
{
if(!m_iterators_stopping_insertion_and_deletion) {
for (auto it = m_cached.begin(); it != m_cached.end(); ++it) {
SpatialKey key(pos);
if (postIteration)
key = SpatialKey(pos.X, pos.Y, pos.Z, true);
if(m_cached.find(key) != m_cached.end()) {
auto range = m_cached.equal_range(key);
for (auto it = range.first; it != range.second; ++it) {
if (it->second == id) {
m_cached.erase(it);
break; // Erase and leave early
return; // Erase and leave early
}
}
} else {
}

remove(id); // should never be hit
}

void SpatialMap::remove(u16 id)
{
if(m_iterators_stopping_insertion_and_deletion) {
m_pending_deletes.insert(SpatialKey(v3f(), id));
return;
}

for (auto it = m_cached.begin(); it != m_cached.end(); ++it) {
if (it->second == id) {
m_cached.erase(it);
return; // Erase and leave early
}
}
}

void SpatialMap::removeAll()
{
if(!m_iterators_stopping_insertion_and_deletion) {
m_cached.clear();
} else {
if(m_iterators_stopping_insertion_and_deletion) {
m_remove_all = true;
} else {
m_cached.clear();
}
}

void SpatialMap::getRelevantObjectIds(const aabb3f &box, const std::function<void(u16 id)> &callback)
{
if(!m_cached.empty()) {
// when searching, we must round to maximum extent of relevant mapblock indexes
auto low = [](f32 val) -> s16 {
s16 _val = static_cast<s16>(val / BS);
return (_val >> 4) - 1;
};
auto high = [](f32 val) -> s16 {
s16 _val = static_cast<s16>(val / BS);
return (_val >> 4) + 1;
};

v3s16 min(low(box.MinEdge.X), low(box.MinEdge.Y), low(box.MinEdge.Z)),
max(high(box.MaxEdge.X), high(box.MaxEdge.Y), high(box.MaxEdge.Z));
if (m_cached.empty()) return;

// When searching, we must round to maximum extent of relevant mapblock indexes.
// Since we're using floats, always assume +-1
auto low = [](f32 val) -> s16 {
s16 _val = static_cast<s16>(val / BS);
return (_val >> 4) - 1;
};
auto high = [](f32 val) -> s16 {
s16 _val = static_cast<s16>(val / BS);
return (_val >> 4) + 1;
};

v3s16 min(low(box.MinEdge.X), low(box.MinEdge.Y), low(box.MinEdge.Z)),
max(high(box.MaxEdge.X), high(box.MaxEdge.Y), high(box.MaxEdge.Z));

// We should only iterate using this spatial map when there are at least 1 objects per mapblocks to check.
// Otherwise, might as well just iterate.

v3s16 diff = max - min;
uint64_t number_of_mapblocks_to_check = std::abs(diff.X) * std::abs(diff.Y) * std::abs(diff.Z);
if(number_of_mapblocks_to_check <= m_cached.size()) { // might be worth it
for (s16 x = min.X; x < max.X;x++) {
for (s16 y = min.Y; y < max.Y;y++) {
for (s16 z = min.Z; z < max.Z;z++) {
SpatialKey key(x,y,z, false);
if (m_cached.find(key) != m_cached.end()) {
m_iterators_stopping_insertion_and_deletion++;
auto range = m_cached.equal_range(key);
for (auto &it = range.first; it != range.second; ++it) {
callback(it->second);
}
m_iterators_stopping_insertion_and_deletion--;
handleInsertsAndDeletes();
// We should only iterate using this spatial map when there are at least 1 objects per mapblocks to check.
// Otherwise, might as well just iterate.

v3s16 diff = max - min;
uint64_t number_of_mapblocks_to_check = std::abs(diff.X) * std::abs(diff.Y) * std::abs(diff.Z);
if(number_of_mapblocks_to_check <= m_cached.size()) { // might be worth it
for (s16 x = min.X; x < max.X;x++) {
for (s16 y = min.Y; y < max.Y;y++) {
for (s16 z = min.Z; z < max.Z;z++) {
SpatialKey key(x,y,z, false);
if (m_cached.find(key) != m_cached.end()) {
m_iterators_stopping_insertion_and_deletion++;
auto range = m_cached.equal_range(key);
for (auto &it = range.first; it != range.second; ++it) {
callback(it->second);
}
m_iterators_stopping_insertion_and_deletion--;
handleInsertsAndDeletes();
}
}
}
} else { // let's just iterate, it'll be faster
m_iterators_stopping_insertion_and_deletion++;
for (auto it = m_cached.begin(); it != m_cached.end(); ++it) {
callback(it->second);
}
m_iterators_stopping_insertion_and_deletion--;
handleInsertsAndDeletes();
}
} else { // let's just iterate, it'll be faster
m_iterators_stopping_insertion_and_deletion++;
for (auto it = m_cached.begin(); it != m_cached.end(); ++it) {
callback(it->second);
}
m_iterators_stopping_insertion_and_deletion--;
handleInsertsAndDeletes();
}
}

void SpatialMap::handleInsertsAndDeletes()
{
if(!m_iterators_stopping_insertion_and_deletion) {
if(!m_remove_all) {
for (auto key : m_pending_deletes) {
remove(key.padding_or_optional_id, v3f(key.x, key.y, key.z), true);
}
for (auto key : m_pending_inserts) {
insert(key.padding_or_optional_id, v3f(key.x, key.y, key.z), true);
}
} else {
m_cached.clear();
m_remove_all = false;
if (m_iterators_stopping_insertion_and_deletion)
return;

if(!m_remove_all) {
for (auto key : m_pending_deletes) {
remove(key.padding_or_optional_id, v3f(key.x, key.y, key.z), true);
}
for (auto key : m_pending_inserts) {
insert(key.padding_or_optional_id, v3f(key.x, key.y, key.z), true);
}
m_pending_inserts.clear();
m_pending_deletes.clear();
} else {
m_cached.clear();
m_remove_all = false;
}
m_pending_inserts.clear();
m_pending_deletes.clear();
}

} // namespace server

0 comments on commit 42fdaa9

Please sign in to comment.