diff --git a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml index d1c6e5a..f7995e8 100644 --- a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml +++ b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml @@ -5,10 +5,10 @@ </component> <component name="ChangeListManager"> <list default="true" id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment=""> - <change beforePath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/projectSettingsUpdater.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/projectSettingsUpdater.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/enginecustom/imgui.ini" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/imgui.ini" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/Systemclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/Systemclass.cpp" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -24,6 +24,7 @@ <component name="HighlightingSettingsPerFile"> <setting file="file://$PROJECT_DIR$/enginecustom/src/src/shader/CelShadingShader.cpp" root0="FORCE_HIGHLIGHTING" /> </component> + <component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="true" /> <component name="ProblemsViewState"> <option name="selectedTabId" value="CurrentFile" /> </component> @@ -50,7 +51,7 @@ "node.js.selected.package.eslint": "(autodetect)", "node.js.selected.package.tslint": "(autodetect)", "nodejs_package_manager_path": "npm", - "settings.editor.selected.configurable": "preferences.fileTypes", + "settings.editor.selected.configurable": "preferences.pluginManager", "vue.rearranger.settings.migration": "true" } }</component> @@ -110,14 +111,29 @@ <workItem from="1738076222547" duration="6131000" /> <workItem from="1738171504772" duration="876000" /> <workItem from="1738172392786" duration="67000" /> + <workItem from="1738173151768" duration="2361000" /> + <workItem from="1738175535254" duration="279000" /> + <workItem from="1738178991872" duration="2427000" /> </task> + <task id="LOCAL-00001" summary="Minor update - viewport window tweak"> + <option name="closed" value="true" /> + <created>1738175474520</created> + <option name="number" value="00001" /> + <option name="presentableId" value="LOCAL-00001" /> + <option name="project" value="LOCAL" /> + <updated>1738175474520</updated> + </task> + <option name="localTasksCounter" value="2" /> <servers /> </component> <component name="TypeScriptGeneratedFilesManager"> <option name="version" value="3" /> </component> + <component name="UnityCheckinConfiguration" checkUnsavedScenes="true" /> <component name="UnityProjectConfiguration" hasMinimizedUI="false" /> <component name="VcsManagerConfiguration"> <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" /> + <MESSAGE value="Minor update - viewport window tweak" /> + <option name="LAST_COMMIT_MESSAGE" value="Minor update - viewport window tweak" /> </component> </project> \ No newline at end of file diff --git a/enginecustom/imgui.ini b/enginecustom/imgui.ini index bdbaca0..86c6a64 100644 --- a/enginecustom/imgui.ini +++ b/enginecustom/imgui.ini @@ -17,13 +17,13 @@ DockId=0x0000000A,0 [Window][Terrain] Pos=8,27 -Size=290,487 +Size=290,866 Collapsed=0 DockId=0x00000009,0 [Window][Light] Pos=8,27 -Size=290,487 +Size=290,866 Collapsed=0 DockId=0x00000009,1 @@ -34,8 +34,8 @@ Collapsed=0 DockId=0x00000001,2 [Window][Engine Settings] -Pos=1516,27 -Size=396,974 +Pos=1644,27 +Size=396,866 Collapsed=0 DockId=0x00000005,1 @@ -66,24 +66,24 @@ Collapsed=0 DockId=0x0000000C,0 [Window][Log Window] -Pos=8,627 -Size=1568,226 +Pos=8,895 +Size=2032,226 Collapsed=0 -DockId=0x0000000E,0 +DockId=0x00000006,0 [Docking][Data] DockSpace ID=0xC0DFADC4 Pos=8,27 Size=1568,826 Split=X DockNode ID=0x00000001 Parent=0xC0DFADC4 SizeRef=330,1094 Selected=0x393905AB DockNode ID=0x00000003 Parent=0xC0DFADC4 SizeRef=1700,1094 CentralNode=1 DockSpace ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=8,27 Size=1568,826 Split=Y - DockNode ID=0x0000000D Parent=0xCCBD8CF7 SizeRef=1568,598 Split=Y - DockNode ID=0x0000000B Parent=0x0000000D SizeRef=1568,637 Split=X + DockNode ID=0x00000004 Parent=0xCCBD8CF7 SizeRef=2032,866 Split=Y + DockNode ID=0x0000000B Parent=0x00000004 SizeRef=1568,637 Split=X DockNode ID=0x00000007 Parent=0x0000000B SizeRef=290,826 Split=Y Selected=0x393905AB - DockNode ID=0x00000009 Parent=0x00000007 SizeRef=395,413 Selected=0x393905AB + DockNode ID=0x00000009 Parent=0x00000007 SizeRef=395,413 Selected=0x321620B2 DockNode ID=0x0000000A Parent=0x00000007 SizeRef=395,411 Selected=0x031DC75C DockNode ID=0x00000008 Parent=0x0000000B SizeRef=1276,826 Split=X DockNode ID=0x00000002 Parent=0x00000008 SizeRef=878,826 CentralNode=1 Selected=0x9204953B DockNode ID=0x00000005 Parent=0x00000008 SizeRef=396,826 Selected=0x9F035453 - DockNode ID=0x0000000C Parent=0x0000000D SizeRef=1568,335 Selected=0x139FDA3F - DockNode ID=0x0000000E Parent=0xCCBD8CF7 SizeRef=1568,226 Selected=0xAB74BEE9 + DockNode ID=0x0000000C Parent=0x00000004 SizeRef=1568,335 Selected=0x139FDA3F + DockNode ID=0x00000006 Parent=0xCCBD8CF7 SizeRef=2032,226 Selected=0xAB74BEE9 diff --git a/enginecustom/src/src/system/Systemclass.cpp b/enginecustom/src/src/system/Systemclass.cpp index 83eec1b..506768d 100644 --- a/enginecustom/src/src/system/Systemclass.cpp +++ b/enginecustom/src/src/system/Systemclass.cpp @@ -466,4 +466,5 @@ void SystemClass::SendPath(wchar_t* path, std::filesystem::path WFolder) { m_Application->SetPath(path); m_Application->SetWFolder(WFolder); -} \ No newline at end of file +} + diff --git a/enginecustom/src/src/system/imguiManager.cpp b/enginecustom/src/src/system/imguiManager.cpp index 21532cd..b873dfc 100644 --- a/enginecustom/src/src/system/imguiManager.cpp +++ b/enginecustom/src/src/system/imguiManager.cpp @@ -70,6 +70,19 @@ void imguiManager::SetupDockspace() { ImGui::Begin("DockSpace", nullptr, window_flags); ImGui::PopStyleVar(2); + if (ImGui::BeginMenuBar()) { + if (ImGui::BeginMenu("Windows")) { + ImGui::MenuItem("Object Window", NULL, &showObjectWindow); + ImGui::MenuItem("Terrain Window", NULL, &showTerrainWindow); + ImGui::MenuItem("Light Window", NULL, &showLightWindow); + ImGui::MenuItem("Shader Window", NULL, &showShaderWindow); + ImGui::MenuItem("Engine Settings Window", NULL, &showEngineSettingsWindow); + ImGui::MenuItem("Log Window", NULL, &showLogWindow); + ImGui::EndMenu(); + } + ImGui::EndMenuBar(); + } + ImGuiID dockspace_id = ImGui::GetID("MainDockSpace"); ImGui::DockSpace(dockspace_id, ImVec2(0.0f, 0.0f), ImGuiDockNodeFlags_PassthruCentralNode); @@ -355,38 +368,6 @@ bool imguiManager::ImGuiWidgetRenderer(ApplicationClass* app) WidgetButton(); WidgetFPS(); WidgetAddObject(app); - ImGui::Separator(); - - // Add buttons for opening windows - if (ImGui::Button("Open Object Window")) - { - showObjectWindow = true; - } - - if (ImGui::Button("Open Terrain Window")) - { - showTerrainWindow = true; - } - - if (ImGui::Button("Open Light Window")) - { - showLightWindow = true; - } - - if (ImGui::Button("Open Shader Window")) - { - showShaderWindow = true; - } - - if (ImGui::Button("Open Engine Settings Window")) - { - showEngineSettingsWindow = true; - } - - if (ImGui::Button("Open Log Window")) - { - showLogWindow = true; - } ImGui::End();