Fixed Errors git add .

Author: kacperks

.gitignore

@@ -21,4 +21,7 @@ Engine/bin
 /CMakeFiles/*
 CMakeCache.txt
 CMakeDoxyfile.in
-CMakeDoxygenDefaults.cmake
+CMakeDoxygenDefaults.cmake
+cmake_install.cmake
+CMakeFiles/*
+Makefile

Engine/App.cpp

@@ -6,11 +6,5 @@ using namespace Voxeler;
 int main(){
     Core.Initialize();
 
-    while(Core.Run()){
-        Timer.Tick();
-        Core.Update();
-        Core.Render();
-    }
-
     return VOX_SUCCES;
 }

Engine/Core.cpp

@@ -4,7 +4,6 @@ namespace Voxeler{
 
     uint Engine::Initialize() { 
         MainWindow = new Window(WINDOW_NAME, SCREEN_WIDTH, SCREEN_HEIGHT);
-        GameCore.Initialize(MainWindow);
         return VOX_NULL;
     }
 

Engine/Core.hpp

@@ -92,8 +92,6 @@
 #define VOX_FALSE false
 #define VOX_TERMS 7
 
-using namespace VoxelerNetWork;
-
 // Types
 
 namespace Voxeler
@@ -117,6 +115,20 @@ namespace Voxeler
 	typedef void(*func)();
 }
 
+// Includes:
+
+
+#include "Core/Window.h"
+#include "Core/ECS/ECS.h"
+
+#include "Network/Network.h"
+#include "Game/game.hpp"
+#include "Renderer/Renderer.h"
+#include "Core/Timer.h"
+#include "Core/Math.h"
+
+using namespace VoxelerNetWork;
+
 // Main Engine class
 
 namespace Voxeler {
@@ -151,16 +163,4 @@ namespace Voxeler {
 	static Engine& Core = Engine::Ref();
 }
 
-// Includes:
-
-#include "Core/ECS/ECS.h"
-
-#include "Network/Network.h"
-
-#include "Game/game.hpp"
-#include "Renderer/Renderer.h"
-#include "Core/Window.h"
-#include "Core/Timer.h"
-#include "Core/Math.h"
-
 #endif

Engine/Core/Window.cpp

@@ -3,13 +3,16 @@
 Window::Window(std::string name, int SIZE1, int SIZE2) {
     if (!glfwInit())
         return;
+    
     window = glfwCreateWindow(SIZE1, SIZE2, name.c_str(), NULL, NULL);
     if (!window) glfwTerminate();
+
     while (!glfwWindowShouldClose(window)) {
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         glfwSwapBuffers(window);
         glfwPollEvents();
     }
+
     glfwTerminate();
     return;
 }

Engine/Game/game.hpp

@@ -18,7 +18,7 @@ namespace Voxeler{
                 return reference;
             }
 
-            func Initialize(Window window);
+            func Initialize(Window* window);
         private:
             Game();
         private:

Engine/Renderer/Renderer.cpp

@@ -1,5 +1,5 @@
 #include "Renderer.h"
 
 namespace Voxeler{
-    uint Renderer::InitializeRenderer(){}
+    uint Renderer::InitializeRenderer(){ return VOX_NULL; }
 }