Allow to get and set device's position.

Small refactor to the editor's ui.
Wolftein · Nov 25, 2024 · f5c73b7 · f5c73b7
1 parent bd21a59
commit f5c73b7
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 24 deletions.
diff --git a/Editor/Public/Core/Application.cpp b/Editor/Public/Core/Application.cpp
@@ -78,8 +78,7 @@ namespace Editor
 
         mImGuiBackend.Begin(Delta);
         {
-            //ImGui::ShowDemoWindow();
-            mEditorUI.ShowMainWindow();
+            mUIMain.ShowMainWindow();
         }
         mImGuiBackend.End(Encoder_1);
 

diff --git a/Editor/Public/Core/Application.hpp b/Editor/Public/Core/Application.hpp
@@ -14,7 +14,7 @@
 
 #include <Aurora.Engine/Kernel.hpp>
 #include "Frontend/ImGuiBackend.hpp"
-#include "Frontend/EditorUI.hpp"
+#include "Screen/Main.hpp"
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 // [   CODE   ]
@@ -49,7 +49,6 @@ namespace Editor
         // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
         ImGuiBackend mImGuiBackend;
-
-        EditorUI    mEditorUI;
+        UI::Main     mUIMain;
     };
 }
diff --git a/Editor/Public/Core/Frontend/ImGuiBackend.cpp b/Editor/Public/Core/Frontend/ImGuiBackend.cpp
@@ -1,9 +1,9 @@
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-// Copyright (C) 2024 Aeldur contributors (see AUTHORS.md)
+// Copyright (C) 2021-2024 by Agustin Alvarez. All rights reserved.
 //
-// This work is licensed under the terms of the AGPL-V3 license.
+// This work is licensed under the terms of the MIT license.
 //
-// For a copy, see <https://opensource.org/license/agpl-v3>
+// For a copy, see <https://opensource.org/licenses/MIT>.
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-

diff --git a/Editor/Public/Core/Frontend/ImGuiBackend.hpp b/Editor/Public/Core/Frontend/ImGuiBackend.hpp
@@ -1,9 +1,9 @@
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-// Copyright (C) 2024 Aeldur contributors (see AUTHORS.md)
+// Copyright (C) 2021-2024 by Agustin Alvarez. All rights reserved.
 //
-// This work is licensed under the terms of the AGPL-V3 license.
+// This work is licensed under the terms of the MIT license.
 //
-// For a copy, see <https://opensource.org/license/agpl-v3>
+// For a copy, see <https://opensource.org/licenses/MIT>.
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 #pragma once

diff --git a/Editor/Public/Core/Frontend/ImGuiRenderer.hpp b/Editor/Public/Core/Frontend/ImGuiRenderer.hpp
@@ -15,6 +15,7 @@
 #include <Aurora.Content/Service.hpp>
 #include <Aurora.Graphic/Service.hpp>
 #include <imgui.h>
+#include <imgui_internal.h>
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 // [   CODE   ]

diff --git a/Editor/Public/Core/Frontend/EditorUI.cpp → Editor/Public/Screen/Main.cpp b/Editor/Public/Core/Frontend/EditorUI.cpp → Editor/Public/Screen/Main.cpp
@@ -10,16 +10,15 @@
 // [  HEADER  ]
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-#include "EditorUI.hpp"
-#include <iostream>
+#include "Main.hpp"
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 // [   CODE   ]
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-namespace Editor
+namespace Editor::UI
 {
-	void EditorUI::ShowMainWindow()
+	void Main::ShowMainWindow()
 	{
 
 		ImGuiWindowFlags WindowFlags = ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoDecoration;
@@ -39,7 +38,7 @@ namespace Editor
 
 		ImGui::PopStyleVar(3);
 
-		if (ImGui::BeginMenuBar())
+		if (ImGui::BeginMainMenuBar())
 		{
 			if (ImGui::BeginMenu("File"))
 			{
@@ -98,7 +97,7 @@ namespace Editor
 				ImGui::EndMenu();
 			}
 
-			ImGui::EndMenuBar();
+			ImGui::EndMainMenuBar();
 		}
 
 		ImGuiID DockspaceID = ImGui::GetID("Dockspace");
@@ -166,7 +165,7 @@ namespace Editor
 		ImGui::End();
 	}
 
-	void EditorUI::ResetDocking()
+	void Main::ResetDocking()
 	{
 		mResetDock = true;
 	}

diff --git a/Editor/Public/Core/Frontend/EditorUI.hpp → Editor/Public/Screen/Main.hpp b/Editor/Public/Core/Frontend/EditorUI.hpp → Editor/Public/Screen/Main.hpp
@@ -12,23 +12,22 @@
 // [  HEADER  ]
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-#include <Aurora.Base/Type.hpp>
-
-#include <imgui.h>
-#include <imgui_internal.h>
+#include "Core/Frontend/ImGuiBackend.hpp"
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 // [   CODE   ]
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-namespace Editor
+namespace Editor::UI
 {
-	class EditorUI final
+	class Main final
 	{
 	public:
+
 		void ShowMainWindow();
 
 		void ResetDocking();
+
 	private:
 
 		Bool mResetDock = true;

diff --git a/Foundation/Public/Aurora.Engine/Device.hpp b/Foundation/Public/Aurora.Engine/Device.hpp
@@ -101,6 +101,21 @@ namespace Engine
             return (SDL_GetWindowFlags(mHandle) & SDL_WINDOW_FULLSCREEN) != 0;
         }
 
+        // -=(Undocumented)=-
+        void SetPosition(UInt16 X, UInt16 Y)
+        {
+            SDL_SetWindowPosition(mHandle, X, Y);
+        }
+
+        // -=(Undocumented)=-
+        Vector2i GetPosition() const
+        {
+            int X;
+            int Y;
+            SDL_GetWindowPosition(mHandle, AddressOf(X), AddressOf(Y));
+            return Vector2i(X, Y);
+        }
+
         // -=(Undocumented)=-
         void SetSize(UInt16 Width, UInt16 Height)
         {