chatlanin/vertex_engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix event manager

Browse Source
This commit is contained in:
Андрей Зимин
2025-03-06 09:26:04 +03:00
parent c5b7cfcd53
commit 77b626fb8c
6 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/event/event.hpp
View File

@@ -39,21 +39,18 @@ namespace VE
struct event_manager : public hack::patterns::singleton<event_manager>
{
std::vector<VE::event_fn<VE::event>> m_funcs;
std::vector<std::string> m_name;
template<typename T>
void connect(std::string name, T* obj, void (T::*method)(event))
void connect(T* obj, void (T::*method)(event))
{
m_funcs.push_back(std::bind(method, obj, std::placeholders::_1));
m_name.push_back(name);
}
void emit(event e)
{
int i = 0;
try
{
for (; i < m_funcs.size(); ++i)
for (std::size_t i = 0; i < m_funcs.size(); ++i)
{
m_funcs[i](e);
}
@@ -62,29 +59,11 @@ namespace VE
{
hack::error()(e.what());
hack::log()("size funcs", m_funcs.size());
hack::log()("key", m_name[i]);
}
catch(...)
{
hack::error()("ooops...");
}
// for(auto& func : m_funcs)
// {
// try
// {
// func(e);
// }
// catch(std::exception& e)
// {
// hack::error()(e.what());
// hack::log()("size funcs", m_funcs.size());
// }
// catch(...)
// {
// hack::error()("ooops...");
// }
// }
}
};
}

4
src/utils/define.hpp
View File

@@ -10,9 +10,7 @@
void update() override;\
void on_event(VE::event e) override
// #define VE_CONNECT(DEF_NAME, DEF_CLASS) VE::event_manager::instance().connect(DEF_NAME, std::bind(&DEF_CLASS::on_event, this, std::placeholders::_1));
#define VE_CONNECT(DEF_NAME, DEF_CLASS) VE::event_manager::instance().connect(DEF_NAME, this, &DEF_CLASS::on_event);
#define VE_CONNECT(DEF_CLASS) VE::event_manager::instance().connect(this, &DEF_CLASS::on_event);
#define VE_EMIT(e) VE::event_manager::instance().emit(e)