renaming base folder

30 files changed, 37 insertions, 16 deletions

diff --git a/yage/base/CMakeLists.txt b/yage/base/CMakeLists.txt
deleted file mode 100644
index f36d806d..00000000
--- a/yage/base/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-set(YAGE_BASE_SOURCES
-  base/imageloader.cpp
-  base/window.cpp
-  base/texturecache.cpp
-  base/glslprogram.cpp
-  base/sprite.cpp
-  base/spritebatch.cpp
-  base/spritesheet.cpp
-  base/resourcemanager.cpp
-  base/sprite.cpp
-  base/inputmanager.cpp
-  base/picopng.cpp
-  base/camera2d.cpp
-  base/iomanager.cpp
-  )
diff --git a/yage/core/CMakeLists.txt b/yage/core/CMakeLists.txt
new file mode 100644
index 00000000..810706ab
--- /dev/null
+++ b/yage/core/CMakeLists.txt
@@ -0,0 +1,15 @@
+set(YAGE_CORE_SOURCES
+  core/imageloader.cpp
+  core/window.cpp
+  core/texturecache.cpp
+  core/glslprogram.cpp
+  core/sprite.cpp
+  core/spritebatch.cpp
+  core/spritesheet.cpp
+  core/resourcemanager.cpp
+  core/sprite.cpp
+  core/inputmanager.cpp
+  core/picopng.cpp
+  core/camera2d.cpp
+  core/iomanager.cpp
+  )
diff --git a/yage/base/camera2d.cpp b/yage/core/camera2d.cpp
index 9eda38ee..9eda38ee 100644
--- a/yage/base/camera2d.cpp
+++ b/yage/core/camera2d.cpp
diff --git a/yage/base/camera2d.h b/yage/core/camera2d.h
index a60893ac..a60893ac 100644
--- a/yage/base/camera2d.h
+++ b/yage/core/camera2d.h
diff --git a/yage/base/glslprogram.cpp b/yage/core/glslprogram.cpp
index cff84e40..cff84e40 100644
--- a/yage/base/glslprogram.cpp
+++ b/yage/core/glslprogram.cpp
diff --git a/yage/base/glslprogram.h b/yage/core/glslprogram.h
index 545dbe54..545dbe54 100644
--- a/yage/base/glslprogram.h
+++ b/yage/core/glslprogram.h
diff --git a/yage/base/imageloader.cpp b/yage/core/imageloader.cpp
index e1d54dc1..e1d54dc1 100644
--- a/yage/base/imageloader.cpp
+++ b/yage/core/imageloader.cpp
diff --git a/yage/base/imageloader.h b/yage/core/imageloader.h
index 8d5c5cd1..8d5c5cd1 100644
--- a/yage/base/imageloader.h
+++ b/yage/core/imageloader.h
diff --git a/yage/base/inputmanager.cpp b/yage/core/inputmanager.cpp
index 15ff374b..15ff374b 100644
--- a/yage/base/inputmanager.cpp
+++ b/yage/core/inputmanager.cpp
diff --git a/yage/base/inputmanager.h b/yage/core/inputmanager.h
index 84728fff..84728fff 100644
--- a/yage/base/inputmanager.h
+++ b/yage/core/inputmanager.h
diff --git a/yage/base/iomanager.cpp b/yage/core/iomanager.cpp
index d5b950d6..d5b950d6 100644
--- a/yage/base/iomanager.cpp
+++ b/yage/core/iomanager.cpp
diff --git a/yage/base/iomanager.h b/yage/core/iomanager.h
index 95abd652..95abd652 100644
--- a/yage/base/iomanager.h
+++ b/yage/core/iomanager.h
diff --git a/yage/core/logger.h b/yage/core/logger.h
new file mode 100644
index 00000000..90a958d5
--- /dev/null
+++ b/yage/core/logger.h
@@ -0,0 +1,6 @@
+#ifndef YAGE_LOGGER_H
+#define YAGE_LOGGER_H
+
+
+
+#endif
diff --git a/yage/base/picopng.cpp b/yage/core/picopng.cpp
index dcc4b367..dcc4b367 100644
--- a/yage/base/picopng.cpp
+++ b/yage/core/picopng.cpp
diff --git a/yage/base/picopng.h b/yage/core/picopng.h
index 095bf68a..095bf68a 100644
--- a/yage/base/picopng.h
+++ b/yage/core/picopng.h
diff --git a/yage/base/resourcemanager.cpp b/yage/core/resourcemanager.cpp
index f3f9aa20..f3f9aa20 100644
--- a/yage/base/resourcemanager.cpp
+++ b/yage/core/resourcemanager.cpp
diff --git a/yage/base/resourcemanager.h b/yage/core/resourcemanager.h
index 52d98e12..52d98e12 100644
--- a/yage/base/resourcemanager.h
+++ b/yage/core/resourcemanager.h
diff --git a/yage/base/sprite.cpp b/yage/core/sprite.cpp
index 9ac4dc55..9ac4dc55 100644
--- a/yage/base/sprite.cpp
+++ b/yage/core/sprite.cpp
diff --git a/yage/base/sprite.h b/yage/core/sprite.h
index 725d2160..725d2160 100644
--- a/yage/base/sprite.h
+++ b/yage/core/sprite.h
diff --git a/yage/base/spritebatch.cpp b/yage/core/spritebatch.cpp
index aaeec32f..aaeec32f 100644
--- a/yage/base/spritebatch.cpp
+++ b/yage/core/spritebatch.cpp
diff --git a/yage/base/spritebatch.h b/yage/core/spritebatch.h
index 953055f6..953055f6 100644
--- a/yage/base/spritebatch.h
+++ b/yage/core/spritebatch.h
diff --git a/yage/base/spritesheet.cpp b/yage/core/spritesheet.cpp
index 5c3499cc..5c3499cc 100644
--- a/yage/base/spritesheet.cpp
+++ b/yage/core/spritesheet.cpp
diff --git a/yage/base/spritesheet.h b/yage/core/spritesheet.h
index 2ead0ba1..2ead0ba1 100644
--- a/yage/base/spritesheet.h
+++ b/yage/core/spritesheet.h
diff --git a/yage/base/texture.h b/yage/core/texture.h
index 82b7dde3..82b7dde3 100644
--- a/yage/base/texture.h
+++ b/yage/core/texture.h
diff --git a/yage/base/texturecache.cpp b/yage/core/texturecache.cpp
index 628f3604..628f3604 100644
--- a/yage/base/texturecache.cpp
+++ b/yage/core/texturecache.cpp
diff --git a/yage/base/texturecache.h b/yage/core/texturecache.h
index b28349ec..b28349ec 100644
--- a/yage/base/texturecache.h
+++ b/yage/core/texturecache.h
diff --git a/yage/base/vertex.h b/yage/core/vertex.h
index 586e8190..586e8190 100644
--- a/yage/base/vertex.h
+++ b/yage/core/vertex.h
diff --git a/yage/base/window.cpp b/yage/core/window.cpp
index 5ac2d8dc..9774bf9e 100644
--- a/yage/base/window.cpp
+++ b/yage/core/window.cpp
@@ -10,9 +10,20 @@
 
 #include <stdexcept>
 
