*misc

2 files changed, 32 insertions, 72 deletions

diff --git a/build/modules/asura-core/asura-core.vcxproj b/build/modules/asura-core/asura-core.vcxproj
index ed820fa..fcb37c4 100644
--- a/build/modules/asura-core/asura-core.vcxproj
+++ b/build/modules/asura-core/asura-core.vcxproj
@@ -142,7 +142,6 @@
     <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" />
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gif.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gfx_device.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\index_buffer.cpp" />
@@ -163,11 +162,8 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\image\png_decoder.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\image\stb_decoder.cpp" />
     <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\input\input_device.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\input_manager.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\mesh\am2_handler.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\mesh\mesh2d_data.cpp" />
     <ClCompile Include="..\..\..\source\modules\asura-core\mesh\mesh2d_handler.cpp" />
@@ -196,7 +192,6 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color32.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color_palette.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gif.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gfx_device.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\index_buffer.h" />
@@ -216,18 +211,13 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\image\image_decode_task.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\image\png_decoder.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\image\stb_decoder.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\button.h" />
     <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\input\input_device.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\input_manager.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\joystick_state.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\keyboard_state.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\mouse_state.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\mesh\am2_handler.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\mesh\mesh2d_data.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\mesh\mesh2d_handler.h" />
diff --git a/build/modules/asura-core/asura-core.vcxproj.filters b/build/modules/asura-core/asura-core.vcxproj.filters
index b5cda13..c7b664b 100644
--- a/build/modules/asura-core/asura-core.vcxproj.filters
+++ b/build/modules/asura-core/asura-core.vcxproj.filters
@@ -49,9 +49,6 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\color.cpp">
       <Filter>graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gif.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\modules\asura-core\graphics\mesh2d.cpp">
       <Filter>graphics</Filter>
     </ClCompile>
@@ -128,21 +125,6 @@
     <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>
     <ClCompile Include="..\..\..\source\modules\asura-core\image\image_data.cpp">
       <Filter>image</Filter>
     </ClCompile>
@@ -218,6 +200,12 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\profiler\gpu_profiler.cpp">
       <Filter>profiler</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\input_device.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\input_manager.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\modules\asura-core\application.h" />
@@ -233,9 +221,6 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color_palette.h">
       <Filter>graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gif.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-core\graphics\mesh2d.h">
       <Filter>graphics</Filter>
     </ClInclude>
@@ -296,39 +281,6 @@
     <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\image\image_decoder.h">
       <Filter>image</Filter>
     </ClInclude>
@@ -386,6 +338,24 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\profiler\gpu_profiler.h">
       <Filter>profiler</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\input_manager.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\input_device.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\joystick_state.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\keyboard_state.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\mouse_state.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\button.h">
+      <Filter>input</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\source\modules\asura-core\font\string.inl">