Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Add an activeobject manager to hold active objects (#7939)
* Add an activeobject manager to hold active objects * Add unittests
- Loading branch information
Showing
15 changed files
with
844 additions
and
320 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/* | ||
Minetest | ||
Copyright (C) 2010-2018 nerzhul, Loic BLOT <loic.blot@unix-experience.fr> | ||
This program is free software; you can redistribute it and/or modify | ||
it under the terms of the GNU Lesser General Public License as published by | ||
the Free Software Foundation; either version 2.1 of the License, or | ||
(at your option) any later version. | ||
This program is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU Lesser General Public License for more details. | ||
You should have received a copy of the GNU Lesser General Public License along | ||
with this program; if not, write to the Free Software Foundation, Inc., | ||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
*/ | ||
|
||
#pragma once | ||
|
||
#include <unordered_map> | ||
#include "irrlichttypes.h" | ||
|
||
class TestClientActiveObjectMgr; | ||
class TestServerActiveObjectMgr; | ||
|
||
template <typename T> class ActiveObjectMgr | ||
{ | ||
friend class ::TestClientActiveObjectMgr; | ||
friend class ::TestServerActiveObjectMgr; | ||
|
||
public: | ||
virtual void step(float dtime, const std::function<void(T *)> &f) = 0; | ||
virtual bool registerObject(T *obj) = 0; | ||
virtual void removeObject(u16 id) = 0; | ||
|
||
T *getActiveObject(u16 id) | ||
{ | ||
typename std::unordered_map<u16, T *>::const_iterator n = | ||
m_active_objects.find(id); | ||
return (n != m_active_objects.end() ? n->second : nullptr); | ||
} | ||
|
||
protected: | ||
u16 getFreeId() const | ||
{ | ||
// try to reuse id's as late as possible | ||
static thread_local u16 last_used_id = 0; | ||
u16 startid = last_used_id; | ||
while (!isFreeId(++last_used_id)) { | ||
if (last_used_id == startid) | ||
return 0; | ||
} | ||
|
||
return last_used_id; | ||
} | ||
|
||
bool isFreeId(u16 id) const | ||
{ | ||
return id != 0 && m_active_objects.find(id) == m_active_objects.end(); | ||
} | ||
|
||
std::unordered_map<u16, T *> m_active_objects; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
/* | ||
Minetest | ||
Copyright (C) 2010-2018 nerzhul, Loic BLOT <loic.blot@unix-experience.fr> | ||
This program is free software; you can redistribute it and/or modify | ||
it under the terms of the GNU Lesser General Public License as published by | ||
the Free Software Foundation; either version 2.1 of the License, or | ||
(at your option) any later version. | ||
This program is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU Lesser General Public License for more details. | ||
You should have received a copy of the GNU Lesser General Public License along | ||
with this program; if not, write to the Free Software Foundation, Inc., | ||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
*/ | ||
|
||
#include <log.h> | ||
#include "profiler.h" | ||
#include "activeobjectmgr.h" | ||
|
||
namespace client | ||
{ | ||
|
||
void ActiveObjectMgr::clear() | ||
{ | ||
// delete active objects | ||
for (auto &active_object : m_active_objects) { | ||
delete active_object.second; | ||
} | ||
} | ||
|
||
void ActiveObjectMgr::step( | ||
float dtime, const std::function<void(ClientActiveObject *)> &f) | ||
{ | ||
g_profiler->avg("Client::ActiveObjectMgr: num of objects", | ||
m_active_objects.size()); | ||
for (auto &ao_it : m_active_objects) { | ||
f(ao_it.second); | ||
} | ||
} | ||
|
||
// clang-format off | ||
bool ActiveObjectMgr::registerObject(ClientActiveObject *obj) | ||
{ | ||
assert(obj); // Pre-condition | ||
if (obj->getId() == 0) { | ||
u16 new_id = getFreeId(); | ||
if (new_id == 0) { | ||
infostream << "Client::ActiveObjectMgr::registerObject(): " | ||
<< "no free id available" << std::endl; | ||
|
||
delete obj; | ||
return false; | ||
} | ||
obj->setId(new_id); | ||
} | ||
|
||
if (!isFreeId(obj->getId())) { | ||
infostream << "Client::ActiveObjectMgr::registerObject(): " | ||
<< "id is not free (" << obj->getId() << ")" << std::endl; | ||
delete obj; | ||
return false; | ||
} | ||
infostream << "Client::ActiveObjectMgr::registerObject(): " | ||
<< "added (id=" << obj->getId() << ")" << std::endl; | ||
m_active_objects[obj->getId()] = obj; | ||
return true; | ||
} | ||
|
||
void ActiveObjectMgr::removeObject(u16 id) | ||
{ | ||
verbosestream << "Client::ActiveObjectMgr::removeObject(): " | ||
<< "id=" << id << std::endl; | ||
ClientActiveObject *obj = getActiveObject(id); | ||
if (!obj) { | ||
infostream << "Client::ActiveObjectMgr::removeObject(): " | ||
<< "id=" << id << " not found" << std::endl; | ||
return; | ||
} | ||
|
||
m_active_objects.erase(id); | ||
|
||
obj->removeFromScene(true); | ||
delete obj; | ||
} | ||
|
||
// clang-format on | ||
void ActiveObjectMgr::getActiveObjects(const v3f &origin, f32 max_d, | ||
std::vector<DistanceSortedActiveObject> &dest) | ||
{ | ||
for (auto &ao_it : m_active_objects) { | ||
ClientActiveObject *obj = ao_it.second; | ||
|
||
f32 d = (obj->getPosition() - origin).getLength(); | ||
|
||
if (d > max_d) | ||
continue; | ||
|
||
dest.emplace_back(obj, d); | ||
} | ||
} | ||
|
||
} // namespace client |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
/* | ||
Minetest | ||
Copyright (C) 2010-2018 nerzhul, Loic BLOT <loic.blot@unix-experience.fr> | ||
This program is free software; you can redistribute it and/or modify | ||
it under the terms of the GNU Lesser General Public License as published by | ||
the Free Software Foundation; either version 2.1 of the License, or | ||
(at your option) any later version. | ||
This program is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU Lesser General Public License for more details. | ||
You should have received a copy of the GNU Lesser General Public License along | ||
with this program; if not, write to the Free Software Foundation, Inc., | ||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
*/ | ||
|
||
#pragma once | ||
|
||
#include <functional> | ||
#include <vector> | ||
#include "../activeobjectmgr.h" | ||
#include "clientobject.h" | ||
|
||
namespace client | ||
{ | ||
class ActiveObjectMgr : public ::ActiveObjectMgr<ClientActiveObject> | ||
{ | ||
public: | ||
void clear(); | ||
void step(float dtime, | ||
const std::function<void(ClientActiveObject *)> &f) override; | ||
bool registerObject(ClientActiveObject *obj) override; | ||
void removeObject(u16 id) override; | ||
|
||
void getActiveObjects(const v3f &origin, f32 max_d, | ||
std::vector<DistanceSortedActiveObject> &dest); | ||
}; | ||
} // namespace client |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.