Editor/premake5.lua

@@ -11,8 +11,7 @@ links{
 }
 
 includedirs{
-
+  "./../BarinkEngine/Include",
-  "../YoggieEngine/build/Debug",
 
   -- I'd prefer if didn't need these..
   -- We'll figure that out some time later
@@ -29,6 +28,7 @@ includedirs{
   incfolder["yamlcpp"],
   incfolder["nativefiledialog"],
 
+  "./include"
 
 }
 
@@ -38,7 +38,6 @@ libdirs {
 }
 
 files { 
-  "../libs/glad/src/glad.c",
   "./src/**.h",
   "./src/**.cpp"
 }

Editor/src/EditorContext.h

@@ -1,9 +0,0 @@
-#pragma once
-struct EditorContext {
-    std::shared_ptr<Project> CurrentProject;
-    Scene MainScene;
-
-    EditorContext() = default;
-    EditorContext(EditorContext& other) = default;
-    ~EditorContext() = default;
-};

Editor/src/SceneRuntime.h

@@ -1,69 +0,0 @@
-#pragma once
-#include "../../YoggieEngine/src/AssetManager/ModelImporter.h"
-#include "../../YoggieEngine/src/Graphics/Memory/Framebuffer.h"
-#include "../../YoggieEngine/src/PerfCounter.h"
-#include "../../YoggieEngine/src/Scene/Entity.h"
-#include "Project.h"
-
-class SceneRuntime : public  ApplicationRuntime {
-
-public:
-    SceneRuntime() = default;
-	void Start() override  
-	{
-        CurrentProject = std::make_shared<Project>("Random");
-
-        framebuffer = new Framebuffer();
-       
-        // Create a level and load it as the current level
-        auto importer = ModelImporter();
-
-        // Create a cube 
-        Model = importer.Import("build/Debug/Models/Cube.obj");
-        cube = MainScene.AddEntity("cube");
-
-        auto& render3DComponent = cube.AddComponent<Render3DComponent>();
-        render3DComponent.mesh = *(Model->renderable->mesh);
-
-        cube.GetComponent<TransformComponent>().Position = glm::vec3(1.0f, 0.0f, 5.0f);
-
-        auto cube2 = MainScene.AddEntity("Cube1");
-        auto& rendercube2 = cube2.AddComponent<Render3DComponent>();
-        rendercube2.mesh = *(Model->renderable->mesh);
-
-
-        // create an ambient light source
-        auto AmbientLight = MainScene.AddEntity("AmbientLight");
-        auto light = AmbientLight.AddComponent<LightComponent>();
-        light.Color = glm::vec3(1.0f);
-        light.Strength = 1.0f;
-
-        Selected = (entt::entity)-1;
-
-	}
-	
-	void Update() override  
-	{
-	}
-
-	void FixedUpdate() override 
-	{
-	}
-	
-	void Stop() override 
-	{
-	}
-
-
-private:
-    std::shared_ptr<Project> CurrentProject = nullptr;
-    Scene MainScene;
-
-    Framebuffer* framebuffer;
-    SceneObject* Model;
-    Entity cube;
-
-
-    entt::entity  Selected;
-    friend class Editor;
-};

Editor/src/SceneSerializer.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "../../YoggieEngine/src/BarinkEngine.h"
 #include <yaml-cpp/yaml.h>
 #include <string>
 #include <filesystem>

Editor/src/UI/widgets.cpp

@@ -108,7 +108,7 @@ void SceneExplorer(entt::entity& selected, Scene& scene )
     ImGui::End();
 }
 
