diff --git a/bin/layers/local_panel/local_panel.cpp b/bin/layers/local_panel/local_panel.cpp index 9e8e743..cf41c74 100755 --- a/bin/layers/local_panel/local_panel.cpp +++ b/bin/layers/local_panel/local_panel.cpp @@ -14,7 +14,7 @@ namespace sandbox if (ImGui::Button("RUN 2", ImVec2(28, 30))) { - VE::event e { "target_id", test_event::TEST_EVEN , std::string("test event message") }; + VE::event e { test_event::TEST_EVEN , std::string("test event message") }; VE_EMIT(e); } @@ -22,7 +22,7 @@ namespace sandbox if (ImGui::Button(VE::style::icon::ICON_STOP, ImVec2(28, 30))) { - VE::event e { "target_id", test_event::TEST_EVEN , std::string("test icon button") }; + VE::event e { test_event::TEST_EVEN , std::string("test icon button") }; VE_EMIT(e); } diff --git a/bin/layers/test_panel/test_panel.cpp b/bin/layers/test_panel/test_panel.cpp index 655a0ac..dfbfb1c 100755 --- a/bin/layers/test_panel/test_panel.cpp +++ b/bin/layers/test_panel/test_panel.cpp @@ -18,7 +18,7 @@ namespace sandbox if (ImGui::Button("RUN", ImVec2(28, 30))) { - VE::event e { "target_id", test_event::TEST_EVEN , std::string("test event message") }; + VE::event e { test_event::TEST_EVEN , std::string("test event message") }; VE_EMIT(e); } diff --git a/src/event/event.hpp b/src/event/event.hpp index 13094a0..eebca52 100755 --- a/src/event/event.hpp +++ b/src/event/event.hpp @@ -29,15 +29,11 @@ namespace VE struct event { - event(std::any target, std::any type, std::any data) : m_target { target }, m_type{ type }, m_data{ data } {} + event(std::any type, std::any data) : m_type{ type }, m_data{ data } {} ~event() = default; - std::any m_target; std::any m_type; std::any m_data; - // HERE - // как-то не прикольно так !!! - bool is_parallele{ false }; }; struct event_manager : public hack::patterns::singleton diff --git a/src/glfw/glfw.cpp b/src/glfw/glfw.cpp index 4c52c3b..1c67801 100755 --- a/src/glfw/glfw.cpp +++ b/src/glfw/glfw.cpp @@ -113,7 +113,7 @@ namespace VE { glfwSetKeyCallback(m_win, [](GLFWwindow* w, int key, int scancode, int action, int mods) { - event e{ event_target::VE, action, key }; + event e{ action, key }; // HERE // тут одноврекменно срабатывает только один сигнал @@ -148,7 +148,7 @@ namespace VE { glfwSetMouseButtonCallback(m_win, [](GLFWwindow* w, int button, int action, int mods) { - event e{ event_target::VE, action, button }; + event e{ action, button }; switch (action) { @@ -180,7 +180,7 @@ namespace VE { try { - event e{ event_target::VE, event_type::MOUSE_SCROLL, std::pair{ static_cast(xOffset), static_cast(yOffset) } }; + event e{ event_type::MOUSE_SCROLL, std::pair{ static_cast(xOffset), static_cast(yOffset) } }; VE_EMIT(e); } catch(std::exception& e) @@ -193,7 +193,7 @@ namespace VE { try { - event e{ event_target::VE, event_type::MOUSE_CURSOR_POSITION, std::pair{ static_cast(xPos), static_cast(yPos) } }; + event e{ event_type::MOUSE_CURSOR_POSITION, std::pair{ static_cast(xPos), static_cast(yPos) } }; VE_EMIT(e); } catch(std::exception& e) @@ -215,7 +215,7 @@ namespace VE try { - event e{ event_target::VE, event_type::WINDOW_RESIZE, std::pair{ static_cast(width), static_cast(height) } }; + event e{ event_type::WINDOW_RESIZE, std::pair{ static_cast(width), static_cast(height) } }; VE_EMIT(e); } catch(std::exception& e) @@ -228,7 +228,7 @@ namespace VE { try { - event e{ event_target::VE, event_type::WINDOW_CLOSE, nullptr }; + event e{ event_type::WINDOW_CLOSE, nullptr }; VE_EMIT(e); } catch(std::exception& e) @@ -241,7 +241,7 @@ namespace VE { try { - event e{ event_target::VE, event_type::WINDOW_FOCUS, focused }; + event e{ event_type::WINDOW_FOCUS, focused }; VE_EMIT(e); } catch(std::exception& e)