diff --git a/modules/ClientModule/src/ClientModule.h b/modules/ClientModule/src/ClientModule.h index c183afd..ff0c5c8 100644 --- a/modules/ClientModule/src/ClientModule.h +++ b/modules/ClientModule/src/ClientModule.h @@ -58,7 +58,7 @@ class ClientModule : public Archimedes::Module { } void OnSteamNetConnectionStatusChanged( SteamNetConnectionStatusChangedCallback_t *pInfo ) { - app->emitEvent(new CMEvent::ConnectionStatusChangedEvent(pInfo)); + app->emitEvent(new Archimedes::ConnectionStatusChangedEvent(pInfo)); } void PollConnectionStateChanges() { diff --git a/modules/ImguiModule/src/ImguiModule.h b/modules/ImguiModule/src/ImguiModule.h index 5ff2882..8d42c8d 100644 --- a/modules/ImguiModule/src/ImguiModule.h +++ b/modules/ImguiModule/src/ImguiModule.h @@ -30,7 +30,7 @@ class ImguiModule : public Archimedes::Module { void releaseContext(ImGuiContext* ctxt) { if(ctxt == context && context != nullptr) { if(--contextRefs == 0) { - app->stopModule(name); + app->emitEvent(new Archimedes::DoUnloadModuleEvent(name)); } } } diff --git a/modules/ServerModule/src/ServerModule.cpp b/modules/ServerModule/src/ServerModule.cpp index ea07734..66c82c3 100644 --- a/modules/ServerModule/src/ServerModule.cpp +++ b/modules/ServerModule/src/ServerModule.cpp @@ -6,9 +6,9 @@ ServerModule::ServerModule(Archimedes::App* a, void* h) : Archimedes::Module(a, ServerModule::~ServerModule() { if(app) { - app->unregisterEvent(SMEvent::DataRecievedEvent()); - app->unregisterEvent(SMEvent::DataSentEvent()); - app->unregisterEvent(SMEvent::ConnectionStatusChangedEvent()); + app->unregisterEvent(Archimedes::DataRecievedEvent()); + app->unregisterEvent(Archimedes::DataSentEvent()); + app->unregisterEvent(Archimedes::ConnectionStatusChangedEvent()); GameNetworkingSockets_Kill(); } @@ -16,9 +16,9 @@ ServerModule::~ServerModule() { void ServerModule::onLoad() { - app->registerEvent(SMEvent::DataRecievedEvent()); - app->registerEvent(SMEvent::DataSentEvent()); - app->registerEvent(SMEvent::ConnectionStatusChangedEvent()); + app->registerEvent(Archimedes::DataRecievedEvent()); + app->registerEvent(Archimedes::DataSentEvent()); + app->registerEvent(Archimedes::ConnectionStatusChangedEvent()); SteamDatagramErrMsg errMsg; @@ -80,9 +80,9 @@ bool ServerModule::onEvent(const Archimedes::Event& event) { unsigned int type = app->getEventType(event); - if(eventsToHandle & SMEventEnum::ConnectionStatusChanged && type == app->getEventType(SMEvent::ConnectionStatusChangedEvent())) { + if(eventsToHandle & SMEventEnum::ConnectionStatusChanged && type == app->getEventType(Archimedes::ConnectionStatusChangedEvent())) { - SMEvent::ConnectionStatusChangedEvent& e = (SMEvent::ConnectionStatusChangedEvent&) event; + Archimedes::ConnectionStatusChangedEvent& e = (Archimedes::ConnectionStatusChangedEvent&) event; switch(e.info->m_info.m_eState) { @@ -194,9 +194,9 @@ bool ServerModule::onEvent(const Archimedes::Event& event) { } return true; - } else if(eventsToHandle & SMEventEnum::DataRecieved && type == app->getEventType(SMEvent::DataRecievedEvent())) { + } else if(eventsToHandle & SMEventEnum::DataRecieved && type == app->getEventType(Archimedes::DataRecievedEvent())) { return true; - } else if(eventsToHandle & SMEventEnum::DataSent && type == app->getEventType(SMEvent::DataSentEvent())) { + } else if(eventsToHandle & SMEventEnum::DataSent && type == app->getEventType(Archimedes::DataSentEvent())) { return true; } @@ -217,6 +217,6 @@ void ServerModule::pollIncomingData() { auto itClient = clients.find( pIncomingMsg->m_conn ); assert( itClient != clients.end() ); - app->emitEvent(new SMEvent::DataRecievedEvent(pIncomingMsg)); + app->emitEvent(new Archimedes::DataRecievedEvent(pIncomingMsg)); } } diff --git a/modules/ServerModule/src/ServerModule.h b/modules/ServerModule/src/ServerModule.h index bf844e8..2e19749 100644 --- a/modules/ServerModule/src/ServerModule.h +++ b/modules/ServerModule/src/ServerModule.h @@ -6,7 +6,7 @@ #include #include -#include "ServerEvents.h" +#include "utils/Events/NetworkEvents.h" class ServerModule : public Archimedes::Module { @@ -76,7 +76,7 @@ class ServerModule : public Archimedes::Module { } void OnSteamNetConnectionStatusChanged( SteamNetConnectionStatusChangedCallback_t *pInfo ) { - app->emitEvent(new SMEvent::ConnectionStatusChangedEvent(pInfo)); + app->emitEvent(new Archimedes::ConnectionStatusChangedEvent(pInfo)); } std::map clients; diff --git a/modules/examples/ChatClient/src/ChatClient.cpp b/modules/examples/ChatClient/src/ChatClient.cpp index 2dfd6af..4738c6a 100644 --- a/modules/examples/ChatClient/src/ChatClient.cpp +++ b/modules/examples/ChatClient/src/ChatClient.cpp @@ -25,10 +25,12 @@ ChatClient::~ChatClient() { void ChatClient::onLoad() { + std::cerr << "onLoad\n"; + ImguiModule* im; { im = (ImguiModule*) moduleInstances[ImguiModule()]; } if(!im) { - std::cout << "No ImguiModule for TestImgui!\n"; + std::cout << "No ClientModule for ChatClient!\n"; std::abort(); } @@ -38,8 +40,15 @@ void ChatClient::onLoad() { void ChatClient::run() { + std::cerr << "run\n"; + static ClientModule* cm; { cm = (ClientModule*) moduleInstances[ClientModule()]; } + if(!cm) { + std::cout << "No ClientModule for ChatClient!\n"; + std::abort(); + } + if(open) { static std::string s, addr = "127.0.0.1:9932"; @@ -81,6 +90,7 @@ void ChatClient::run() { bool ChatClient::onEvent(const Archimedes::Event& event) { + std::cerr << "onEvent: " << (std::string) event << std::endl; unsigned int type = app->getEventType(event); @@ -89,9 +99,9 @@ bool ChatClient::onEvent(const Archimedes::Event& event) { return true; } else */ - if(type == app->getEventType(CMEvent::DataRecievedEvent())) { + if(type == app->getEventType(Archimedes::DataRecievedEvent())) { - CMEvent::DataRecievedEvent& e = (CMEvent::DataRecievedEvent&) event; + Archimedes::DataRecievedEvent& e = (Archimedes::DataRecievedEvent&) event; static std::string s; s = std::string((const char*)e.msg->m_pData, e.msg->m_cbSize); @@ -103,7 +113,7 @@ bool ChatClient::onEvent(const Archimedes::Event& event) { } /*else if(type == app->getEventType("ConnectionStatusChangedEvent")) { - //CMEvent::ConnectionStatusChangedEvent& e = (CMEvent::ConnectionStatusChangedEvent&) event; + //Archimedes::ConnectionStatusChangedEvent& e = (Archimedes::ConnectionStatusChangedEvent&) event; return false; diff --git a/modules/examples/ChatServer/src/ChatServer.cpp b/modules/examples/ChatServer/src/ChatServer.cpp index efcfdd6..6974ce8 100644 --- a/modules/examples/ChatServer/src/ChatServer.cpp +++ b/modules/examples/ChatServer/src/ChatServer.cpp @@ -18,11 +18,11 @@ bool ChatServer::onEvent(const Archimedes::Event& event) { return true; } else */ - if(type == app->getEventType(SMEvent::DataRecievedEvent())) { + if(type == app->getEventType(Archimedes::DataRecievedEvent())) { static ServerModule* sm; { sm = (ServerModule*) moduleInstances[ServerModule()]; } - SMEvent::DataRecievedEvent& e = (SMEvent::DataRecievedEvent&) event; + Archimedes::DataRecievedEvent& e = (Archimedes::DataRecievedEvent&) event; static std::string s; s = std::string((const char*)e.msg->m_pData, e.msg->m_cbSize); @@ -46,7 +46,7 @@ bool ChatServer::onEvent(const Archimedes::Event& event) { } /*else if(type == app->getEventType("ConnectionStatusChangedEvent")) { - //SMEvent::ConnectionStatusChangedEvent& e = (SMEvent::ConnectionStatusChangedEvent&) event; + //Archimedes::ConnectionStatusChangedEvent& e = (Archimedes::ConnectionStatusChangedEvent&) event; return false; diff --git a/src/example_apps/MinimalApp/MinimalApp.h b/src/example_apps/MinimalApp/MinimalApp.h index c767933..bfd36d0 100644 --- a/src/example_apps/MinimalApp/MinimalApp.h +++ b/src/example_apps/MinimalApp/MinimalApp.h @@ -16,7 +16,7 @@ class MinimalApp : public Archimedes::App { void handleArgs(const int& argc, char* argv[]) override { if(argc > 1) { for(int i = 1; i < argc; i++) { - load(dynamicLoad(argv[i])); + load(argv[i]); } } else { std::cout << "No modules to load\n";