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

This commit is contained in:
Nigel Barink 2022-10-22 15:36:28 +02:00
parent 23ac663667
commit e0e8de90b1
27 changed files with 15 additions and 75 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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;
};
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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