NDT/EtrediaEmpires
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove MAP_WORKER_COMMAND macro

Browse Source
This commit is contained in:
legatt 2026-02-18 23:40:17 +03:00
parent 08477f316e
commit 9f6ff5fad8
5 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine-api/src/Render.cpp
View File

@ -2,7 +2,6 @@ module;
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
#include <ee_utils/utils.hpp>
module Render; module Render;
import std; import std;
@ -10,7 +9,7 @@ import utils;
ee_engine::IRenderer::IRenderer(GLFWwindow *window) ee_engine::IRenderer::IRenderer(GLFWwindow *window)
{ {
commandsMapping[RendererCommand::UPDATE_REGION] = MAP_WORKER_COMMAND(RendererCommand, UpdateRegionCmd); commandsMapping[RendererCommand::UPDATE_REGION] = std::bind_front(&IRenderer::UpdateRegionCmd, this);
this->window = window; this->window = window;
glfwGetFramebufferSize(window, &screenWidth, &screenHeight); glfwGetFramebufferSize(window, &screenWidth, &screenHeight);

7
engine/modules/AssetManager.cppm
View File

@ -1,7 +1,6 @@
module; module;
#include "compile_config.hpp" #include "compile_config.hpp"
#include <ee_utils/utils.hpp>
#include <xxhash.h> #include <xxhash.h>
export module AssetManager; export module AssetManager;
@ -99,9 +98,9 @@ export
public: public:
AssetManager() : ee_utils::ThreadedWorker<AssetStreamCommand, AssetStreamCommand::COMPLETED>(L"Assets Stream") AssetManager() : ee_utils::ThreadedWorker<AssetStreamCommand, AssetStreamCommand::COMPLETED>(L"Assets Stream")
{ {
commandsMapping[AssetStreamCommand::LOAD] = MAP_WORKER_COMMAND(AssetStreamCommand, LoadCmd); commandsMapping[AssetStreamCommand::LOAD] = std::bind_front(&AssetManager::LoadCmd, this);
commandsMapping[AssetStreamCommand::FIND] = MAP_WORKER_COMMAND(AssetStreamCommand, FindCmd); commandsMapping[AssetStreamCommand::FIND] = std::bind_front(&AssetManager::FindCmd, this);
commandsMapping[AssetStreamCommand::GET] = MAP_WORKER_COMMAND(AssetStreamCommand, GetCmd); commandsMapping[AssetStreamCommand::GET] = std::bind_front(&AssetManager::GetCmd, this);
diskSystem = Allocate<NativeFileSystem>(); diskSystem = Allocate<NativeFileSystem>();
} }

7
engine/src/Client.cpp
View File

@ -1,7 +1,3 @@
module;
#include <ee_utils/utils.hpp>
module Client; module Client;
import utils; import utils;
import views; import views;
@ -9,8 +5,7 @@ import Engine;
Client::Client() : ee_utils::ThreadedWorker<ClientCommand, ClientCommand::COMPLETED>(L"Client") Client::Client() : ee_utils::ThreadedWorker<ClientCommand, ClientCommand::COMPLETED>(L"Client")
{ {
commandsMapping[ClientCommand::SEND] = MAP_WORKER_COMMAND(ClientCommand, SendCmd); commandsMapping[ClientCommand::SEND] = std::bind_front(&Client::SendCmd, this);
} }
void Client::Init() void Client::Init()

1
engine/src/FileSystem.cpp
View File

@ -5,6 +5,7 @@ module;
module FileSystem; module FileSystem;
import utils; import utils;
//TOO: REWORK WITH IOCP
IFileSystem::~IFileSystem() IFileSystem::~IFileSystem()
{ {

6
utils/include/ee_utils/utils.hpp
View File

@ -1,6 +0,0 @@
#ifndef ETREDIAEMPIRES_UTILS_HPP
#define ETREDIAEMPIRES_UTILS_HPP
#define MAP_WORKER_COMMAND(TCommand, method) [this](TCommand &cmd) {this->method(cmd);}
#endif //ETREDIAEMPIRES_UTILS_HPP