From 855da86feae1a5cc14dc2d486ccf115f484dbc2e Mon Sep 17 00:00:00 2001 From: rtk0c Date: Mon, 25 Apr 2022 20:22:07 -0700 Subject: Changeset: 16 Initial work on rendering sprites to screen --- source/EditorCore.hpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'source/EditorCore.hpp') diff --git a/source/EditorCore.hpp b/source/EditorCore.hpp index 13dc2d0..b473b2e 100644 --- a/source/EditorCore.hpp +++ b/source/EditorCore.hpp @@ -10,6 +10,7 @@ #include #include +// TODO move inspector drawing to this class struct EditorInspector { enum TargetType { ITT_GameObject, @@ -58,12 +59,18 @@ class EditorInstance { private: App* mApp; GameWorld* mWorld; - RcPtr mSpriteView_Instance; + GameObject* mPopupCurrent_GameObject = nullptr; + RcPtr mSpriteView_Instance; EditorInspector mEdInspector; EditorContentBrowser mEdContentBrowser; int mSpriteView_Frame; bool mSpriteView_OpenNextFrame = false; - bool mEdContentBrowserVisible = false; + bool mWindowVisible_ImGuiDemo = false; + bool mWindowVisible_CommandPalette = false; + bool mWindowVisible_Inspector = true; + bool mWindowVisible_ContentBrowser = true; + bool mWindowVisible_WorldStructure = true; + bool mWindowVisible_WorldProperties = true; public: EditorInstance(App* app, GameWorld* world); @@ -74,7 +81,7 @@ public: EditorInspector& GetInspector() { return mEdInspector; } EditorContentBrowser& GetContentBrowser() { return mEdContentBrowser; } - void OpenSpriteViewer(Sprite* sprite); + void OpenSpriteViewer(SpriteDefinition* sprite); private: void ShowWorldProperties(); @@ -82,7 +89,5 @@ private: void ShowInspector(IresObject* ires); void ShowInspector(GameObject* object); - void ShowGameObjectInTree(GameObject* object); - void ShowSpriteViewer(); }; -- cgit v1.2.3-70-g09d2