diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2020-04-16 08:25:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 08:25:48 +0200 |
| commit | e8ac5a31cf12afcfddf8e3ed31e8038930edb06f (patch) | |
| tree | 5bdc776c5bbe190e32e42899b455e6d16179e3b5 /src/serverenvironment.h | |
| parent | 62ae7adab2bebde04864c12543caefbffab24963 (diff) | |
| download | minetest-e8ac5a31cf12afcfddf8e3ed31e8038930edb06f.tar.gz minetest-e8ac5a31cf12afcfddf8e3ed31e8038930edb06f.tar.bz2 minetest-e8ac5a31cf12afcfddf8e3ed31e8038930edb06f.zip | |
Optimize get_objects_inside_radius calls (#9671)
* Optimize getObjectsInsideRadius calls
our previous implementation calls the ActiveObjectMgr to return ids and then lookup those ids in the same map and test each object
Instead now we call the global map to return the pointers directly and we ask filtering when building the list using lamba.
This drop double looping over ranges of active objects (and then filtered one) and drop x lookups on the map regarding the first call results
Diffstat (limited to 'src/serverenvironment.h')
| -rw-r--r-- | src/serverenvironment.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/serverenvironment.h b/src/serverenvironment.h index 55ecbd05f..f814b95c0 100644 --- a/src/serverenvironment.h +++ b/src/serverenvironment.h @@ -323,9 +323,10 @@ public: bool swapNode(v3s16 p, const MapNode &n); // Find all active objects inside a radius around a point - void getObjectsInsideRadius(std::vector<u16> &objects, const v3f &pos, float radius) + void getObjectsInsideRadius(std::vector<ServerActiveObject *> &objects, const v3f &pos, float radius, + std::function<bool(ServerActiveObject *obj)> include_obj_cb) { - return m_ao_manager.getObjectsInsideRadius(pos, radius, objects); + return m_ao_manager.getObjectsInsideRadius(pos, radius, objects, include_obj_cb); } // Clear objects, loading and going through every MapBlock |