Editor/premake5.lua

@@ -6,8 +6,7 @@ buildmessage "Building editor ..."
 links{
   "YoggieEngine",
   "ImGuizmo",
-  "yaml-cpp",
+  "yaml-cpp"
-  "nfd.lib"
 }
 
 includedirs{
@@ -26,18 +25,18 @@ includedirs{
   incfolder["imguizmo"],
   incfolder["entt"],
   incfolder["yamlcpp"],
-  incfolder["nativefiledialog"],
 
   "./include"
 
 }
 
 libdirs {
-  staticlib["yoggie"],
+  staticlib["yoggie"]
-  staticlib["nativefiledialog"]
 }
 
 files { 
   "./src/*.h",
   "./src/*.cpp"
 }
+
+include("../yaml-cpp")

Editor/src/Project.cpp

@@ -6,60 +6,16 @@
 #include <yaml-cpp/yaml.h>
 
 
-void Project::SaveProject(std::filesystem::path path, Project& project)
+void Project::CreateProject(std::filesystem::path path) {
-{
 	YAML::Emitter projectYAML;
-	projectYAML << YAML::BeginMap;
+	projectYAML << YAML::Key << "Project" << YAML::Value << "new";
-	projectYAML << YAML::Key << "Project" << YAML::Value << project.Name;	
-	projectYAML << YAML::Key << "Directory" << YAML::Value << path.parent_path().u8string();
-	projectYAML << YAML::EndMap;
 	std::ofstream projectFile;
 
+	path.append(ProjectName.append(".yproj"));
+
+	std::cout << path.u8string() << std::endl;
+
 	projectFile.open(path.u8string());
 	projectFile << projectYAML.c_str();
 	projectFile.close();
-}
-
-void Project::LoadProject(std::filesystem::path path, std::shared_ptr<Project>& project) 
-{
-	std::string YAMLProject;
-	std::stringstream sstream;
-	std::ifstream projectFile;
-	projectFile.open(path.u8string());
-
-	sstream << projectFile.rdbuf();
-	YAMLProject = sstream.str();
-
-	projectFile.close();
-
-
-	YAML::Node node = YAML::Load(YAMLProject);
-	
-	// this is probably not perfect but it seems to work for now
-	project.reset();
-	project = std::make_shared<Project>(node.as<Project>());
-
-	std::cout << "loading..." << project.get()->Name << std::endl;
-
-
-	
-}
-
-
-namespace YAML {
-
-	template<>
-	class convert<Project> {
-	public:
-		static bool decode(const Node& node , Project& rhs) 
-		{
-			if (!node.IsMap())
-				return false;
-			rhs.setName(node["Project"].as<std::string>());
-			rhs.setProjectDirectory(node["Directory"].as<std::string>());
-		}
-
-
-	};
-
 }

Editor/src/Project.h

@@ -1,22 +1,10 @@
 #pragma once
 #include <filesystem>
-#include <iostream>
 class Project {
 public:
-	Project() = default;
+	Project(const std::string& name): ProjectName(name){}
-	Project(const std::string& name): Name(name){}
+	void CreateProject(std::filesystem::path path );
-	~Project() { std::cout << "Unloading project..." << Name << std::endl; }
-
-	void setName(std::string& name) { Name = name; }
-	const std::string& GetName()const { return Name; }
-
-	void setProjectDirectory(std::string& path) { ProjectDirectory = std::filesystem::path(path); }
-	const std::filesystem::path GetProjectDirectory() { return ProjectDirectory; }
-
-	static void SaveProject(std::filesystem::path path, Project& project);
-	static void LoadProject(std::filesystem::path path, std::shared_ptr<Project>& project);
 private:
-	std::string Name;
+	std::string ProjectName;
-	std::filesystem::path ProjectDirectory;
-};
 
+};

Editor/src/SceneSerializer.h

@@ -1,110 +0,0 @@
-#pragma once
-#include "../../YoggieEngine/src/BarinkEngine.h"
-#include <yaml-cpp/yaml.h>
-#include <string>
-#include <filesystem>
-#include <fstream>
-
-void WriteFile(std::string& emitter, std::filesystem::path path) 
-{
-	std::cout << "Writing Scene file to: "  << path.u8string() << std::endl;
-	std::ofstream sceneFile;
-	sceneFile.open(path.u8string());
-
-	sceneFile << emitter.c_str();
-
-	sceneFile.close();
-}
-
-YAML::Emitter& operator<< (YAML::Emitter& emitter, glm::vec3& vector) {
-	emitter << YAML::Flow <<  YAML::BeginSeq << vector.x << vector.y << vector.x << YAML::EndSeq;
-	return emitter;
-}
-
-void Serialize(YAML::Emitter& emitter, TransformComponent& transform) 
-{
-	emitter << YAML::BeginMap;
-	emitter << YAML::Key << "Transform" << YAML::Value << YAML::Flow << YAML::BeginSeq;
-
-	emitter << YAML::Key << "Position";
-	emitter << YAML::Value << transform.Position;
-
-	emitter << YAML::Key << "Rotation";
-	emitter << YAML::Value << transform.Rotation;
-
-	emitter << YAML::Key << "Scale";
-	emitter << YAML::Value << transform.Scale;
-
-	emitter << YAML::EndSeq << YAML::EndMap;
-}
-
-void Serialize(YAML::Emitter& emitter, IdentifierComponent& identifier) 
-{
-	emitter << YAML::BeginMap;
-	emitter << YAML::Key << "Ident";
-	emitter << YAML::Value << identifier.name;
-	emitter << YAML::EndMap;
-}
-
-void Serialize(YAML::Emitter& emitter, LightComponent& light) 
-{
-	emitter << YAML::BeginMap << "Light";
-	emitter << YAML::Key << "strength";
-	emitter << YAML::Value << light.Strength;
-
-	emitter << YAML::Key << "Color";
-	emitter << YAML::Value << light.Color;
-	emitter << YAML::EndMap;
-}
-
- std::string Serialize( Scene& scene) {
-	YAML::Emitter sceneYAML;
-	
-	sceneYAML << "YOGGIE_SCENE_FILE" ;
-
-
-	scene.getReg().each([&scene, &sceneYAML](auto enttNumber) {
-		Entity entity = Entity(enttNumber, &scene);
-			
-		Serialize(sceneYAML, entity.GetComponent<IdentifierComponent>());
-		Serialize(sceneYAML, entity.GetComponent<TransformComponent>());
-		if (entity.HasComponent<LightComponent>()) {
-			Serialize(sceneYAML, entity.GetComponent<LightComponent>());
-		}
-
-		});
-	return std::string(sceneYAML.c_str());
-}
-
- void Parse(std::string& YAML) {
-	 std::vector<YAML::Node> nodes = YAML::LoadAll(YAML);
-
-	 for(YAML::Node node : nodes)
-	 {
-		 std::cout << node.Type() << std::endl;
-	 }
-
- }
-
- void SaveScene(std::filesystem::path path, Scene& scene) {
-	 std::string YAMLString = Serialize(scene);
-	 WriteFile(YAMLString, path);
- }
-
-
- void LoadScene(std::filesystem::path path, Scene& scene)
- {
-	 std::ifstream sceneFile;
-	 std::string YAMLScene;
-	 sceneFile.open(path.u8string());
-
-	 std::stringstream sstream;
-	 sstream << sceneFile.rdbuf();
-	 YAMLScene = sstream.str();
-
-	 sceneFile.close();
-
-
-	 Parse(YAMLScene);
-
- }

Editor/src/UI/Dialog.h

@@ -1,72 +0,0 @@
-#pragma once
-#include <string>
-#include <imgui.h>
-#include <nfd.h>
-#include <iostream>
-#include <functional>
-#include "Project.h"
-struct DialogSpec {
-    const std::string& id;
-    const std::string& Title;
-    const std::string& confirmText;
-    DialogSpec() = default;
-};
-
-//classes based on RAII
-class Dialog {
-public:
-	Dialog( DialogSpec spec, std::function<void(std::string&)> onConfirm)
-	: path(nullptr), location() {
-        if (ImGui::BeginPopupModal(spec.id.c_str(), NULL, ImGuiWindowFlags_NoMove))
-        {
-            ImGui::Text(spec.Title.c_str());
-            ImGui::Separator();
-
-            ImGui::LabelText("##Directory", "Directory: %s", location.c_str());
-            if (ImGui::Button("...")) {
-                nfdresult_t result = NFD_OpenDialog(NULL, NULL, &path);
-
-                switch (result) {
-                case (NFD_OKAY):
-                    location = std::string(path);
-                    break;
-                case(NFD_CANCEL):
-                    std::cout << "NFD_CANCEL" << std::endl;
-                case (NFD_ERROR):
-                    std::cout << "NFD_Error: " << NFD_GetError() << std::endl;
-                    break;
-
-                };
-
-            }
-
-            if (ImGui::Button(spec.confirmText.c_str(), ImVec2(120, 0)))
-            {
-                onConfirm(location);
-
-                ImGui::CloseCurrentPopup();
-            }
-
-            ImGui::SetItemDefaultFocus();
-            ImGui::SameLine();
-
-            if (ImGui::Button("Cancel", ImVec2(120, 0)))
-            {
-                ImGui::CloseCurrentPopup();
-            }
-
-            ImGui::EndPopup();
-
-        }
-	}
-
-	~Dialog() {
-		delete path;
-	}
-
-protected :
-	char* path;
-	std::string location;
-};
-
-

Editor/src/main.cpp

@@ -1,52 +1,32 @@
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <imgui.h>
-#include <imgui_internal.h>
+#include "Project.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 "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;
+Scene Level1;
 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);
  
