Clean up and update of CmakeLists.txt!

Author: kacperks

CMakeLists.txt

@@ -1,49 +1,22 @@
-
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 project(Voxeler)
 
-set(PLATFORM "Linux")
-set(CONF "Debug")
+find_package(OpenGL REQUIRED)
+
+include_directories(thirdparty/glad/include)
+include_directories(thirdparty/glfw/include)
+include_directories(thirdparty/glm/include)
 
 add_subdirectory(thirdparty/glad)
 add_subdirectory(thirdparty/glfw)
 add_subdirectory(thirdparty/glm)
-add_subdirectory(thirdpart/imgui)
 
-SET(PROGRAM_SRCS
-Engine/App.cpp
-Engine/Core.hpp
-Engine/Core.cpp
-Engine/Core/Math.h
-Engine/Core/Timer.cpp
-Engine/Core/Timer.h
-Engine/Core/Window.h
-Engine/Core/Window.cpp
-Engine/Errors/Errors.h
-Engine/Game/game.hpp
-Engine/Game/game.cpp
-Engine/Game/player.cpp
-Engine/Game/player.hpp
-Engine/Inputs/Keyboard.cpp
-Engine/Inputs/KeyBoard.hpp
-Engine/Renderer/Renderer.cpp
-Engine/Renderer/Renderer.h
-Engine/Renderer/Shader.h
-Engine/Renderer/Shader.cpp
-Engine/Renderer/Vertex.h
-Engine/Renderer/VertexArray.h
-Engine/ECS/ECS.h
-Engine/ECS/Base/BaseComponent.h
-Engine/ECS/Base/BaseSystem.h
-Engine/ECS/Base/CompList.h
-Engine/ECS/Base/ComponentFactory.h
-Engine/ECS/Base/Entity.h
-Engine/ECS/Base/EntityManager.h
-Engine/ECS/Base/Types.h
-Engine/Comp/Camera.h
-Engine/Comp/Transform.h
-)
+file(GLOB_RECURSE Runtime "Engine/**.cpp" "Engine/**.h" "Engine/**.hpp")
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/Build/bin")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/Build/bin")
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED true)
 
-target_link_libraries(Voxeler -lglad)
-target_link_libraries(Voxeler -lglfw3)
-target_link_libraries(Voxeler -lopengl32)
+add_executable(Voxeler ${Runtime})

Engine/App.cpp

@@ -12,5 +12,5 @@ int main(){
         Core.Render();
     }
 
-    return VOX_TRUE;
+    return VOX_SUCCES;
 }

Engine/Core.cpp

