oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-27 17:28:41 +00:00
Code Wiki Activity

Add an activeobject manager to hold active objects (#7939)

Browse source 
* Add an activeobject manager to hold active objects
* Add unittests
This commit is contained in:
Loïc Blot 2018-12-13 20:18:54 +01:00 • committed by GitHub
parent 839e935ba0
commit eda35100b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 844 additions and 320 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/client/clientenvironment.h
View file

@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <ISceneManager.h>
#include "clientobject.h"
#include "util/numeric.h"
#include "activeobjectmgr.h"
class ClientSimpleObject;
class ClientMap;
@ -87,7 +88,10 @@ public:
*/
GenericCAO* getGenericCAO(u16 id);
ClientActiveObject* getActiveObject(u16 id);
ClientActiveObject* getActiveObject(u16 id)
{
return m_ao_manager.getActiveObject(id);
}
/*
Adds an active object to the environment.
@ -100,7 +104,10 @@ public:
u16 addActiveObject(ClientActiveObject *object);
void addActiveObject(u16 id, u8 type, const std::string &init_data);
void removeActiveObject(u16 id);
void removeActiveObject(u16 id)
{
m_ao_manager.removeObject(id);
}
void processActiveObjectMessage(u16 id, const std::string &data);
@ -115,8 +122,11 @@ public:
*/
// Get all nearby objects
void getActiveObjects(v3f origin, f32 max_d,
std::vector<DistanceSortedActiveObject> &dest);
void getActiveObjects(const v3f &origin, f32 max_d,
std::vector<DistanceSortedActiveObject> &dest)
{
return m_ao_manager.getActiveObjects(origin, max_d, dest);
}
bool hasClientEnvEvents() const { return !m_client_event_queue.empty(); }
@ -142,7 +152,7 @@ private:
ITextureSource *m_texturesource;
Client *m_client;
ClientScripting *m_script = nullptr;
ClientActiveObjectMap m_active_objects;
client::ActiveObjectMgr m_ao_manager;
std::vector<ClientSimpleObject*> m_simple_objects;
std::queue<ClientEnvEvent> m_client_event_queue;
IntervalLimiter m_active_object_light_update_interval;