From 2668ad99440d691350b85067c8ef8d57142a0b95 Mon Sep 17 00:00:00 2001 From: chatlanin Date: Sat, 31 May 2025 14:08:32 +0300 Subject: [PATCH] add event to emnit --- example/layers/ui_layer/ui_layer.cpp | 2 +- src/vertex_engine/event/connector.hpp | 25 +------ src/vertex_engine/event/event_manager.hpp | 83 ----------------------- 3 files changed, 2 insertions(+), 108 deletions(-) diff --git a/example/layers/ui_layer/ui_layer.cpp b/example/layers/ui_layer/ui_layer.cpp index c7c3b2d..cfaba3a 100755 --- a/example/layers/ui_layer/ui_layer.cpp +++ b/example/layers/ui_layer/ui_layer.cpp @@ -47,7 +47,7 @@ namespace example if (!ImGui::Begin(VE_NAME("Test signal"), nullptr, m_win_flags)) ImGui::End(); if (ImGui::Button("Test signal", ImVec2(128, 130))) - EMIT(test_event::TEST_EVEN, std::string("test event message"), 1, "test event log msg"); + EMIT(test_event::TEST_EVEN, std::string("test event message"), "asdf-asdf-asdf", "test event log msg"); VE_POP_FONT(); diff --git a/src/vertex_engine/event/connector.hpp b/src/vertex_engine/event/connector.hpp index ebd3f45..338f83d 100755 --- a/src/vertex_engine/event/connector.hpp +++ b/src/vertex_engine/event/connector.hpp @@ -31,7 +31,7 @@ namespace VE public: template - static void EMIT(TYPE t, DATA d, int id = -1, std::string msg = "") + static void EMIT(TYPE t, DATA d, std::string id = hack::security::generate_uuid(), std::string msg = "") { event e{ t, d, id}; if (msg != "") e.m_event_log_message = msg; @@ -51,27 +51,4 @@ namespace VE private: std::string m_key; }; - - // template - // void CONNECT(T* obj) - // { - // event_manager::instance().connect(obj, &T::on_event); - // } - // - // template - // void DISCONNECT(T* obj) - // { - // event_manager::instance().disconnect(obj, &T::on_event); - // } - - // template - // void EMIT(TYPE t, DATA d, int id = -1) - // { - // event_manager::instance().emit(event{ t, d, id}); - // } - // - // inline void EMIT(event e) - // { - // event_manager::instance().emit(e); - // } } diff --git a/src/vertex_engine/event/event_manager.hpp b/src/vertex_engine/event/event_manager.hpp index 5f4c0c5..67f3c8c 100755 --- a/src/vertex_engine/event/event_manager.hpp +++ b/src/vertex_engine/event/event_manager.hpp @@ -60,86 +60,3 @@ namespace VE std::map> m_funcs; }; } - - -// #pragma once -// -// #include -// #include -// #include -// #include -// #include -// -// #include "event.hpp" -// -// namespace VE -// { -// struct event_manager : public hack::patterns::singleton -// { -// void emit(event e) -// { -// if (m_funcs.size() == 0) -// { -// hack::warn()("funs is empty"); -// return; -// } -// else if (!e.m_msg.empty()) -// { -// hack::warn()("EMIT MSG:", e.m_msg, m_funcs.size()); -// } -// -// std::size_t i = 0; -// try -// { -// for(;i < m_funcs.size();++i) m_funcs[i].m_func(e); -// } -// catch(std::exception& ext) -// { -// hack::error()("call function is error:", ext.what()); -// hack::exception ex; -// ex.system_error(ext); -// ex.set_data(e); -// throw ex; -// } -// catch(...) -// { -// hack::error()("call function is error:", "oopps..."); -// hack::exception ex; -// ex.set_data(e); -// throw ex; -// } -// } -// -// template -// void connect(T* obj, void (T::*method)(event)) -// { -// m_funcs.push_back({ -// std::bind(method, obj, std::placeholders::_1), -// static_cast(obj) -// }); -// hack::warn()("connect (size)", m_funcs.size()); -// } -// -// template -// void disconnect(T* obj, void (T::*method)(event)) -// { -// m_funcs.erase( -// std::remove_if(m_funcs.begin(), m_funcs.end(), -// [obj](const auto& handler) { -// return handler.m_obj == obj; -// }), -// m_funcs.end() -// ); -// hack::warn()("disconnect (size)", m_funcs.size()); -// } -// -// struct EventHandler -// { -// std::function m_func; -// void* m_obj; -// }; -// -// std::vector m_funcs; -// -// }; -// }