Removing B-ECS from BarinkEngine, Moving not really graphics related definitions outside the graphics folder, Moving Graphical primitives into a graphics primitives subfolder

BarinkEngine/premake5.lua

@@ -4,8 +4,6 @@ project "BarinkEngine"
   buildmessage "Building BarinkEngine"
 
   includedirs {
-    "Include/",
-
     "../libs/lua/include",
     "../libs/spdlog/include",
     "../libs/glm",
@@ -21,7 +19,6 @@ project "BarinkEngine"
 
     "../libs/glfw/include",
     "../libs/glew/include",
-    "../libs/glm",
     
     "../libs/ImGui",
   }
@@ -33,7 +30,6 @@ project "BarinkEngine"
     "spdlog",
     "assimp-vc143-mtd",
     "glfw3",
-
     "ImGui",
   }
 

BarinkEngine/src/AssetManager/ModelImporter.h

@@ -5,7 +5,7 @@
 #define TINYGLTF_IMPLEMENTATION
 #define TINYGLTF_NO_EXTERNAL_IMAGE
 
-#include "../Graphics/Mesh.h"
+#include "../Graphics/Primitives/Mesh.h"
 #include <assimp/Importer.hpp>
 #include <assimp/scene.h>
 #include <assimp/postprocess.h> 

BarinkEngine/src/BarinkEngine.h

@@ -1,18 +1,18 @@
 #pragma once
 #include "glm/glm.hpp"
 #include "graphics/Shader.h"
-#include "graphics/Window.h"
+#include "Platform/Window.h"
 #include "graphics/Texture.h"
-#include "graphics/Camera.h"
+#include "graphics/Primitives/Camera.h"
 #include "graphics/Renderable.h"
 #include "Graphics/Renderer.h"
-#include "Graphics/Material.h"
+#include "Graphics/Primitives/Material.h"
 
 #include "spdlog/spdlog.h"
 
 #include "Input/InputManager.h"
 #include "Graphics/Renderer.h"
-#include "Graphics/GUI/GUIManager.h"
+#include "GUI/GUIManager.h"
 #include "Scene.h"
 #include "PerfCounter.h"
 

BarinkEngine/src/ECS/Component.h

@@ -1,7 +0,0 @@
-#pragma once
-namespace BECS {
-
-	struct Component {
-
-	};
-}

BarinkEngine/src/ECS/Entity.h

@@ -1,13 +0,0 @@
-#pragma once
-#include <vector>
-#include "Component.h"
-
-
-namespace BECS {
-
-	typedef unsigned long int Entity;
-
-
-
-
-}

BarinkEngine/src/ECS/System.h

@@ -1,7 +0,0 @@
-#pragma once
-namespace BECS {
-
-	struct System {
-
-	};
-}

BarinkEngine/src/ECS/World.h

@@ -1,17 +0,0 @@
-#pragma once
-#include "System.h"
-#include <vector>
-#include "Component.h"
-#include "Entity.h"
-
-
-namespace BECS {
-	struct World {
-	
-	private:
-		std::vector<System> systems;
-		std::vector<Component> components;
-		std::vector<Entity> entities;
-
-	};
-}

BarinkEngine/src/Editor/EditorWindow.h

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-
-class EditorWindow {
-protected:
-	std::string WindowTitle;
-
-public:
-
-	virtual void Show() = 0;
-
-};

BarinkEngine/src/GUI/GUIManager.cpp

@@ -2,7 +2,7 @@
 #include "imgui.h"
 #include "backends/imgui_impl_opengl3.h"
 #include <backends/imgui_impl_glfw.h>
-#include "../../BarinkEngine.h"
+#include "../BarinkEngine.h"
 
 GUIManager::GUIManager(BarinkWindow* window)
     : currentwindow(window)

BarinkEngine/src/GUI/GUIManager.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "../Window.h"
+#include "../Platform/Window.h"
 
 
 class GUIManager {

BarinkEngine/src/Graphics/GPUBucket.h

@@ -1,8 +1,8 @@
 #pragma once
 #include "VertexArray.h"
 #include "Buffer.h"
-#include "Mesh.h"
+#include "Primitives/Mesh.h"
-#include "Material.h"
+#include "Primitives/Material.h"
 #include <glm/glm.hpp>
 
 namespace BarinkEngine {

BarinkEngine/src/Graphics/Primitives/Material.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <glm/glm.hpp>
 #include <string>
-#include "Shader.h"
+#include "../Shader.h"
 
 class Material {
 public:

BarinkEngine/src/Graphics/Renderable.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "Mesh.h"
+#include "Primitives/Mesh.h"
-#include "Material.h"
+#include "Primitives/Material.h"
 #include "Texture.h"
 #include "../Scene.h"
 

BarinkEngine/src/Graphics/Renderer.h

@@ -7,7 +7,7 @@
 
 #include "../PerfCounter.h"
 
-#include "Camera.h"
+#include "Primitives/Camera.h"
 #include "Renderable.h"
 #include "GPUBucket.h"
 #include "Framebuffer.h"

BarinkEngine/src/Input/InputManager.h

@@ -5,7 +5,7 @@
 #include "spdlog/spdlog.h"
 #include "../EventSystem/EventEmitter.h"
 #include "../EventSystem/EventListener.h"
-#include "../Graphics/Window.h"
+#include "../Platform/Window.h"
 
 namespace BarinkEngine {
 

BarinkEngine/src/Scene/SceneNodeTypes.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "../Graphics/Camera.h"
+#include "../Graphics/Primitives/Camera.h"
 #include "../Graphics/Renderable.h"
 #include "Node.h"