From fb7ae1149a80a22c77014d0ece33f6f4b965b631 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sun, 31 Mar 2019 14:34:40 +0800
Subject: *misc

---
 build/modules/asura-core/asura-core.vcxproj        |  29 ++--
 .../modules/asura-core/asura-core.vcxproj.filters  | 173 ++++++++++++---------
 2 files changed, 114 insertions(+), 88 deletions(-)

(limited to 'build/modules/asura-core')

diff --git a/build/modules/asura-core/asura-core.vcxproj b/build/modules/asura-core/asura-core.vcxproj
index 1ad07c2..e539e72 100644
--- a/build/modules/asura-core/asura-core.vcxproj
+++ b/build/modules/asura-core/asura-core.vcxproj
@@ -131,7 +131,7 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_mesh2d.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_shader.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_sprite_batch.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_window.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_texture.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\canvas.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\color.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\color32.cpp" />
@@ -153,16 +153,18 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\input\clipboard.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\equeue.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\input\keyboard.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\input\mouse.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\profiler\stats.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\threading\channel.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\threading\thread_ex.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\time\timer.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\window\window.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_glew.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_glut.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_sdl.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\wnd\binding\_window.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window_impl_glew.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window_impl_glut.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window_impl_sdl.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\modules\asura-core\application.h" />
@@ -190,6 +192,7 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\render_state.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\render_target.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shader.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shader_source.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shape.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\sprite_batch.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\stb_decoder.h" />
@@ -197,27 +200,29 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\input\clipboard.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\equeue.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\equeue_impl_sdl.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\equeue_impl_win32.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\input\event.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\input\input_device.hpp" />
     <ClInclude Include="..\..\..\source\modules\asura-core\input\joypad.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\input\keyboard.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\input\mouse.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\event_manager.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\profiler\stats.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\threading\channel.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\threading\thread_ex.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\time\timer.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\type.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\window\window.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_glew.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_glut.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_sdl.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window_impl_glew.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window_impl_glut.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window_impl_sdl.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\source\modules\asura-core\font\string.inl" />
     <None Include="..\..\..\source\modules\asura-core\font\utf.inl" />
-    <None Include="..\..\..\source\modules\asura-core\input\cursor.defs" />
-    <None Include="..\..\..\source\modules\asura-core\input\keyboard.defs" />
-    <None Include="..\..\..\source\modules\asura-core\input\mouse.defs" />
+    <None Include="..\..\..\source\modules\asura-core\input\keys.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/modules/asura-core/asura-core.vcxproj.filters b/build/modules/asura-core/asura-core.vcxproj.filters
index 84a379f..eb4b20c 100644
--- a/build/modules/asura-core/asura-core.vcxproj.filters
+++ b/build/modules/asura-core/asura-core.vcxproj.filters
@@ -19,12 +19,18 @@
     <Filter Include="graphics\binding">
       <UniqueIdentifier>{4f6b2c19-1a06-48c9-b89d-52fa27bec5c1}</UniqueIdentifier>
     </Filter>
-    <Filter Include="window">
-      <UniqueIdentifier>{7a73607c-8da6-4865-a992-5c7c8764bd5a}</UniqueIdentifier>
-    </Filter>
     <Filter Include="threading">
       <UniqueIdentifier>{05477a0e-f70b-4606-ae96-82ef7a7b8a1d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="wnd">
+      <UniqueIdentifier>{7a73607c-8da6-4865-a992-5c7c8764bd5a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="wnd\binding">
+      <UniqueIdentifier>{139aa01b-d038-4361-9edd-f81d8ba37730}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="input\binding">
+      <UniqueIdentifier>{66e43743-1be3-414a-9f3c-473d40613892}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\source\modules\asura-core\application.cpp" />
@@ -70,18 +76,6 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\texture.cpp">
       <Filter>graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\clipboard.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\keyboard.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\mouse.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\font\glyph.cpp">
       <Filter>font</Filter>
     </ClCompile>
@@ -101,9 +95,6 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\color32.cpp">
       <Filter>graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_canvas.cpp">
       <Filter>graphics\binding</Filter>
     </ClCompile>
@@ -131,21 +122,6 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_sprite_batch.cpp">
       <Filter>graphics\binding</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_window.cpp">
-      <Filter>graphics\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\window\window.cpp">
-      <Filter>window</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_glew.cpp">
-      <Filter>window</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_glut.cpp">
-      <Filter>window</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_sdl.cpp">
-      <Filter>window</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\threading\thread_ex.cpp">
       <Filter>threading</Filter>
     </ClCompile>
@@ -161,6 +137,42 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image_decode_task.cpp">
       <Filter>graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window.cpp">
+      <Filter>wnd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window_impl_glew.cpp">
+      <Filter>wnd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window_impl_glut.cpp">
+      <Filter>wnd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\wnd\window_impl_sdl.cpp">
+      <Filter>wnd</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_texture.cpp">
+      <Filter>graphics\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\wnd\binding\_window.cpp">
+      <Filter>wnd\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\clipboard.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\keyboard.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\mouse.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\equeue.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\modules\asura-core\application.h" />
@@ -215,21 +227,6 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\texture.h">
       <Filter>graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\clipboard.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\input_device.hpp">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\keyboard.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\mouse.h">
-      <Filter>input</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\font\glyph.h">
       <Filter>font</Filter>
     </ClInclude>
@@ -251,30 +248,9 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\core_module.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\type.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\core_config.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\event.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\joypad.h">
-      <Filter>input</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color32.h">
       <Filter>graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_sdl.h">
-      <Filter>window</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\window\window.h">
-      <Filter>window</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_glew.h">
-      <Filter>window</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_glut.h">
-      <Filter>window</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\threading\thread_ex.h">
       <Filter>threading</Filter>
     </ClInclude>
@@ -293,6 +269,57 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image_decoder.h">
       <Filter>graphics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window.h">
+      <Filter>wnd</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window_impl_glew.h">
+      <Filter>wnd</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window_impl_glut.h">
+      <Filter>wnd</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\wnd\window_impl_sdl.h">
+      <Filter>wnd</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\clipboard.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\equeue.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\equeue_impl_sdl.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\equeue_impl_win32.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\event.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\input_device.hpp">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\joypad.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\keyboard.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\mouse.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\event_manager.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shader_source.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\source\modules\asura-core\font\string.inl">
@@ -301,13 +328,7 @@
     <None Include="..\..\..\source\modules\asura-core\font\utf.inl">
       <Filter>font</Filter>
     </None>
-    <None Include="..\..\..\source\modules\asura-core\input\cursor.defs">
-      <Filter>input</Filter>
-    </None>
-    <None Include="..\..\..\source\modules\asura-core\input\keyboard.defs">
-      <Filter>input</Filter>
-    </None>
-    <None Include="..\..\..\source\modules\asura-core\input\mouse.defs">
+    <None Include="..\..\..\source\modules\asura-core\input\keys.h">
       <Filter>input</Filter>
     </None>
   </ItemGroup>
-- 
cgit v1.1-26-g67d0