From 2f4294a6ff139b5f62e4fc12243476257fed0eeb Mon Sep 17 00:00:00 2001
From: Robear Selwans <robear.selwans@outlook.com>
Date: Sun, 14 Mar 2021 04:39:54 +0200
Subject: [PATCH] Started using namespaces

Signed-off-by: Robear Selwans <robear.selwans@outlook.com>
---
 src/main.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main.c b/src/main.c
index 2c3fc4f..bcb0897 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7,6 +7,9 @@
 #define EVENT_MODULE evmod_glfw
 #include <evol/meta/event_include.h>
 
+#define NAMESPACE_MODULE evmod_glfw
+#include <evol/meta/namespace_import.h>
+
 DECLARE_EVENT_LISTENER(windowResizedListener, (WindowResizedEvent *event) {
     ev_log_info("Window resized: (%d, %d)", event->width, event->height);
 })
@@ -25,6 +28,8 @@ DECLARE_EVENT_LISTENER(mouseMovedListener, (MouseMovedEvent *event) {
     ev_log_info("Mouse Moved: (%f, %f)", event->position.x, event->position.y);
 })
 
+#include <evol/core/namespace.h>
+
 int main(int argc, char **argv) {
   evolengine_t *engine = evol_create();
   evol_parse_args(engine, argc, argv);
@@ -33,19 +38,18 @@ int main(int argc, char **argv) {
   evolmodule_t window_module = evol_loadmodule("window");
   assert(window_module);
   IMPORT_EVENTS_evmod_glfw(window_module);
+  IMPORT_NAMESPACE(Window, window_module);
 
   ACTIVATE_EVENT_LISTENER(windowResizedListener, WindowResizedEvent);
   ACTIVATE_EVENT_LISTENER(keyListener, KeyEvent);
   ACTIVATE_EVENT_LISTENER(mouseMovedListener, MouseMovedEvent);
 
-  MODULE_NAMESPACE(Window) *Window = evol_getmodnamespace(window_module, "window");
-  EV_BREAK_IF(!Window || !Window.update);
 
   while(true) {
-    if(Window.update(0.0) == 1) {
-      break;
-    }
-    EventSystem.progress();
+   if(Window->update(0.0) == 1) {
+     break;
+   }
+   EventSystem.progress();
   }
 
   evol_unloadmodule(window_module);