diff --git a/enginecustom/imgui.ini b/enginecustom/imgui.ini index 5e0bf6b..5b525d9 100644 --- a/enginecustom/imgui.ini +++ b/enginecustom/imgui.ini @@ -1,6 +1,6 @@ [Window][DockSpace] Pos=0,0 -Size=32,32 +Size=1536,793 Collapsed=0 [Window][Debug##Default] @@ -57,7 +57,7 @@ Collapsed=0 DockId=0x00000002,0 [Docking][Data] -DockSpace ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=0,19 Size=32,22 Split=X +DockSpace ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=0,19 Size=1536,774 Split=X DockNode ID=0x00000001 Parent=0xCCBD8CF7 SizeRef=1350,842 Split=X DockNode ID=0x00000005 Parent=0x00000001 SizeRef=1265,842 Split=Y DockNode ID=0x00000003 Parent=0x00000005 SizeRef=1584,609 Split=X diff --git a/enginecustom/src/inc/system/imguiManager.h b/enginecustom/src/inc/system/imguiManager.h index f7671de..b5c62ef 100644 --- a/enginecustom/src/inc/system/imguiManager.h +++ b/enginecustom/src/inc/system/imguiManager.h @@ -42,7 +42,7 @@ struct ComponentEntry { struct CachedEntity { std::string name; - ecs::EntityID id; + int id; }; class imguiManager diff --git a/enginecustom/src/src/system/imguiManager.cpp b/enginecustom/src/src/system/imguiManager.cpp index 27a7646..274c52b 100644 --- a/enginecustom/src/src/system/imguiManager.cpp +++ b/enginecustom/src/src/system/imguiManager.cpp @@ -502,6 +502,8 @@ void imguiManager::WidgetAddObject() // Remplacer les antislashs par des slashs std::replace(relativePath.begin(), relativePath.end(), L'\\', L'/'); app_->add_kobject(relativePath); + // set entities list as dirty + entityListDirty = true; } } @@ -596,13 +598,15 @@ void imguiManager::WidgetObjectWindow() // Remplacer les antislashs par des slashs std::replace(relativePath.begin(), relativePath.end(), L'\\', L'/'); app_->add_kobject(relativePath); + // set list as dirty since new entity has been added to the scene + entityListDirty = true; } } } S_LINE TEXT_V("Number of cubes: %d", entity_manager_->GetEntityCount()) SEP - + UpdateCachedEntitiesIfNeeded(); ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing,ImVec2(4,2)); @@ -660,6 +664,7 @@ void imguiManager::WidgetInspectorWindow() entity_manager_->DestroyEntity(m_selected_entity_id); m_selected_entity_id = -1; show_inspector_window_ = false; + entityListDirty = true; } S_LINE @@ -1223,9 +1228,10 @@ void imguiManager::UpdateCachedEntitiesIfNeeded() { auto identity = entity->GetComponent(); if (identity) { std::string name = identity->GetName(); + auto id = identity->GetId(); if (name.empty()) name = "Entity " + std::to_string(identity->GetId()); - cachedEntities_.push_back({ name, identity->GetId() }); + cachedEntities_.push_back({name,id}); } } entityListDirty = false; diff --git a/x64/Debug/config.txt b/x64/Debug/config.txt index aba56db..77c665a 100644 --- a/x64/Debug/config.txt +++ b/x64/Debug/config.txt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7051b358fa10ce0cd9c08bfd24944aba26a208186d06d321b01bafe9613b1849 +oid sha256:844d37e56d8020360b0ba0507c8c450508001232980e7d0792367356ec4b1f55 size 9 diff --git a/x64/Release/config.txt b/x64/Release/config.txt index aba56db..77c665a 100644 --- a/x64/Release/config.txt +++ b/x64/Release/config.txt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7051b358fa10ce0cd9c08bfd24944aba26a208186d06d321b01bafe9613b1849 +oid sha256:844d37e56d8020360b0ba0507c8c450508001232980e7d0792367356ec4b1f55 size 9