Changeset: 4 More work on editor

1 files changed, 8 insertions, 18 deletions

diff --git a/source/EditorCore.hpp b/source/EditorCore.hpp
index 3f9eb11..a9ef93a 100644
--- a/source/EditorCore.hpp
+++ b/source/EditorCore.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "EditorAttachment.hpp"
+#include "EditorInspector.hpp"
+#include "EditorResources.hpp"
 #include "GameObject.hpp"
 #include "World.hpp"
 
@@ -7,37 +10,24 @@
 #include <string>
 
 class App;
-
-namespace ImGui {
-const char* GetKeyNameGlfw(int key);
-} // namespace ImGui
-
-class EditorGameObjectAttachment {
-public:
-	std::string name;
-
-public:
-	static std::unique_ptr<EditorGameObjectAttachment> Create(GameObject* object);
-	virtual ~EditorGameObjectAttachment() = default;
-};
-
 class EditorInstance {
 private:
 	App* mApp;
 	GameWorld* mWorld;
 	GameObject* mSelectedGameObject = nullptr;
+	EditorInspector mEdInspector;
+	EditorContentBrowser mEdContentBrowser;
 
 public:
-	EditorInstance(App* app, GameWorld* world)
-		: mApp{ app }
-		, mWorld{ world } {}
+	EditorInstance(App* app, GameWorld* world);
+	~EditorInstance();
 
 	void Show();
 
 private:
 	void ShowWorldProperties();
 
-	void ShowInspector();
+	void ShowInspector(GameObject* object);
 	void ShowGameObjecetFields(GameObject* object);
 
 	void ShowGameObjectInTree(GameObject* object);