consolodate NetworkEvents
This commit is contained in:
@@ -2,17 +2,17 @@
|
||||
|
||||
WindowModule::~WindowModule() {
|
||||
if(app) {
|
||||
app->unregisterEvent(Archimedes::WindowResizeEvent());
|
||||
app->unregisterEvent(Archimedes::WindowCloseEvent());
|
||||
app->unregisterEvent(Archimedes::WindowKeyPressedEvent());
|
||||
app->unregisterEvent(Archimedes::WindowKeyReleasedEvent());
|
||||
app->unregisterEvent(Archimedes::WindowMouseButtonPressedEvent());
|
||||
app->unregisterEvent(Archimedes::WindowMouseButtonReleasedEvent());
|
||||
app->unregisterEvent(Archimedes::WindowScrollEvent());
|
||||
app->unregisterEvent(Archimedes::WindowMouseMovedEvent());
|
||||
app->unregisterEvent(Archimedes::WindowFocusedEvent());
|
||||
app->unregisterEvent(Archimedes::WindowFocusLostEvent());
|
||||
app->unregisterEvent(Archimedes::WindowMovedEvent());
|
||||
app->unregisterEvent(Archimedes::ResizeWindowEvent());
|
||||
app->unregisterEvent(Archimedes::CloseWindowEvent());
|
||||
app->unregisterEvent(Archimedes::KeyPressedWindowEvent());
|
||||
app->unregisterEvent(Archimedes::KeyReleasedWindowEvent());
|
||||
app->unregisterEvent(Archimedes::MouseButtonPressedWindowEvent());
|
||||
app->unregisterEvent(Archimedes::MouseButtonReleasedWindowEvent());
|
||||
app->unregisterEvent(Archimedes::ScrollWindowEvent());
|
||||
app->unregisterEvent(Archimedes::MouseMovedWindowEvent());
|
||||
app->unregisterEvent(Archimedes::FocusedWindowEvent());
|
||||
app->unregisterEvent(Archimedes::FocusLostWindowEvent());
|
||||
app->unregisterEvent(Archimedes::MovedWindowEvent());
|
||||
|
||||
if(renderer) {
|
||||
renderer->getCmdList().clear();
|
||||
@@ -26,17 +26,17 @@ WindowModule::~WindowModule() {
|
||||
|
||||
void WindowModule::onLoad() {
|
||||
|
||||
app->registerEvent(Archimedes::WindowResizeEvent());
|
||||
app->registerEvent(Archimedes::WindowCloseEvent());
|
||||
app->registerEvent(Archimedes::WindowKeyPressedEvent());
|
||||
app->registerEvent(Archimedes::WindowKeyReleasedEvent());
|
||||
app->registerEvent(Archimedes::WindowMouseButtonPressedEvent());
|
||||
app->registerEvent(Archimedes::WindowMouseButtonReleasedEvent());
|
||||
app->registerEvent(Archimedes::WindowScrollEvent());
|
||||
app->registerEvent(Archimedes::WindowMouseMovedEvent());
|
||||
app->registerEvent(Archimedes::WindowFocusedEvent());
|
||||
app->registerEvent(Archimedes::WindowFocusLostEvent());
|
||||
app->registerEvent(Archimedes::WindowMovedEvent());
|
||||
app->registerEvent(Archimedes::ResizeWindowEvent());
|
||||
app->registerEvent(Archimedes::CloseWindowEvent());
|
||||
app->registerEvent(Archimedes::KeyPressedWindowEvent());
|
||||
app->registerEvent(Archimedes::KeyReleasedWindowEvent());
|
||||
app->registerEvent(Archimedes::MouseButtonPressedWindowEvent());
|
||||
app->registerEvent(Archimedes::MouseButtonReleasedWindowEvent());
|
||||
app->registerEvent(Archimedes::ScrollWindowEvent());
|
||||
app->registerEvent(Archimedes::MouseMovedWindowEvent());
|
||||
app->registerEvent(Archimedes::FocusedWindowEvent());
|
||||
app->registerEvent(Archimedes::FocusLostWindowEvent());
|
||||
app->registerEvent(Archimedes::MovedWindowEvent());
|
||||
|
||||
renderer = new Archimedes::Renderer();
|
||||
}
|
||||
@@ -51,37 +51,37 @@ bool WindowModule::onEvent(const Archimedes::Event& e) {
|
||||
|
||||
unsigned int type = app->getEventType(e);
|
||||
|
||||
if(type == app->getEventType(Archimedes::WindowResizeEvent())) {
|
||||
if(type == app->getEventType(Archimedes::ResizeWindowEvent())) {
|
||||
window->getSize(renderer->w, renderer->h);
|
||||
return true;
|
||||
} else if(type == app->getEventType(Archimedes::WindowCloseEvent())) {
|
||||
} else if(type == app->getEventType(Archimedes::CloseWindowEvent())) {
|
||||
app->emitEvent(new Archimedes::DoUnloadModuleEvent(name));
|
||||
return true;
|
||||
} else if(type == app->getEventType(Archimedes::WindowKeyPressedEvent())) {
|
||||
} else if(type == app->getEventType(Archimedes::KeyPressedWindowEvent())) {
|
||||
|
||||
return true;
|
||||
} else if(type == app->getEventType(Archimedes::WindowKeyReleasedEvent())) {
|
||||
} else if(type == app->getEventType(Archimedes::KeyReleasedWindowEvent())) {
|
||||
|
||||
return true;
|
||||
} else if(type == app->getEventType(Archimedes::WindowMouseButtonPressedEvent())) {
|
||||
} else if(type == app->getEventType(Archimedes::MouseButtonPressedWindowEvent())) {
|
||||
|
||||
return true;
|
||||
} else if(type == app->getEventType(Archimedes::WindowMouseButtonReleasedEvent())) {
|
||||
} else if(type == app->getEventType(Archimedes::MouseButtonReleasedWindowEvent())) {
|
||||
|
||||
return true;
|
||||
} else if(type == app->getEventType(Archimedes::WindowScrollEvent())) {
|
||||
} else if(type == app->getEventType(Archimedes::ScrollWindowEvent())) {
|
||||
|
||||
return true;
|
||||
} else if(type == app->getEventType(Archimedes::WindowMouseMovedEvent())) {
|
||||
} else if(type == app->getEventType(Archimedes::MouseMovedWindowEvent())) {
|
||||
|
||||
return true;
|
||||
} else if(type == app->getEventType(Archimedes::WindowFocusedEvent())) {
|
||||
} else if(type == app->getEventType(Archimedes::FocusedWindowEvent())) {
|
||||
|
||||
return true;
|
||||
} else if(type == app->getEventType(Archimedes::WindowFocusLostEvent())) {
|
||||
} else if(type == app->getEventType(Archimedes::FocusLostWindowEvent())) {
|
||||
|
||||
return true;
|
||||
} else if(type == app->getEventType(Archimedes::WindowMovedEvent())) {
|
||||
} else if(type == app->getEventType(Archimedes::MovedWindowEvent())) {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user