*GUI

3 files changed, 138 insertions, 70 deletions

diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj
index c682fe5..6418165 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj
@@ -87,11 +87,12 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;GAMELAB_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(SolutionDir)..\..\ThirdParty\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <SubSystem>Windows</SubSystem>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -142,10 +143,17 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Editor\EditorMain.cpp" />
+    <ClCompile Include="..\..\..\Editor\EditorManager.cpp" />
+    <ClCompile Include="..\..\..\Editor\GUI\ContainnerWindow.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp" />
-    <ClCompile Include="..\..\..\Editor\GUI\EditorWindows.cpp" />
-    <ClCompile Include="..\..\..\Editor\GUI\MenuController.cpp" />
+    <ClCompile Include="..\..\..\Editor\GUI\WindowManager.cpp" />
+    <ClCompile Include="..\..\..\Editor\GUI\GUIWindow.cpp" />
+    <ClCompile Include="..\..\..\Editor\GUI\MenuManager.cpp" />
+    <ClCompile Include="..\..\..\Editor\GUI\SplitWindow.cpp" />
+    <ClCompile Include="..\..\..\Editor\GUI\WindowUtil.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\WinUtils.cpp" />
+    <ClCompile Include="..\..\..\Editor\Utils\HelperFuncs.cpp" />
+    <ClCompile Include="..\..\..\Editor\Utils\Log.cpp" />
     <ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp" />
     <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp" />
     <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.cpp" />
@@ -161,10 +169,14 @@
     <ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\Editor\EditorManager.h" />
     <ClInclude Include="..\..\..\Editor\GUI\Dock.h" />
     <ClInclude Include="..\..\..\Editor\GUI\EditorWindows.h" />
-    <ClInclude Include="..\..\..\Editor\GUI\MenuController.h" />
+    <ClInclude Include="..\..\..\Editor\GUI\MenuManager.h" />
+    <ClInclude Include="..\..\..\Editor\GUI\Rect.h" />
     <ClInclude Include="..\..\..\Editor\GUI\WinUtils.h" />
+    <ClInclude Include="..\..\..\Editor\Utils\HelperFuncs.h" />
+    <ClInclude Include="..\..\..\Editor\Utils\Log.h" />
     <ClInclude Include="..\..\..\Runtime\Math\AABB.h" />
     <ClInclude Include="..\..\..\Runtime\Math\FloatConversion.h" />
     <ClInclude Include="..\..\..\Runtime\Math\Rect.h" />
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
index 982bd5b..de41fde 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
@@ -1,177 +1,230 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="GUI">
-      <UniqueIdentifier>{87a57ef1-78d8-42b8-b179-ce1bbb5c4f8b}</UniqueIdentifier>
+    <Filter Include="Editor">
+      <UniqueIdentifier>{37e66f64-a2fe-4adf-b435-e2e42ea17414}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Runtime">
+      <UniqueIdentifier>{376fd2a5-5333-4bcb-9122-a112c40d5287}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Math">
+    <Filter Include="Runtime\Math">
       <UniqueIdentifier>{ed31f129-996f-4a1c-b8d5-5c3d74139940}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Utilities">
+    <Filter Include="Runtime\Utilities">
       <UniqueIdentifier>{61174975-2b52-426f-b871-d33e1bf956d4}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Scripting">