@@ -58,34 +38,29 @@ void Start() {
     
     // Create a cube 
     Model = importer.Import("build/Debug/Models/Cube.obj");
-    cube = MainScene.AddEntity("cube");
+    cube = Level1.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 cube2 = Level1.AddEntity("Cube1");
     auto& rendercube2 = cube2.AddComponent<Render3DComponent>();
     rendercube2.mesh = *(Model->renderable->mesh);
 
 
     // create an ambient light source
-    auto AmbientLight = MainScene.AddEntity("AmbientLight");
+    auto AmbientLight = Level1.AddEntity("AmbientLight");
     auto light = AmbientLight.AddComponent<LightComponent>();
     light.Color = glm::vec3(1.0f);
     light.Strength = 1.0f;
 
     Selected = (entt::entity) -1;
 
-    renderer.Prepare(MainScene);
+    renderer.Prepare(Level1);
+
 }
-
-
-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 )
@@ -94,43 +69,25 @@ void ImmediateGraphicsDraw()
 {   ImGui::DockSpaceOverViewport(ImGui::GetMainViewport());
      
     // Show a menu bar
-
     ImGui::BeginMainMenuBar();
 
     if (ImGui::BeginMenu("Application")) {
 
-        if (ImGui::MenuItem("Load Project")) 
+        if (ImGui::BeginMenu("Project")) {
-        {
+            if (ImGui::MenuItem("New project"))
-            nfdresult_t result = NFD_OpenDialog({ "yproj" }, NULL, &path);
+            {
-                switch (result) {
+                  Project p("New-Project");
-                case(NFD_OKAY):
+                  p.CreateProject("I:/Dev/MyGameEngine");
-                    Project::LoadProject( path, CurrentProject);
-                    break;
-                case(NFD_CANCEL):
-                    break;
-                case(NFD_ERROR):
-                    std::cout << "NFD_Error: " << NFD_GetError() << std::endl;
-                    break;
             }
 
-        }
+            if (ImGui::MenuItem("Load Project"))
+            {
 
-        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;
             }
+
+            ImGui::EndMenu();
         }
-
+        
-
 
         if (ImGui::MenuItem("Preferences"))
         {
@@ -145,43 +102,18 @@ void ImmediateGraphicsDraw()
         ImGui::EndMenu();
     }
 
-
     if (ImGui::BeginMenu("Scene")) {
 
-        if (ImGui::MenuItem("Save 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"))
+        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");
+            Level1.AddEntity("New entity");
         }
 
         ImGui::EndMenu();
@@ -190,30 +122,24 @@ void ImmediateGraphicsDraw()
 
     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);
+    Viewport(*framebuffer, Level1);
-    SceneExplorer(Selected, MainScene);
+    SceneExplorer(Selected, Level1);
-    Inspector(Selected, MainScene );
+    Inspector(Selected, Level1 );
 
     Settings();
     AssetsFinder();
     Console();
 
     ImGui::ShowDemoWindow();
-    ImGui::ShowMetricsWindow();
+   ImGui::ShowMetricsWindow();
    
 
 }
 
 void Render() 
 {
-    renderer.Render( *framebuffer, MainScene);
+    renderer.Render( *framebuffer, Level1);
 }
 
 /*

Editor/src/widgets.cpp

@@ -25,49 +25,50 @@ void Inspector(entt::entity ent , Scene& scene) {
     static glm::vec3 Position = glm::vec3(0.0f, 0.0f, 0.0f);
     static glm::vec3 Rotation = glm::vec3(0.0f, 0.0f, 0.0f);
     if (scene.getReg().valid(ent)) {
-        Entity entity = Entity(ent, &scene);
 
+        Entity entity = Entity(ent, &scene);
+        
+        auto component = entity.GetComponent<IdentifierComponent>();
+        ImGui::LabelText("## Name:", component.name.c_str());
+        
+        
+        
         if (ImGui::Button("Add Component"))
             ImGui::OpenPopup("Component picker");
-       
+
         ImGui::SameLine();
         if (ImGui::BeginPopup("Component picker")) {
 
             for (int i = 0; i < IM_ARRAYSIZE(names); i++)
                 if (ImGui::MenuItem(names[i])) {
-                    std::cout << "Add a " << names[i] << " to "
+                    std::cout << "Add a " << names[i] << " to " 
                         << entity.GetComponent<IdentifierComponent>().name << std::endl;
                 }
 
             ImGui::EndPopup();
         }
-
+            
-
-
         ImGui::NewLine();
-        
+ 
-        auto component = entity.GetComponent<IdentifierComponent>();
+      
-        char* buf = new char(component.name.length());
+
-        strcpy(buf, component.name.c_str());
-        ImGui::InputText("Name:",buf , IM_ARRAYSIZE(buf), ImGuiInputTextFlags_ReadOnly);
-        
 
         if (entity.HasComponent<TransformComponent>()) {
             auto& transform = entity.GetComponent<TransformComponent>();
-            if (ImGui::CollapsingHeader("Transform", ImGuiTreeNodeFlags_DefaultOpen)) {
+            if (ImGui::CollapsingHeader("Transform", ImGuiTreeNodeFlags_None )) {
                 ImGui::DragFloat3("Position", glm::value_ptr(transform.Position), 0.01);
                 ImGui::DragFloat3("Rotation", glm::value_ptr(transform.Rotation), 0.01);
                 ImGui::DragFloat3("Scale", glm::value_ptr(transform.Scale), 0.01, 0);
+
+
             }
                 
         }
 
         if (entity.HasComponent<LightComponent>()) {
             auto& light = entity.GetComponent<LightComponent>();
-            if (ImGui::CollapsingHeader("Light", ImGuiTreeNodeFlags_DefaultOpen)) {
+            ImGui::DragFloat("Strength", &light.Strength, 0.001f);
-                ImGui::DragFloat("Strength", &light.Strength, 0.001f);
+            ImGui::ColorEdit3("Colour", glm::value_ptr(light.Color));
-                ImGui::ColorEdit3("Colour", glm::value_ptr(light.Color));
-            }
           
         }
 
@@ -88,7 +89,9 @@ void Inspector(entt::entity ent , Scene& scene) {
 
     }
 
+
     ImGui::End();
+
 }
 
 void SceneExplorer(entt::entity& selected, Scene& scene )
@@ -144,7 +147,6 @@ void Viewport(Framebuffer& framebuffer, Scene& scene) {
 
 void Settings() {
     ImGui::Begin("Settings");
-
     ImGui::LabelText("##title-settings", "Fine grain control over your engine... ");
     ImGui::End();
 }

libraries.lua

@@ -23,13 +23,10 @@ incfolder["gorillaaudio"] = "%{wks.location}/libs/GorillaAudio/include"
 -- Immediate Mode GUI
 incfolder["imgui"] = "%{wks.location}/libs/ImGui"
 incfolder["imguizmo"] = "%{wks.location}/libs/guizmo"
-incfolder["nativefiledialog"] = "%{wks.location}/libs/nativefiledialog/src/include"
-
-
-
 
 staticlib = {}
 
 staticlib["yoggie"] = "Yoggie/build/Debug"
-staticlib["nativefiledialog"]= "%{wks.location}/libs/nativefiledialog/build/lib/Release/x64"
+
+
 

premake5.lua

@@ -35,4 +35,3 @@ group("Other")
 group("Libraries")
   include('../ImGui')
   include("../ImGuizmo")
-  include("../yaml-cpp")