BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Optimize getting active objects a bit. #8674

Browse Source
This commit is contained in:
Lars Hofhansl 2019-07-16 15:55:17 -07:00
parent 41229696be
commit 9fe3246154
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/activeobjectmgr.cpp
View File

@ -91,15 +91,16 @@ void ActiveObjectMgr::removeObject(u16 id)
void ActiveObjectMgr::getActiveObjects(const v3f &origin, f32 max_d, void ActiveObjectMgr::getActiveObjects(const v3f &origin, f32 max_d,
std::vector<DistanceSortedActiveObject> &dest) std::vector<DistanceSortedActiveObject> &dest)
{ {
f32 max_d2 = max_d * max_d;
for (auto &ao_it : m_active_objects) { for (auto &ao_it : m_active_objects) {
ClientActiveObject *obj = ao_it.second; ClientActiveObject *obj = ao_it.second;
f32 d = (obj->getPosition() - origin).getLength(); f32 d2 = (obj->getPosition() - origin).getLengthSQ();
if (d > max_d) if (d2 > max_d2)
continue; continue;
dest.emplace_back(obj, d); dest.emplace_back(obj, d2);
} }
} }

7
src/client/clientobject.h
View File

@ -90,10 +90,10 @@ private:
static std::unordered_map<u16, Factory> m_types; static std::unordered_map<u16, Factory> m_types;
}; };
struct DistanceSortedActiveObject class DistanceSortedActiveObject
{ {
public:
ClientActiveObject *obj; ClientActiveObject *obj;
f32 d;
DistanceSortedActiveObject(ClientActiveObject *a_obj, f32 a_d) DistanceSortedActiveObject(ClientActiveObject *a_obj, f32 a_d)
{ {
@ -105,4 +105,7 @@ struct DistanceSortedActiveObject
{ {
return d < other.d; return d < other.d;
} }
private:
f32 d;
}; };

3
src/server/activeobjectmgr.cpp
View File

@ -115,11 +115,12 @@ void ActiveObjectMgr::removeObject(u16 id)
void ActiveObjectMgr::getObjectsInsideRadius( void ActiveObjectMgr::getObjectsInsideRadius(
const v3f &pos, float radius, std::vector<u16> &result) const v3f &pos, float radius, std::vector<u16> &result)
{ {
float r2 = radius * radius;
for (auto &activeObject : m_active_objects) { for (auto &activeObject : m_active_objects) {
ServerActiveObject *obj = activeObject.second; ServerActiveObject *obj = activeObject.second;
u16 id = activeObject.first; u16 id = activeObject.first;
const v3f &objectpos = obj->getBasePosition(); const v3f &objectpos = obj->getBasePosition();
if (objectpos.getDistanceFrom(pos) > radius) if (objectpos.getDistanceFromSQ(pos) > r2)
continue; continue;
result.push_back(id); result.push_back(id);
} }