Renamed game library to yage

25 files changed, 92 insertions, 42 deletions

diff --git a/.dir-locals.el b/.dir-locals.el
index b170598..23a2a0e 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,3 +1,9 @@
-((nil . ((company-clang-arguments . ("-I../include/")) 
-	 (company-c-headers-path-user . ("../include/"))
-	 (flycheck-clang-include-path . ("../include")))))
+((nil . ((company-clang-arguments . ("-I../include/yage/"
+				     "-I../include/"
+				     "-I../yage/include/")) 
+	 (company-c-headers-path-user . ("../include/yage/"
+					 "../include/"
+					 "../yage/include/"))
+	 (flycheck-clang-include-path . ("../include/yage/"
+					 "../include/"
+					 "../yage/include/")))))
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8726e5e..3c6171c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,8 +18,8 @@ set(ARIDER_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/include)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 
 
-set(ZEDENGINE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/zedengine/include/)
-set(ZEDENGINE_LIBRARIES zedengine)
+set(YAGE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/yage/include/)
+set(YAGE_LIBRARIES yage)
 
 # setting up configuration header
 configure_file (
@@ -39,18 +39,18 @@ find_package(GLEW REQUIRED)
 pkg_search_module(SDL2 REQUIRED sdl2)
 
 # add zedengine library
-add_subdirectory(zedengine)
+add_subdirectory(yage)
 
 # adding include directories
 include_directories(${ARIDER_INCLUDE_DIRS}
-  ${ZEDENGINE_INCLUDE_DIRS}
+  ${YAGE_INCLUDE_DIRS}
   ${OPENGL_INCLUDE_DIRS}
   ${GLEW_INCLUDE_DIRS}
   ${SLD2_INCLUDE_DIRS})
 
 # link libraries
 target_link_libraries(${CMAKE_PROJECT_NAME}
-  ${ZEDENGINE_LIBRARIES}
+  ${YAGE_LIBRARIES}
   ${OPENGL_LIBRARIES}
   ${GLEW_LIBRARIES}
   ${SDL2_LIBRARIES})
diff --git a/include/game.hpp b/include/game.hpp
index 1991ebe..8011a40 100644
--- a/include/game.hpp
+++ b/include/game.hpp
@@ -1,12 +1,11 @@
 #ifndef GAME_HPP
 #define GAME_HPP
 
-#include "glsl_program.hpp"
-#include "gl_texture.hpp"
-#include "sprite.hpp"
-
 #include <GL/glew.h>
 #include <SDL2/SDL.h>
+#include <yage/glsl_program.hpp>
+#include <yage/gl_texture.hpp>
+#include <yage/sprite.hpp>
 
 #include <memory>
 #include <vector>
diff --git a/src/game.cpp b/src/game.cpp
index 125c655..288e616 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1,5 +1,6 @@
 #include "game.hpp"
-#include "sprite.hpp"
+
+#include <yage/sprite.hpp>
 
 #include <stdexcept>
 #include <iostream>
@@ -18,30 +19,6 @@ void Game::initSystems()
     if(SDL_Init(SDL_INIT_VIDEO))
 	throw std::runtime_error("SDL_Init failed");
 
-    // SDL_GL_SetAttribute (SDL_GL_CONTEXT_MAJOR_VERSION, 4);
-    // SDL_GL_SetAttribute (SDL_GL_CONTEXT_MINOR_VERSION, 5);
-    SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-
-
-    window_ = SDL_CreateWindow("Arider", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
-			       width_, height_, SDL_WINDOW_OPENGL);
-    if(window_ == nullptr)
-	throw std::runtime_error("SDL_CreateWindow failed");
-
-    SDL_GLContext gl_context = SDL_GL_CreateContext(window_);
-    if(gl_context == nullptr)
-	throw std::runtime_error("SDL_GL_CreateContext failed");
-
-    GLenum error = glewInit();
-    if(error != GLEW_OK)
-	throw std::runtime_error("glewInit failed");
-
-    std::cout<<"***  OpenGL version: "<<glGetString(GL_VERSION)<<"  ***\n";
-
-    SDL_GL_SetSwapInterval(1);
-
-    glClearColor(0.f, 0.f, 0.f, 1.f);
-
     initShaders();
 }
 
