Optimize getting active objects a bit. #8674

diff --git a/src/client/activeobjectmgr.cpp b/src/client/activeobjectmgr.cpp
index 4ed98d79bdedb6afe1d20246b00469cca0a84259..9fd8490f2c5685e9c4a5b7e3ad9d742001d79e49 100644 (file)
--- a/src/client/activeobjectmgr.cpp
+++ b/src/client/activeobjectmgr.cpp
@@ -91,15 +91,16 @@ void ActiveObjectMgr::removeObject(u16 id)
 void ActiveObjectMgr::getActiveObjects(const v3f &origin, f32 max_d,
                std::vector<DistanceSortedActiveObject> &dest)
 {
+       f32 max_d2 = max_d * max_d;
        for (auto &ao_it : m_active_objects) {
                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;
 
-               dest.emplace_back(obj, d);
+               dest.emplace_back(obj, d2);
        }
 }
 

diff --git a/src/client/clientobject.h b/src/client/clientobject.h
index 9377d1e678927b48ded0440a0490f89047df457a..5e34177e4ba68c20ddddb626a564b617d3d95c9b 100644 (file)
--- a/src/client/clientobject.h
+++ b/src/client/clientobject.h
@@ -90,10 +90,10 @@ private:
        static std::unordered_map<u16, Factory> m_types;
 };
 
-struct DistanceSortedActiveObject
+class DistanceSortedActiveObject
 {
+public:
        ClientActiveObject *obj;
-       f32 d;
 
        DistanceSortedActiveObject(ClientActiveObject *a_obj, f32 a_d)
        {
@@ -105,4 +105,7 @@ struct DistanceSortedActiveObject
        {
                return d < other.d;
        }
+
+private:
+       f32 d;
 };

diff --git a/src/server/activeobjectmgr.cpp b/src/server/activeobjectmgr.cpp
index 56febd76ea34f7cea364daa099ca97e8ed3ed93b..01d9d5ae82c0b5ab595a504dba8cb96c58dcfa51 100644 (file)
--- a/src/server/activeobjectmgr.cpp
+++ b/src/server/activeobjectmgr.cpp
@@ -115,11 +115,12 @@ void ActiveObjectMgr::removeObject(u16 id)
 void ActiveObjectMgr::getObjectsInsideRadius(
                const v3f &pos, float radius, std::vector<u16> &result)
 {
+       float r2 = radius * radius;
        for (auto &activeObject : m_active_objects) {
                ServerActiveObject *obj = activeObject.second;
                u16 id = activeObject.first;
                const v3f &objectpos = obj->getBasePosition();
-               if (objectpos.getDistanceFrom(pos) > radius)
+               if (objectpos.getDistanceFromSQ(pos) > r2)
                        continue;
                result.push_back(id);
        }