*miscHEADmaster

2 files changed, 51 insertions, 39 deletions

diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj
index d214c2e..542fcf2 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj
@@ -129,7 +129,7 @@
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIClip.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIContent.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUILabel.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIPanel.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Controls\GUIPanel.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUISlider.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIToggle.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Controls\TextUtil.cpp" />
@@ -137,13 +137,14 @@
     <ClCompile Include="..\..\source\Asura.Editor\Graphics\Brush.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Graphics\Drawer.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Graphics\DrawInfo.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\Graphics\Pen.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\Graphics\Style.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Graphics\GUIMaterial.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Graphics\GUIStyle.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Layout\HorizontalLayout.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Layout\VerticalLayout.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\Main.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\System\ContainerWindow.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\System\FileWatcher.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\System\GUIWindow.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\System\Input.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\System\MenuController.cpp" />
   </ItemGroup>
@@ -153,7 +154,7 @@
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUIClip.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUIContent.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUILabel.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\Controls\GUIPanel.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Controls\GUIPanel.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUISlider.h" />
     <ClInclude Include="..\..\Source\Asura.Editor\Controls\GUIState.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUIToggle.h" />
@@ -162,15 +163,17 @@
     <ClInclude Include="..\..\source\Asura.Editor\Graphics\Brush.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Graphics\Drawer.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Graphics\DrawInfo.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\Graphics\Pen.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\Graphics\Shader.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\graphics\shaders\image.shader.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\graphics\shaders\polygon.shader.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\Graphics\Style.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\GUIMaterial.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\GUIStyle.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shader.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shaders\GUIClip.shader.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shaders\GUIText.shader.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shaders\GUITexture.shader.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Layout\HorizontalLayout.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Layout\VerticalLayout.h" />
     <ClInclude Include="..\..\source\Asura.Editor\System\ContainerWindow.h" />
     <ClInclude Include="..\..\source\Asura.Editor\System\FileWatcher.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\System\GUIWindow.h" />
     <ClInclude Include="..\..\source\Asura.Editor\System\Input.h" />
     <ClInclude Include="..\..\source\Asura.Editor\System\MenuController.h" />
     <ClInclude Include="..\..\source\Asura.Editor\Type.h" />
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
index bc89328..27c5a7e 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
@@ -10,9 +10,6 @@
     <Filter Include="Graphics">
       <UniqueIdentifier>{4be8ce5c-0921-4341-a976-92d31aa84c8c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Graphics\shaders">
-      <UniqueIdentifier>{b4c26f9c-9f4e-4332-a6e2-33456b4abecb}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Layout">
       <UniqueIdentifier>{7654ef3d-54c4-490f-bb24-e6a67bd63e1e}</UniqueIdentifier>
     </Filter>
@@ -25,6 +22,9 @@
     <Filter Include="Configure">
       <UniqueIdentifier>{799e7ea2-8870-4d1e-b278-b3a0dd912632}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Graphics\Shaders">
+      <UniqueIdentifier>{b4c26f9c-9f4e-4332-a6e2-33456b4abecb}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIButton.cpp">
@@ -36,9 +36,6 @@
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUILabel.cpp">
       <Filter>Controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIPanel.cpp">
-      <Filter>Controls</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIToggle.cpp">
       <Filter>Controls</Filter>
     </ClCompile>
@@ -51,12 +48,6 @@
     <ClCompile Include="..\..\source\Asura.Editor\Graphics\DrawInfo.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\Graphics\Pen.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\Graphics\Style.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\source\Asura.Editor\Layout\HorizontalLayout.cpp">
       <Filter>Layout</Filter>
     </ClCompile>
@@ -86,14 +77,20 @@
     <ClCompile Include="..\..\source\Asura.Editor\Controls\GUIClip.cpp">
       <Filter>Controls</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\System\GUIWindow.cpp">
+      <Filter>System</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Controls\GUIPanel.cpp">
+      <Filter>Controls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Graphics\GUIMaterial.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Graphics\GUIStyle.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\source\Asura.Editor\graphics\shaders\image.shader.h">
-      <Filter>Graphics\shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\graphics\shaders\polygon.shader.h">
-      <Filter>Graphics\shaders</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUIButton.h">
       <Filter>Controls</Filter>
     </ClInclude>
@@ -103,9 +100,6 @@
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUILabel.h">
       <Filter>Controls</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\Controls\GUIPanel.h">
-      <Filter>Controls</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\source\Asura.Editor\Controls\GUIToggle.h">
       <Filter>Controls</Filter>
     </ClInclude>
@@ -118,15 +112,6 @@
     <ClInclude Include="..\..\source\Asura.Editor\Graphics\DrawInfo.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\Graphics\Pen.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\Graphics\Shader.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\Graphics\Style.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\source\Asura.Editor\Layout\HorizontalLayout.h">
       <Filter>Layout</Filter>
     </ClInclude>
@@ -162,5 +147,29 @@
     <ClInclude Include="..\..\Source\Asura.Editor\Controls\GUIState.h">
       <Filter>Controls</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\System\GUIWindow.h">
+      <Filter>System</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Controls\GUIPanel.h">
+      <Filter>Controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\GUIMaterial.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\GUIStyle.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shaders\GUIClip.shader.h">
+      <Filter>Graphics\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shaders\GUIText.shader.h">
+      <Filter>Graphics\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shaders\GUITexture.shader.h">
+      <Filter>Graphics\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Graphics\Shader.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file