diff --git a/src/main.cpp b/src/main.cpp
index bae9033..ab057c3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,5 @@
 #include "arider_config.hpp"
 #include "game.hpp"
-#include "logger.hpp"
 
 #include <GL/glew.h>
 
diff --git a/zedengine/CMakeLists.txt b/yage/CMakeLists.txt
index d64d0a7..0f5c760 100644
--- a/zedengine/CMakeLists.txt
+++ b/yage/CMakeLists.txt
@@ -1,9 +1,9 @@
 # zedengine library cmakelists.txt
 
-project(zedengine)
+project(yage)
 
 # add sources to library
-set(ZEDENGINE_SOURCES ${PROJECT_SOURCE_DIR}/src/glsl_program.cpp
+set(YAGE_SOURCES ${PROJECT_SOURCE_DIR}/src/glsl_program.cpp
   ${PROJECT_SOURCE_DIR}/src/image_loader.cpp
   ${PROJECT_SOURCE_DIR}/src/io_manager.cpp
   ${PROJECT_SOURCE_DIR}/src/pico_png.cpp
@@ -12,7 +12,7 @@ set(ZEDENGINE_SOURCES ${PROJECT_SOURCE_DIR}/src/glsl_program.cpp
   ${PROJECT_SOURCE_DIR}/src/texture_cache.cpp)
 
 # set include directory
-include_directories(${ZEDENGINE_INCLUDE_DIRS})
+include_directories(${YAGE_INCLUDE_DIRS}/yage/)
 
 # make it a static library
-add_library(${PROJECT_NAME} ${ZEDENGINE_SOURCES})
+add_library(${PROJECT_NAME} ${YAGE_SOURCES})
diff --git a/zedengine/include/gl_texture.hpp b/yage/include/yage/gl_texture.hpp
index 808d86b..808d86b 100644
--- a/zedengine/include/gl_texture.hpp
+++ b/yage/include/yage/gl_texture.hpp
diff --git a/zedengine/include/glsl_program.hpp b/yage/include/yage/glsl_program.hpp
index cef38a8..cef38a8 100644
--- a/zedengine/include/glsl_program.hpp
+++ b/yage/include/yage/glsl_program.hpp
diff --git a/zedengine/include/image_loader.hpp b/yage/include/yage/image_loader.hpp
index 5f7b97f..5f7b97f 100644
--- a/zedengine/include/image_loader.hpp
+++ b/yage/include/yage/image_loader.hpp
diff --git a/zedengine/include/io_manager.hpp b/yage/include/yage/io_manager.hpp
index 05d288b..05d288b 100644
--- a/zedengine/include/io_manager.hpp
+++ b/yage/include/yage/io_manager.hpp
diff --git a/zedengine/include/logger.hpp b/yage/include/yage/logger.hpp
index 36c7b9b..36c7b9b 100644
--- a/zedengine/include/logger.hpp
+++ b/yage/include/yage/logger.hpp
diff --git a/zedengine/include/pico_png.hpp b/yage/include/yage/pico_png.hpp
index ef12357..ef12357 100644
--- a/zedengine/include/pico_png.hpp
+++ b/yage/include/yage/pico_png.hpp
diff --git a/zedengine/include/resource_manager.hpp b/yage/include/yage/resource_manager.hpp
index 155515a..155515a 100644
--- a/zedengine/include/resource_manager.hpp
+++ b/yage/include/yage/resource_manager.hpp
diff --git a/zedengine/include/sprite.hpp b/yage/include/yage/sprite.hpp
index 9f765c7..9f765c7 100644
--- a/zedengine/include/sprite.hpp
+++ b/yage/include/yage/sprite.hpp
diff --git a/zedengine/include/texture_cache.hpp b/yage/include/yage/texture_cache.hpp
index 44dba2f..44dba2f 100644
--- a/zedengine/include/texture_cache.hpp
+++ b/yage/include/yage/texture_cache.hpp
diff --git a/zedengine/include/vertex.hpp b/yage/include/yage/vertex.hpp
index d9ab113..d9ab113 100644
--- a/zedengine/include/vertex.hpp
+++ b/yage/include/yage/vertex.hpp
diff --git a/yage/include/yage/window.hpp b/yage/include/yage/window.hpp
new file mode 100644
index 0000000..6f3058e
--- /dev/null
+++ b/yage/include/yage/window.hpp
@@ -0,0 +1,30 @@
+#ifndef WINDOW_HPP
+#define WINDOW_HPP
+
+#include <SDL2/SDL.h>
+
+#include <string>
+
+enum class WindowFlags
+{
+    SHOWN=0x1,
+    HIDDEN=0x2,
+    FULLSCREEN=0x4,
+    BORDERLESS=0x8,
+};
+
+class Window
+{
+private:
+    SDL_Window *window_=nullptr;
+    int width_=1280;
+    int height_=720;
+    
+public:
+    Window();
+    ~Window();
+
+    void create(const std::string &window_name, int width, int height, WindowFlags flags=WindowFlags::SHOWN);
+};
+
+#endif
diff --git a/zedengine/src/glsl_program.cpp b/yage/src/glsl_program.cpp
index 6fe7cf0..6fe7cf0 100644
--- a/zedengine/src/glsl_program.cpp
+++ b/yage/src/glsl_program.cpp
diff --git a/zedengine/src/image_loader.cpp b/yage/src/image_loader.cpp
index bb5485d..bb5485d 100644
--- a/zedengine/src/image_loader.cpp
+++ b/yage/src/image_loader.cpp
diff --git a/zedengine/src/io_manager.cpp b/yage/src/io_manager.cpp
index 106dd24..106dd24 100644
--- a/zedengine/src/io_manager.cpp
+++ b/yage/src/io_manager.cpp
diff --git a/zedengine/src/pico_png.cpp b/yage/src/pico_png.cpp
index 6e86634..6e86634 100644
--- a/zedengine/src/pico_png.cpp
+++ b/yage/src/pico_png.cpp
diff --git a/zedengine/src/resource_manager.cpp b/yage/src/resource_manager.cpp
index 7bd8dd4..7bd8dd4 100644
--- a/zedengine/src/resource_manager.cpp
+++ b/yage/src/resource_manager.cpp
diff --git a/zedengine/src/sprite.cpp b/yage/src/sprite.cpp
index 5821eb8..5821eb8 100644
--- a/zedengine/src/sprite.cpp
+++ b/yage/src/sprite.cpp
diff --git a/zedengine/src/texture_cache.cpp b/yage/src/texture_cache.cpp
index c57538b..c57538b 100644
--- a/zedengine/src/texture_cache.cpp
+++ b/yage/src/texture_cache.cpp
diff --git a/yage/src/window.cpp b/yage/src/window.cpp
new file mode 100644
index 0000000..dd993d1
--- /dev/null
+++ b/yage/src/window.cpp
@@ -0,0 +1,39 @@
+#include "window.hpp"
+
+#include <GL/glew.h>
+
+#include <iostream>
+#include <stdexcept>
+
+Window::Window()
+{}
+
+Window::~Window()
+{}
+
+void Window::create(const std::string &window_name, int width, int height, WindowFlags flags)
+{
+    // SDL_GL_SetAttribute (SDL_GL_CONTEXT_MAJOR_VERSION, 4);
+    // SDL_GL_SetAttribute (SDL_GL_CONTEXT_MINOR_VERSION, 5);
+    SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+
+
+    window_ = SDL_CreateWindow("Arider", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+			       width_, height_, SDL_WINDOW_OPENGL);
+    if(window_ == nullptr)
+	throw std::runtime_error("SDL_CreateWindow failed");
+
+    SDL_GLContext gl_context = SDL_GL_CreateContext(window_);
+    if(gl_context == nullptr)
+	throw std::runtime_error("SDL_GL_CreateContext failed");
+
+    GLenum error = glewInit();
+    if(error != GLEW_OK)
+	throw std::runtime_error("glewInit failed");
+
+    std::cout<<"***  OpenGL version: "<<glGetString(GL_VERSION)<<"  ***\n";
+
+    SDL_GL_SetSwapInterval(1);
+
+    glClearColor(0.f, 0.f, 0.f, 1.f);
+}