@@ -2,17 +2,23 @@
 
 namespace Voxeler{
 
-    void Engine::Initialize() { 
+    uint Engine::Initialize() { 
         MainWindow = new Window(WINDOW_NAME, SCREEN_WIDTH, SCREEN_HEIGHT);
         GameCore.Initialize(MainWindow);
+        return VOX_NULL;
     }
 
-    void Engine::Render(){}
+    func Engine::Render(){}
 
-    void Engine::Update(){ ECS::Manager.Update(); }
+    func Engine::Update(){ ECS::Manager.Update(); }
 
-    void Exit() {}
+    uint Engine::Exit() {
+        std::exit(-1); 
+        return VOX_NULL;
+    }
 
-    void Pause() {std::cin.get();}
+    func Engine::Pause() {
+        std::cin.get();
+    }
 
 };

Engine/Core.hpp

@@ -83,39 +83,41 @@
 #error "This Platform is not supported yet!"
 #endif
 
-#define VOX_NULL NULL
-#define VOX_TRUE 0
-#define VOX_FALSE 1
-#define VOX_TERMS 7
-
-#define ASSERT(boolean) if (!(boolean))();
-#define GLCALL(func) GLClearError(); func; ASSERT(GLLogCall(#func, __FILE__, __LINE__))
-
-static void GLClearError() { while (glGetError() != GL_NO_ERROR); }
-
-static bool GLLogCall(const char* function, const char* file, int line) {
-	while (GLenum error = glGetError()) {
-		std::cout <<
-			"\n OpenGL Voxeler Error! [ " << error << " ]\n"
-			"function ::[ " << function << " ]\n"
-			"File ::[ " << file << " ]\n"
-			"line ::[ " << line << " ]"
-			<< std::endl;
-		return false;
-	}
-	return true;
-}
+// Defines
 
+#define VOX_NULL 0
+#define VOX_SUCCES 0
+#define VOX_ERR -1
+#define VOX_TRUE true
+#define VOX_FALSE false
+#define VOX_TERMS 7
 
 using namespace VoxelerNetWork;
 
+// Types
+
 namespace Voxeler
 {
 	using uint = uint32_t;
 	using uchar = unsigned char;
+    using vuint32 = unsigned int;
+    using vuint = vuint32;
+    using vint = int;
+    using vfloat = float;
+    using vufloat = double;
+    using vlong = long;
+    using vshort = short;
+    using vchar = char;
+    using vstring = char*;
+    using vbool = bool;
+    using Matrix4 = glm::mat4;
+    using Vector3f = glm::fvec3;
+    using Vector3 = glm::vec3;
+    using Vector2 = glm::vec2;
 	typedef void(*func)();
 }
 
+// Main Engine class
 
 namespace Voxeler {
 	class Engine {
@@ -129,28 +131,32 @@ namespace Voxeler {
 			return reference;
 		}
 
-		void Initialize();
-		void Render();
-        void Update();
+		uint Initialize();
+		func Render();
+        func Update();
+
+		uint Exit();
+		func Pause();
 
 		inline const vbool Run() const { return IsGameRunning; }
+		inline Window* GetWindow() { return MainWindow; }
 
 	private:
 		Engine();
 	private:
+	 	Window* MainWindow;
 		bool IsGameRunning;
 	};
 
 	static Engine& Core = Engine::Ref();
 }
 
-// ECS stuff
+// Includes:
+
 #include "Core/ECS/ECS.h"
 
-// Network stuff
 #include "Network/Network.h"
 
-// Game stuff
 #include "Game/game.hpp"
 #include "Renderer/Renderer.h"
 #include "Core/Window.h"

Engine/Core/Math.cpp

@@ -1,13 +1,15 @@
 #include "Math.h"
 
 namespace Voxeler{
-    float Math::Radians(float degrees) { return degrees * static_cast<float>(0.01745329251994329576923690768489); }
+    float Math::Radians(float degrees) { return degrees * PI() / 180; }
+
+	float Math::Degrees(float radians) { return radians * PI() / 180; }
 
 	float Math::Lerp(float start, float stop, float step) { float v = start; while (v != stop) { v = (stop * step) + (start * 1.0 - step); } return v;}
 
 	float Math::PI() { return 3.14159265359; }
 
-	float Math::Sine(int deg) {
+	float Math::Sin(int deg) {
 		deg %= 360;
 		float rad = deg * PI() / 180;
 		float sin = 0;
@@ -21,7 +23,6 @@ namespace Voxeler{
 		deg %= 360; // make it less than 360
 		float rad = deg * PI() / 180;
 		float cos = 0;
-
 		int i;
 		for (i = 0; i < VOX_TERMS; i++) {
 			cos += power(-1, i) * power(rad, 2 * i) / fact(2 * i);

Engine/Core/Math.h

@@ -2,32 +2,17 @@
 
 #include "../Core.hpp"
 
-namespace Voxeler{
-    using vuint32 = unsigned int;
-    using vuint = vuint32;
-    using vint = int;
-    using vfloat = float;
-    using vufloat = double;
-    using vlong = long;
-    using vshort = short;
-    using vchar = char;
-    using vstring = char*;
-    using vbool = bool;
-    using Matrix4 = glm::mat4;
-    using Vector3f = glm::fvec3;
-    using Vector3 = glm::vec3;
-    using Vector2 = glm::vec2;
-}
-
 namespace Voxeler{
     class Math{
         public:
 		static float Cos(int deg);
-		static float Sine(int deg);
+		static float Sin(int deg);
 		static float Lerp(float start, float stop, float step);
 		static float PI();
 
 		static float Radians(float degrees);
+        static float Degrees(float radians);
+        
 		static float power(float base, int exp);
 		static int fact(int n);
     };