+
+
 namespace yage
 {
 
+void key_callback(GLFWwindow *window, int key, int scanCode, int action, int mods)
+{
+    if(key == GLFW_KEY_E && action == GLFW_PRESS) {
+        glClearColor(0.5f, 0.f, 0.f, 1.f);
+    } else {
+        glClearColor(0.f, 0.5f, 0.f, 1.f);
+    }
+}
+
 Window::Window() = default;
 
 Window::~Window()
@@ -42,6 +53,9 @@ void Window::create(std::string window_name, int width, int height)
     // initialize glad
     gladLoadGLLoader((GLADloadproc) glfwGetProcAddress);
 
+    // set key callback
+    glfwSetKeyCallback(window_, key_callback);
+
     // set vsync on
     glfwSwapInterval(1);
 
diff --git a/yage/base/window.h b/yage/core/window.h
index 84ba8303..84ba8303 100644
--- a/yage/base/window.h
+++ b/yage/core/window.h
diff --git a/yage/yage.cpp b/yage/yage.cpp
index a141d9aa..68acac5a 100644
--- a/yage/yage.cpp
+++ b/yage/yage.cpp
@@ -10,6 +10,7 @@
 
 #include <GLFW/glfw3.h>
 
+#include <iostream>
 #include <stdexcept>
 
 namespace yage
@@ -17,7 +18,7 @@ namespace yage
 
 void glfwErrorCallback(int, const char *description)
 {
-    fprintf(stderr, "ERROR: %s\n", description);
+    std::cerr << "ERROR: %s\n" << description;
 }
 
 void init()