+widgets

6 files changed, 114 insertions, 16 deletions

diff --git a/Build/3rdParty/glad/glad.vcxproj b/Build/3rdParty/glad/glad.vcxproj
index 70e2869..4d964a6 100644
--- a/Build/3rdParty/glad/glad.vcxproj
+++ b/Build/3rdParty/glad/glad.vcxproj
@@ -115,6 +115,11 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\Source\3rdParty\glad\glad.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Source\3rdParty\glad\glad.h" />
+    <ClInclude Include="..\..\..\Source\3rdParty\glad\khrplatform.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Build/3rdParty/glad/glad.vcxproj.filters b/Build/3rdParty/glad/glad.vcxproj.filters
index 9cd8510..83e98ec 100644
--- a/Build/3rdParty/glad/glad.vcxproj.filters
+++ b/Build/3rdParty/glad/glad.vcxproj.filters
@@ -1,2 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\Source\3rdParty\glad\glad.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Source\3rdParty\glad\glad.h" />
+    <ClInclude Include="..\..\..\Source\3rdParty\glad\khrplatform.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj
index 9acb1c5..1f4991e 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj
@@ -89,6 +89,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Source\Asura.Engine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -113,6 +114,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Source\Asura.Engine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -129,8 +131,26 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\Asura.Editor\Source\Editor.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\Button.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\CheckBox.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\HSlider.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\HVSlider.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\Label.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\Panel.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\RButton.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\TextBox.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\VSlider.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\Button.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\CheckBox.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\HSlider.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\HVSlider.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\Label.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\Panel.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\RButton.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\TextBox.h" />
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\VSlider.h" />
     <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\Widget.h" />
     <ClInclude Include="..\..\Source\Asura.Editor\Source\Window\Window.h" />
   </ItemGroup>
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
index da347f2..8f54d96 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
@@ -27,10 +27,64 @@
     <ClInclude Include="..\..\Source\Asura.Editor\Source\Window\Window.h">
       <Filter>Source\Window</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\Button.h">
+      <Filter>Source\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\CheckBox.h">
+      <Filter>Source\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\HSlider.h">
+      <Filter>Source\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\HVSlider.h">
+      <Filter>Source\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\Label.h">
+      <Filter>Source\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\RButton.h">
+      <Filter>Source\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\VSlider.h">
+      <Filter>Source\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\Panel.h">
+      <Filter>Source\Widgets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Editor\Source\Widgets\TextBox.h">
+      <Filter>Source\Widgets</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\Asura.Editor\Source\Editor.cpp">
       <Filter>Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\Button.cpp">
+      <Filter>Source\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\CheckBox.cpp">
+      <Filter>Source\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\HSlider.cpp">
+      <Filter>Source\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\HVSlider.cpp">
+      <Filter>Source\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\Label.cpp">
+      <Filter>Source\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\RButton.cpp">
+      <Filter>Source\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\VSlider.cpp">
+      <Filter>Source\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\Panel.cpp">
+      <Filter>Source\Widgets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Editor\Source\Widgets\TextBox.cpp">
+      <Filter>Source\Widgets</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj b/Build/Asura.Engine/Asura.Engine.vcxproj
index 97866be..2d82f9d 100644
--- a/Build/Asura.Engine/Asura.Engine.vcxproj
+++ b/Build/Asura.Engine/Asura.Engine.vcxproj
@@ -134,12 +134,12 @@
   <ItemGroup>
     <ClInclude Include="..\..\Source\Asura.Engine\Asura.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Factory.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Font\Glyph.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Canvas.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Color.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Image.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Mesh2D.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\OpenGL.h" />
-    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Window.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\GL.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shape.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Texture.h" />
@@ -163,15 +163,16 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Math\Vector4.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Profiler\Stats.h" />
     <ClInclude Include="..\..\Source\Asura.Engine\Time\Timer.h" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Window\Window.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\File.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Font\Glyph.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Canvas.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Color.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Image.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Mesh2D.cpp" />
-    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\OpenGL.cpp" />
-    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Window.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\GL.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shape.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Texture.cpp" />
@@ -191,6 +192,7 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Profiler\Stats.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\StringMap.cpp" />
     <ClCompile Include="..\..\Source\Asura.Engine\Time\Timer.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Window\Window.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\3rdParty\SDL2main\SDL2main.vcxproj">
diff --git a/Build/Asura.Engine/Asura.Engine.vcxproj.filters b/Build/Asura.Engine/Asura.Engine.vcxproj.filters
index 70c617e..c5babae 100644
--- a/Build/Asura.Engine/Asura.Engine.vcxproj.filters
+++ b/Build/Asura.Engine/Asura.Engine.vcxproj.filters
@@ -34,6 +34,9 @@
     <Filter Include="Physics">
       <UniqueIdentifier>{f94a816c-f744-4d8b-aa3b-0d1c32e388ba}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Window">
+      <UniqueIdentifier>{e1003406-ebaa-4987-9a0f-18f9e14a96b3}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Source\Asura.Engine\Audio\Sound.h">
@@ -81,9 +84,6 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Texture.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\OpenGL.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\Asura.Engine\Scripting\Luax.hpp">
       <Filter>Scripting</Filter>
     </ClInclude>
@@ -113,10 +113,16 @@
     <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Shape.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\Window.h">
+    <ClInclude Include="..\..\Source\Asura.Engine\StringMap.hpp" />
+    <ClInclude Include="..\..\Source\Asura.Engine\Window\Window.h">
+      <Filter>Window</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Font\Glyph.h">
+      <Filter>Font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura.Engine\Graphics\GL.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura.Engine\StringMap.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Source\Asura.Engine\Audio\Sound.cpp">
@@ -162,9 +168,6 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Texture.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\OpenGL.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\SpriteBatch.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
@@ -186,12 +189,18 @@
     <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Shape.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\Window.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\Asura.Engine\FileSystem\File.cpp">
       <Filter>FileSystem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\Asura.Engine\StringMap.cpp" />
+    <ClCompile Include="..\..\Source\Asura.Engine\Window\Window.cpp">
+      <Filter>Window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Font\Glyph.cpp">
+      <Filter>Font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura.Engine\Graphics\GL.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file