-void Viewport(Framebuffer& framebuffer) {
+void Viewport(Framebuffer& framebuffer, Scene& scene) {
 
     unsigned int viewportWindowFlags = ImGuiWindowFlags_NoTitleBar
         | ImGuiWindowFlags_NoDecoration

Editor/src/UI/widgets.h

@@ -7,7 +7,7 @@
 #include <entt/entity/fwd.hpp>
 
 #include "../../libs/guizmo/ImGuizmo.h"
-#include "../../YoggieEngine/src/YoggieEngine.h"
+#include "../../YoggieEngine/src/BarinkEngine.h"
 typedef void ( *voidFunction ) (void);
 using namespace YoggieEngine;
 
@@ -17,7 +17,7 @@ void Inspector(entt::entity entity, Scene& scene);
 
 void SceneExplorer(entt::entity& selected, Scene& scene);
 
-void Viewport(Framebuffer& framebuffer);
+void Viewport(Framebuffer& framebuffer, Scene& scene);
 
 void Settings();
 

Editor/src/app.cpp

@@ -1,268 +0,0 @@
-#include <glm/gtc/type_ptr.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <imgui.h>
-#include <backends/imgui_impl_opengl3.h>
-#include <backends/imgui_impl_glfw.h>
-#include <imgui_internal.h>
-#include <nfd.h>
-
-#include "../../libs/guizmo/ImGuizmo.h"
-
-#include "UI/Widgets.h"
-#include "Project.h"
-#include "SceneSerializer.h"
-#include "EditorContext.h"
-#include "SceneRuntime.h"
-
-const unsigned int MS_PER_UPDATE = 2;
-
-class Editor : public Application {
-public:
-    Editor() : Application("Editor") {}
-    void Run() override
-    {
-        BarinkWindow mainWindow = BarinkWindow(1200, 700);
-        
-        InputSystem = new InputManager();
-        renderer = new Renderer();
-
-        InputSystem->attach(&mainWindow);
-
-        InitImGui(mainWindow);
-
-        activeRuntime.Start();
-
-        double previous = glfwGetTime();
-        double lag = 0.0;
-
-        renderer->Prepare(activeRuntime.MainScene);
-
-        while (!mainWindow.WindowShouldClose())
-        {
-
-            double current = glfwGetTime();
-            double elapsed = current - previous;
-            previous = current;
-            lag += elapsed;
-
-            InputSystem->PollEvents();
-
-            while (lag >= MS_PER_UPDATE) 
-            {
-                activeRuntime.Update();
-                lag -= MS_PER_UPDATE;
-            }
-
-            renderer->Render(activeRuntime.framebuffer, activeRuntime.MainScene);
-            
-            ImGuiBegin();
-            RenderGUI();
-            ImGuiEnd();
-
-            mainWindow.SwapBuffers();
-            glClear(GL_COLOR_BUFFER_BIT| GL_DEPTH_BUFFER_BIT);
-
-
-        }
-
-        activeRuntime.Stop();
-
-        delete InputSystem;
-        delete renderer;
-
-        ImGui_ImplOpenGL3_Shutdown();
-        ImGui_ImplGlfw_Shutdown();
-        ImGui::DestroyContext();
-
-    }
-
-    void InitImGui(BarinkWindow& window ) 
-    {
-        IMGUI_CHECKVERSION();
-        ImGui::CreateContext();
-        ImGuiIO& io = ImGui::GetIO();
-        io.ConfigFlags |= ImGuiConfigFlags_::ImGuiConfigFlags_ViewportsEnable;
-        io.ConfigFlags |= ImGuiConfigFlags_::ImGuiConfigFlags_DockingEnable;
-        io.Fonts->AddFontFromFileTTF("build/Debug/Fonts/Roboto-Regular.ttf", 18);
-
-
-        ImGui::StyleColorsDark();
-
-        ImGui_ImplGlfw_InitForOpenGL(window.windowptr(), true);
-        ImGui_ImplOpenGL3_Init("#version 440");
-
-
-    }
-
-    void ImGuiBegin() {
-        ImGui_ImplGlfw_NewFrame();
-        ImGui_ImplOpenGL3_NewFrame();
-
-        ImGui::NewFrame();
-
-        ImGuizmo::SetOrthographic(true);
-        ImGuizmo::BeginFrame();
-
-    }
-
-    void ImGuiEnd() {
-        ImGui::EndFrame();
-
-
-        ImGui::Render();
-        ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
-
-        if (ImGui::GetIO().ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
-        {
-            GLFWwindow* last_context = glfwGetCurrentContext();
-            ImGui::UpdatePlatformWindows();
-            ImGui::RenderPlatformWindowsDefault();
-            glfwMakeContextCurrent(last_context);
-        }
-    }
-
-
-    void RenderGUI() {
-        ImGui::DockSpaceOverViewport(ImGui::GetMainViewport());
-
-        // Show a menu bar
-
-        ImGui::BeginMainMenuBar();
-
-        if (ImGui::BeginMenu("Application")) {
-
-            if (ImGui::MenuItem("Load Project"))
-            {
-                nfdresult_t result = NFD_OpenDialog({ "yproj" }, NULL, &path);
-                switch (result) {
-                case(NFD_OKAY):
-                    Project::LoadProject(path, activeRuntime.CurrentProject);
-                    break;
-                case(NFD_CANCEL):
-                    break;
-                case(NFD_ERROR):
-                    std::cout << "NFD_Error: " << NFD_GetError() << std::endl;
-                    break;
-                }
-
-            }
-
-            if (ImGui::MenuItem("Save project as...")) {
-                nfdresult_t result = NFD_SaveDialog({ "yproj" }, NULL, &savePath);
-                switch (result) {
-                case(NFD_OKAY):
-                    std::cout << "Save as: " << savePath << std::endl;
-                    Project::SaveProject(savePath, *activeRuntime.CurrentProject.get());
-                    break;
-                case(NFD_CANCEL):
-                    break;
-                case(NFD_ERROR):
-                    std::cout << "NFD_Error: " << NFD_GetError() << std::endl;
-                    break;
-                }
-            }
-
-
-
-            if (ImGui::MenuItem("Preferences"))
-            {
-
-            }
-
-            if (ImGui::MenuItem("Exit"))
-            {
-                // TODO: Exit application
-            }
-
-            ImGui::EndMenu();
-        }
-
-
-        if (ImGui::BeginMenu("Scene")) {
-
-            if (ImGui::MenuItem("Save scene"))
-            {
-                nfdresult_t result = NFD_SaveDialog({ "yscene" }, NULL, &scenePath);
-                switch (result) {
-                case(NFD_OKAY):
-                    SaveScene(scenePath,  activeRuntime.MainScene);
-                    break;
-                case(NFD_CANCEL):
-                    break;
-                case(NFD_ERROR):
-                    std::cout << "NFD_Error: " << NFD_GetError() << std::endl;
-                    break;
-                }
-
-            }
-
-            if (ImGui::MenuItem("Load scene"))
-            {
-                auto result = NFD_OpenDialog({ "yscene" }, NULL, &openScenePath);
-                switch (result) {
-                case (NFD_OKAY):
-                   LoadScene(openScenePath, activeRuntime.MainScene);
-                    break;
-                case(NFD_CANCEL):
-                    break;
-                case(NFD_ERROR):
-                    std::cout << "NFD_Error: " << NFD_GetError() << std::endl;
-                    break;
-                }
-
-            }
-
-            if (ImGui::MenuItem("Add Entity")) {
-                activeRuntime.MainScene.AddEntity("New Entity");
-            }
-
-            ImGui::EndMenu();
-        }
-
-
-        ImGui::EndMainMenuBar();
-
-        ImGui::Begin("ProjectInfo");
-        ImGui::Text("Project: %s", activeRuntime.CurrentProject.get()->GetName().c_str());
-        ImGui::Text("Directory: %s", activeRuntime.CurrentProject.get()->GetProjectDirectory().u8string().c_str());
-        ImGui::End();
-
-
-        //ShowStats();
-        Viewport(*activeRuntime.framebuffer);
-        SceneExplorer(activeRuntime.Selected, activeRuntime.MainScene);
-        Inspector(activeRuntime.Selected, activeRuntime.MainScene);
-
-        Settings();
-        AssetsFinder();
-        Console();
-
-        ImGui::ShowDemoWindow();
-        ImGui::ShowMetricsWindow();
-
-    }
-
-
-private:
-    EditorContext context;
-    SceneRuntime activeRuntime ;
-    char* path = nullptr;
-    char* savePath = nullptr;
-    char* scenePath = nullptr;
-    char* openScenePath = nullptr;
-
-
-};
-
-int main (int argc , char* argv[]) {
-
-    Editor().Run();
-
-}
-
-
-
-
-
-
-

Editor/src/main.cpp

@@ -0,0 +1,242 @@
+#include <glm/gtc/type_ptr.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+#include <imgui.h>
+#include <imgui_internal.h>
+#include <nfd.h>
+
+#include "../../libs/guizmo/ImGuizmo.h"
+#include "../../YoggieEngine/src/BarinkEngine.h"
+#include "../../YoggieEngine/src/AssetManager/ModelImporter.h"
+#include "../../YoggieEngine/src/Graphics/Memory/Framebuffer.h"
+#include "../../YoggieEngine/src/PerfCounter.cpp"
+#include "../../YoggieEngine/src/Scene/Entity.h"
+#include "UI/Widgets.h"
+#include "Project.h"
+#include "SceneSerializer.h"
+
+
+
+using namespace YoggieEngine;
+/*
+* Define globals
+*/
+
+struct EditorContext  {
+    Project CurrentProject;
+    Scene MainScene;
+
+    EditorContext() = default;
+    EditorContext(EditorContext& other) = default;
+    ~EditorContext() = default;
+};
+
+std::shared_ptr<Project> CurrentProject;
+Scene MainScene;
+
+Framebuffer* framebuffer;
+SceneObject* Model;
+Entity cube;
+
+
+entt::entity  Selected;
+
+/*
+* Runs once at startup
+* - USe to initialize the game/sandbox/demo
+*/
+void Start() {
+
+    CurrentProject = std::make_shared<Project>("Random");
+    auto io = ImGui::GetIO();
+    io.Fonts->AddFontFromFileTTF("build/Debug/Fonts/Roboto-Regular.ttf", 18);
+ 
+    framebuffer = new Framebuffer();
+
+
+    // Create a level and load it as the current level
+    auto importer = ModelImporter();
+    
+    // Create a cube 
+    Model = importer.Import("build/Debug/Models/Cube.obj");
+    cube = MainScene.AddEntity("cube");
+    
+    auto& render3DComponent = cube.AddComponent<Render3DComponent>();
+    render3DComponent.mesh = *(Model->renderable->mesh);
+
+    cube.GetComponent<TransformComponent>().Position = glm::vec3(1.0f, 0.0f, 5.0f);
+    
+    auto cube2 = MainScene.AddEntity("Cube1");
+    auto& rendercube2 = cube2.AddComponent<Render3DComponent>();
+    rendercube2.mesh = *(Model->renderable->mesh);
+
+
+    // create an ambient light source
+    auto AmbientLight = MainScene.AddEntity("AmbientLight");
+    auto light = AmbientLight.AddComponent<LightComponent>();
+    light.Color = glm::vec3(1.0f);
+    light.Strength = 1.0f;
+
+    Selected = (entt::entity) -1;
+
+    renderer.Prepare(MainScene);
+}
+
+
+char* path = nullptr;
+char* savePath = nullptr;
+char* scenePath = nullptr;
+char* openScenePath = nullptr;
+/*
+* Runs every frame
+* - Use to draw Immediate mode graphics (Not meant for HUD's )
+*/
+void ImmediateGraphicsDraw()
+{   ImGui::DockSpaceOverViewport(ImGui::GetMainViewport());
+     
+    // Show a menu bar
+
+    ImGui::BeginMainMenuBar();
+
+    if (ImGui::BeginMenu("Application")) {
+
+        if (ImGui::MenuItem("Load Project")) 
+        {
+            nfdresult_t result = NFD_OpenDialog({ "yproj" }, NULL, &path);
+                switch (result) {
+                case(NFD_OKAY):
+                    Project::LoadProject( path, CurrentProject);
+                    break;
+                case(NFD_CANCEL):
+                    break;
+                case(NFD_ERROR):
+                    std::cout << "NFD_Error: " << NFD_GetError() << std::endl;
+                    break;
+            }
+
+        }
+
+        if (ImGui::MenuItem("Save project as...")) {
+            nfdresult_t result = NFD_SaveDialog({ "yproj" }, NULL, &savePath);
+            switch (result) {
+            case(NFD_OKAY):
+                std::cout << "Save as: " << savePath << std::endl;
+                Project::SaveProject(savePath, *CurrentProject.get());
+                break;
+            case(NFD_CANCEL):
+                break;
+            case(NFD_ERROR):
+                std::cout << "NFD_Error: " << NFD_GetError() << std::endl;
+                break;
+            }
+        }
+
+
+
+        if (ImGui::MenuItem("Preferences"))
+        {
+
+        }
+
+        if (ImGui::MenuItem("Exit"))
+        {
+            // TODO: Exit application
+        }
+
+        ImGui::EndMenu();
+    }
+
+
+    if (ImGui::BeginMenu("Scene")) {
+
+        if (ImGui::MenuItem("Save scene"))
+        {
+            nfdresult_t result= NFD_SaveDialog({"yscene"},NULL, &scenePath);
+            switch (result) {
+            case(NFD_OKAY):
+                SaveScene(scenePath, MainScene);
+                break;
+            case(NFD_CANCEL):
+                break;
+            case(NFD_ERROR):
+                std::cout << "NFD_Error: " << NFD_GetError() << std::endl;
+                break;
+            }
+
+        }
+
+        if (ImGui::MenuItem("Load scene"))
+        {
+            auto result = NFD_OpenDialog({ "yscene" }, NULL, &openScenePath);
+            switch (result) {
+            case (NFD_OKAY):
+                LoadScene(openScenePath, MainScene);
+                break;
+            case(NFD_CANCEL):
+                break;
+            case(NFD_ERROR):
+                std::cout << "NFD_Error: " << NFD_GetError() << std::endl;
+                break;
+            }
+
+        }
+
+        if (ImGui::MenuItem("Add Entity")) {
+            MainScene.AddEntity("New entity");
+        }
+
+        ImGui::EndMenu();
+    }
+
+
+    ImGui::EndMainMenuBar();
+
+    ImGui::Begin("ProjectInfo");
+    ImGui::Text("Project: %s", CurrentProject.get()->GetName().c_str());
+    ImGui::Text("Directory: %s", CurrentProject.get()->GetProjectDirectory().u8string().c_str());
+    ImGui::End();
+
+
+    //ShowStats();
+    Viewport(*framebuffer, MainScene);
+    SceneExplorer(Selected, MainScene);
+    Inspector(Selected, MainScene );
+
+    Settings();
+    AssetsFinder();
+    Console();
+
+    ImGui::ShowDemoWindow();
+    ImGui::ShowMetricsWindow();
+   
+
+}
+
+void Render() 
+{
+    renderer.Render( *framebuffer, MainScene);
+}
+
+/*
+* Runs every frame
+* - Meant for game logic ( non-physics related)
+*/
+void Update()
+{
+}
+
+/*
+* Runs every physics update
+*/
+void fixed_update() 
+{
+    
+}
+
+/*
+* Runs at the end of the program
+* - Meant for cleanup
+*/
+void Stop()
+{
+    delete framebuffer;
+}

YoggieEngine/premake5.lua

@@ -1,10 +1,6 @@
 project "YoggieEngine"
   kind "StaticLib"
 
-  pchheader "YoggieEngine.h"
-  pchsource "src/YoggieEngine.cpp"
-
-
   buildmessage "Building Yoggie Engine"
   disablewarnings{
     "4099" -- Ignore the missing debug signals for GLFW warning
@@ -13,7 +9,6 @@ project "YoggieEngine"
 
 
   includedirs {
-    "./src",
     "../libs/spdlog/include",
     "../libs/glm",
 
@@ -56,18 +51,17 @@ project "YoggieEngine"
   }
 
   files {
+    "../libs/glad/src/glad.c",
 
-    "./src/**.cpp",
+    "./src/*.cpp",
-    "./src/**.h"
+    "./src/*.h",
+    "./src/**/*.cpp",
+    "./src/**/*.h"
   }
 
   prebuildcommands 
   {
-    ok,err = os.copyfile("YoggieEngine/src/Graphics/shaders/*" ,"SandboxApp/build/Debug/")
+    ok,err = os.copyfile("BarinkEngine/src/Graphics/shaders/*" ,"SandboxApp/build/Debug/")
   }
 
-  postbuildcommands 
-  {
-    ok,err = os.copyfile("YoggieEngine/build/Debug/intermediates/YoggieEngine.pch", "YoggieEngine/build/Debug/YoggieEngine.pch")
-  }
 

YoggieEngine/src/Application.cpp

@@ -1,17 +0,0 @@
-#include <YoggieEngine.h>
-#include "Application.h"
-
-namespace YoggieEngine {
-	Application::Application(const std::string& name )
-		: m_AppName(name)
-	{
-		EngineInstrumentation::PerfomanceSamplerInit();
-	}
-
-
-	void Application::Run() {
-		std::cout << "No run function implemented!";
-	}
-
-
-}

YoggieEngine/src/Application.h

@@ -1,38 +0,0 @@
-#pragma once
-#include "YoggieEngine.h"
-
-#include "Input/InputManager.h"
-#include "Graphics/Renderer.h"
-#include <string>
-#include <iostream>
-#include <memory>
-namespace YoggieEngine {
-	// forward declaration
-	class InputManager;
-
-	class Application {
-	public:
-		Application(const std::string& name);
-		virtual void Run();
-
-
-	protected:
-		std::string m_AppName;
-		Renderer* renderer = nullptr;
-		InputManager* InputSystem = nullptr;
-		friend class ApplicationRuntime;
-	};
-
-
-	class ApplicationRuntime {
-
-	public:
-		virtual void Start() = 0;
-		virtual void Update() = 0;
-		virtual void FixedUpdate() = 0;
-		virtual void Stop() = 0;
-
-	};
-
-
-};

YoggieEngine/src/AssetManager/ModelImporter.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "ModelImporter.h"
 #include "spdlog/spdlog.h"
 namespace YoggieEngine {

YoggieEngine/src/BarinkEngine.cpp

@@ -0,0 +1,84 @@
+#include "BarinkEngine.h"
+using namespace YoggieEngine;
+
+Renderer renderer;
+
+const unsigned int MS_PER_UPDATE = 2;
+
+int main(int argc, char* argv[]) {
+	// Setup performance sampler 
+	EngineInstrumentation::PerfomanceSamplerInit();
+
+	// Startup services 
+	BarinkWindow MainWindow = BarinkWindow(1200, 700);
+
+	renderer = Renderer();
+	InputSystem = InputManager();
+
+	InputSystem.attach(&MainWindow);
+
+	GUIManager GUISystem = GUIManager(&MainWindow);
+
+	glEnable(GL_DEPTH_TEST);
+
+	// First call to setup game
+	{
+		Start();
+	}
+
+
+	double previous = glfwGetTime();
+	double lag = 0.0;
+
+	// Runtime loop
+	while (!MainWindow.WindowShouldClose())
+	{
+
+		double current = glfwGetTime();
+		double elapsed = current - previous;
+		previous = current;
+		lag += elapsed;
+
+		//EngineInstrumentation::Update(); // Todo this does nothing right now and is therefor disabled
+
+		// Execute main logic 
+		{
+			InputSystem.PollEvents();
+
+		}
+
+		{
+			while (lag >= MS_PER_UPDATE) {
+				Update();
+				lag -= MS_PER_UPDATE;
+			}
+		}
+
+		{
+			Render();
+		}
+
+		{
+			GUISystem.Render();
+		}
+
+
+		{
+			MainWindow.SwapBuffers();
+			glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+		}
+
+	}
+
+	// Shutdown game
+	{
+		Stop();
+	}
+
+	// Shutdown Services
+
+	return 0;
+}
+
+
+

YoggieEngine/src/BarinkEngine.h

@@ -0,0 +1,21 @@
+#pragma once
+#include "glm/glm.hpp"
+#include "graphics/Primitives/Shader.h"
+#include "Platform/Window.h"
+#include "graphics/Primitives/Texture.h"
+#include "graphics/Primitives/Camera.h"
+#include "graphics/Renderable.h"
+#include "Graphics/Renderer.h"
+#include "Graphics/Primitives/Material.h"
+#include "Input/InputManager.h"
+#include "Graphics/Renderer.h"
+#include "GUI/GUIManager.h"
+#include "Scene/Scene.h"
+using namespace YoggieEngine;
+extern Renderer renderer;
+
+extern void Start();
+extern void Update();
+extern void Render();
+extern void ImmediateGraphicsDraw();
+extern void Stop();

YoggieEngine/src/EventSystem/Event.h

@@ -1,5 +1,4 @@
 #pragma once 
-
 #include <string>
 
 namespace YoggieEngine {

YoggieEngine/src/EventSystem/EventEmitter.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "EventEmitter.h"
 
 namespace YoggieEngine {

YoggieEngine/src/EventSystem/EventEmitter.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "Event.h"
 #include "EventListener.h"
 namespace YoggieEngine{

YoggieEngine/src/GUI/GUIManager.cpp

@@ -0,0 +1,65 @@
+#include "GUIManager.h"
+#include "imgui.h"
+#include "backends/imgui_impl_opengl3.h"
+#include <backends/imgui_impl_glfw.h>
+#include "../../libs/guizmo/ImGuizmo.h"
+#include "../BarinkEngine.h"
+
+namespace YoggieEngine {
+
+    GUIManager::GUIManager(BarinkWindow* window)
+        : currentwindow(window)
+    {
+        IMGUI_CHECKVERSION();
+        ImGui::CreateContext();
+        ImGuiIO& io = ImGui::GetIO();
+        io.ConfigFlags |= ImGuiConfigFlags_::ImGuiConfigFlags_ViewportsEnable;
+        io.ConfigFlags |= ImGuiConfigFlags_::ImGuiConfigFlags_DockingEnable;
+
+        ImGui::StyleColorsDark();
+
+        ImGui_ImplGlfw_InitForOpenGL(currentwindow->windowptr(), true);
+        ImGui_ImplOpenGL3_Init("#version 440");
+
+
+    }
+
+    GUIManager::~GUIManager()
+    {
+        ImGui_ImplOpenGL3_Shutdown();
+        ImGui_ImplGlfw_Shutdown();
+        ImGui::DestroyContext();
+    }
+
+    void GUIManager::Render()
+    {
+        ImGui_ImplGlfw_NewFrame();
+        ImGui_ImplOpenGL3_NewFrame();
+
+        ImGui::NewFrame();
+
+        ImGuizmo::SetOrthographic(true);
+        ImGuizmo::BeginFrame();
+
+
+
+        ImmediateGraphicsDraw();
+
+
+
+        ImGui::EndFrame();
+
+
+        ImGui::Render();
+        ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
+
+        if (ImGui::GetIO().ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
+        {
+            GLFWwindow* last_context = glfwGetCurrentContext();
+            ImGui::UpdatePlatformWindows();
+            ImGui::RenderPlatformWindowsDefault();
+            glfwMakeContextCurrent(last_context);
+        }
+    }
+
+}

YoggieEngine/src/GUI/GUIManager.h

@@ -0,0 +1,14 @@
+#pragma once
+#include "../Platform/Window.h"
+
+namespace YoggieEngine {
+	class GUIManager {
+	public:
+		GUIManager(BarinkWindow* window);
+		~GUIManager();
+		void Render();
+
+	private:
+		BarinkWindow* currentwindow;
+	};
+}

YoggieEngine/src/Graphics/Memory/Buffer.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "Buffer.h"
 
 namespace YoggieEngine {

YoggieEngine/src/Graphics/Memory/FrameBuffer.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "Framebuffer.h"
 #include <iostream>
 namespace YoggieEngine {

YoggieEngine/src/Graphics/Memory/UniformBuffer.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "UniformBuffer.h"
 #include <glad/glad.h>
 

YoggieEngine/src/Graphics/Memory/UniformBuffer.h

@@ -1,4 +1,5 @@
 #pragma once
+
 namespace YoggieEngine {
 	class UniformBuffer {
 	public:

YoggieEngine/src/Graphics/Memory/VertexArray.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "VertexArray.h"
 #include <glad/glad.h>
 namespace YoggieEngine {

YoggieEngine/src/Graphics/Memory/VertexArray.h

@@ -1,4 +1,5 @@
 #pragma once 
+
 namespace YoggieEngine {
 	class VertexArray {
 	private:

YoggieEngine/src/Graphics/Primitives/Camera.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "Camera.h"
 namespace YoggieEngine {
 	Camera::Camera(glm::vec3 position, glm::vec3 rotation, float zoom)

YoggieEngine/src/Graphics/Primitives/Camera.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 

YoggieEngine/src/Graphics/Primitives/Material.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "Material.h"
 
 namespace YoggieEngine {

YoggieEngine/src/Graphics/Primitives/Shader.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "Shader.h"
 #include "spdlog/spdlog.h"
 namespace YoggieEngine {

YoggieEngine/src/Graphics/Primitives/Shader.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <glad/glad.h>
 #include <string>
 #include <iostream>

YoggieEngine/src/Graphics/Primitives/Texture.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "Texture.h"
 #include <glad/glad.h>
 #include <GLFW/glfw3.h>

YoggieEngine/src/Graphics/RenderSurface.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "RenderSurface.h"
 namespace YoggieEngine {
 	RenderSurface::RenderSurface() {

YoggieEngine/src/Graphics/RenderSurface.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "../BarinkEngine.h"
 #include "../Graphics/Memory/Buffer.h"
 #include "../Graphics/Memory/VertexArray.h"
 #include <vector>

YoggieEngine/src/Graphics/Renderer.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "Renderer.h"
 #include "../Scene/Components.h"
 #include "../Graphics/Memory/VertexArray.h"
@@ -11,10 +10,7 @@ float Angle = 0.0;
 Camera cam = Camera(glm::vec3(12.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f), 90.0f);
 glm::mat4 projection = glm::perspective(glm::radians(cam.Zoom), (800.0f / 600.0f), 0.001f, 100.0f);
 
-Renderer::Renderer(){
+Renderer::Renderer(){}
-	glEnable(GL_DEPTH_TEST);
-
-}
 
 Renderer::~Renderer(){}
 
@@ -92,12 +88,10 @@ void Renderer::Render(Scene& scene)
 
 }
 
-void Renderer::Render(Framebuffer* framebuffer, Scene& scene)
+void Renderer::Render(Framebuffer& framebuffer, Scene& scene)
 {
-	if (framebuffer == nullptr)
-		return;
 
-	glBindFramebuffer(GL_FRAMEBUFFER, framebuffer->GetId());
+	glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.GetId());
 
 	glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

YoggieEngine/src/Graphics/Renderer.h

@@ -22,6 +22,6 @@ namespace YoggieEngine {
 		void Prepare(Scene& scene);
 		void Render(Scene& scene );
 
-		void Render(Framebuffer* framebuffer, Scene& scene);
+		void Render(Framebuffer& framebuffer, Scene& scene);
 	};
 }

YoggieEngine/src/Input/InputManager.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "InputManager.h"
 namespace YoggieEngine {
 	InputManager InputSystem;

YoggieEngine/src/Input/InputManager.h

@@ -1,4 +1,11 @@
 #pragma once
+#include <vector>
+#include <iostream>
+
+#include "spdlog/spdlog.h"
+#include "../EventSystem/EventEmitter.h"
+#include "../EventSystem/EventListener.h"
+#include "../Platform/Window.h"
 
 namespace YoggieEngine {
 

YoggieEngine/src/PerfCounter.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "PerfCounter.h"
 #include <imgui.h>
 #include <iostream>

YoggieEngine/src/PerfCounter.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "YoggieEngine.h"
-
 #include <string>
 #include <vector>
 #include <chrono>

YoggieEngine/src/Platform/Window.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "Window.h"
 namespace YoggieEngine {
 	bool BarinkWindow::InitGLFW() {

YoggieEngine/src/Platform/Window.h

@@ -1,5 +1,4 @@
 #pragma once 
-
 #define GLFW_STATIC
 
 #include <glad/glad.h>

YoggieEngine/src/Scene/Components.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <glm/glm.hpp>
 #include "../Graphics/Primitives/Shader.h"
 #include "../Graphics/Primitives/Mesh.h"

YoggieEngine/src/Scene/Entity.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "Entity.h"
 
 namespace YoggieEngine {

YoggieEngine/src/Scene/Entity.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <entt/entt.hpp>
 namespace YoggieEngine {
 	class Scene;

YoggieEngine/src/Scene/Scene.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "Scene.h"
 #include "Entity.h"
 #include "Components.h"

YoggieEngine/src/Scene/Scene.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <string>
 #include <entt/entt.hpp>
 namespace YoggieEngine {

YoggieEngine/src/Scene/TransformTree/Node.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "Node.h"
 
 namespace YoggieEngine {

YoggieEngine/src/Scene/TransformTree/Node.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <string>
 #include <vector>
 namespace YoggieEngine {

YoggieEngine/src/Scene/TransformTree/SceneNodeTypes.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "SceneNodeTypes.h"
 namespace YoggieEngine {
 	SceneCamera::SceneCamera()

YoggieEngine/src/Scene/TransformTree/SceneNodeTypes.h

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

YoggieEngine/src/Scripting/LuaScript.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "LuaScript.h"
 /*
 namespace YoggieEngine {

YoggieEngine/src/Scripting/LuaScript.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <string>
 
 extern "C"

YoggieEngine/src/Scripting/LuaScriptingManager.cpp

@@ -1,4 +1,3 @@
-#include <YoggieEngine.h>
 #include "LuaScriptingManager.h"
 /*
 namespace YoggieEngine {

YoggieEngine/src/Scripting/LuaScriptingManager.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <vector>
 
 extern "C"

YoggieEngine/src/YoggieEngine.cpp

@@ -1 +0,0 @@
-#include <YoggieEngine.h>

YoggieEngine/src/YoggieEngine.h

@@ -1,21 +0,0 @@
-#pragma once
-#include <glad/glad.h>
-#include "glm/glm.hpp"
-
-#include "Platform/Window.h"
-
-#include "Graphics/Primitives/Shader.h"
-#include "Graphics/Primitives/Texture.h"
-#include "Graphics/Primitives/Camera.h"
-#include "Graphics/Primitives/Material.h"
-#include "Graphics/Renderer.h"
-
-#include "spdlog/spdlog.h"
-
-#include "EventSystem/EventEmitter.h"
-#include "EventSystem/EventListener.h"
-
-#include "Input/InputManager.h"
-
-#include "Scene/Scene.h"
-#include "Application.h"

premake5.lua

@@ -27,10 +27,9 @@ workspace "Yoggie GameEngine"
 		optimize "On"
 
 		
-
 include("./YoggieEngine")
 include ("./Editor")
-	  
+
 
 group("Other")
 	includeexternal("./SandboxApp")
@@ -42,5 +41,3 @@ group("Libraries")
   include('../ImGui')
   include("../ImGuizmo")
   include("../yaml-cpp")
-  
-