+    <Filter Include="Editor\Utils">
+      <UniqueIdentifier>{e7e5a875-cafb-48df-9659-8f88d0377208}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Editor\GUI">
+      <UniqueIdentifier>{87a57ef1-78d8-42b8-b179-ce1bbb5c4f8b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Runtime\Scripting">
       <UniqueIdentifier>{f9573ff2-4a53-4953-806e-f0ce0c586910}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Runtime\Graphics">
+      <UniqueIdentifier>{6c7e1979-1cd3-40c7-98e1-f063c325d642}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Editor\IMGUI">
+      <UniqueIdentifier>{47032dd6-dca2-478f-b594-d08c0b22e119}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Editor\Scripting">
+      <UniqueIdentifier>{bfc8b148-db9d-403d-96b9-32c946e15402}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\Editor\GUI\MenuController.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Editor\GUI\EditorWindows.cpp">
-      <Filter>GUI</Filter>
+      <Filter>Editor\GUI</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp">
-      <Filter>Math</Filter>
+      <Filter>Runtime\Math</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp">
-      <Filter>Math</Filter>
+      <Filter>Runtime\Math</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp">
-      <Filter>Utilities</Filter>
+      <Filter>Runtime\Utilities</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp">
-      <Filter>Utilities</Filter>
+      <Filter>Runtime\Utilities</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Editor\GUI\WinUtils.cpp">
-      <Filter>GUI</Filter>
+      <Filter>Editor\GUI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Editor\EditorMain.cpp" />
     <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.cpp">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindClass.cpp">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindEnum.cpp">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.cpp">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRef.cpp">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRefTable.cpp">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindState.cpp">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindVM.cpp">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.cpp">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\GUI\ContainnerWindow.cpp">
+      <Filter>Editor\GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\GUI\GUIWindow.cpp">
+      <Filter>Editor\GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\GUI\SplitWindow.cpp">
+      <Filter>Editor\GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\Utils\Log.cpp">
+      <Filter>Editor\Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\GUI\WindowUtil.cpp">
+      <Filter>Editor\GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\GUI\WindowManager.cpp">
+      <Filter>Editor\GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\EditorMain.cpp">
+      <Filter>Editor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\EditorManager.cpp">
+      <Filter>Editor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\GUI\MenuManager.cpp">
+      <Filter>Editor\GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\Utils\HelperFuncs.cpp">
+      <Filter>Editor\Utils</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\Editor\GUI\MenuController.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Editor\GUI\Dock.h">
-      <Filter>GUI</Filter>
+      <Filter>Editor\GUI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Editor\GUI\EditorWindows.h">
-      <Filter>GUI</Filter>
+      <Filter>Editor\GUI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Math\AABB.h">
-      <Filter>Math</Filter>
+      <Filter>Runtime\Math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Math\FloatConversion.h">
-      <Filter>Math</Filter>
+      <Filter>Runtime\Math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Math\Rect.h">
-      <Filter>Math</Filter>
+      <Filter>Runtime\Math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Math\Vector2.h">
-      <Filter>Math</Filter>
+      <Filter>Runtime\Math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Math\Vector3.h">
-      <Filter>Math</Filter>
+      <Filter>Runtime\Math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Utilities\Assert.h">
-      <Filter>Utilities</Filter>
+      <Filter>Runtime\Utilities</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Utilities\Base64.h">
-      <Filter>Utilities</Filter>
+      <Filter>Runtime\Utilities</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Utilities\Exception.h">
-      <Filter>Utilities</Filter>
+      <Filter>Runtime\Utilities</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Utilities\NonCopyable.h">
-      <Filter>Utilities</Filter>
+      <Filter>Runtime\Utilities</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Utilities\Singleton.h">
-      <Filter>Utilities</Filter>
+      <Filter>Runtime\Utilities</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Utilities\Type.h">
-      <Filter>Utilities</Filter>
+      <Filter>Runtime\Utilities</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Utilities\UIDGenerator.h">
-      <Filter>Utilities</Filter>
+      <Filter>Runtime\Utilities</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Utilities\Utf8.h">
-      <Filter>Utilities</Filter>
+      <Filter>Runtime\Utilities</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Utilities\UtilMacros.h">
-      <Filter>Utilities</Filter>
+      <Filter>Runtime\Utilities</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Editor\GUI\WinUtils.h">
-      <Filter>GUI</Filter>
+      <Filter>Editor\GUI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Scripting\LuaBind.h">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.h">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindClass.hpp">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindConfig.h">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindEnum.h">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindGlobalState.h">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindInternal.h">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.h">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRef.h">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRefTable.h">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindState.h">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindUtility.h">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindVM.h">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.h">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Editor\Utils\Log.h">
+      <Filter>Editor\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Editor\GUI\Rect.h">
+      <Filter>Editor\GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Editor\EditorManager.h">
+      <Filter>Editor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Editor\Utils\HelperFuncs.h">
+      <Filter>Editor\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Editor\GUI\MenuManager.h">
+      <Filter>Editor\GUI</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\Runtime\Scripting\LuaBindClass.inc">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </None>
     <None Include="..\..\..\Runtime\Scripting\LuaBindState.inc">
-      <Filter>Scripting</Filter>
+      <Filter>Runtime\Scripting</Filter>
     </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.user b/Projects/VisualStudio/Editor/Editor.vcxproj.user
index be25078..db52b6c 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj.user
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj.user
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\Resources</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
 </Project>
\ No newline at end of file