diff options
Diffstat (limited to 'build')
19 files changed, 402 insertions, 237 deletions
diff --git a/build/modules/asura-box2d/asura-box2d.vcxproj b/build/modules/asura-box2d/asura-box2d.vcxproj index 9855a26..61c03c5 100644 --- a/build/modules/asura-box2d/asura-box2d.vcxproj +++ b/build/modules/asura-box2d/asura-box2d.vcxproj @@ -117,32 +117,34 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="..\..\..\source\modules\asura-box2d\body.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\chain_shape.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\circle_shape.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\contact.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\debug_draw.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\distance_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\edge_shape.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\fixture.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\friction_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\gear_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\motor_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\mouse_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\polygon_shape.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\prismatic_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\pulley_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\revolute_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\rope_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\shape.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\weld_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\wheel_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\world.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\box2d_module.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\body.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\chain_shape.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\circle_shape.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\contact.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\debug_draw.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\distance_joint.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\edge_shape.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\fixture.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\friction_joint.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\gear_joint.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\joint.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\motor_joint.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\mouse_joint.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\polygon_shape.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\prismatic_joint.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\pulley_joint.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\revolute_joint.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\rope_joint.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\shape.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\weld_joint.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\wheel_joint.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\world.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\source\modules\asura-box2d\binding\_body.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-box2d\binding\_world.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-box2d\box2d_module.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-box2d\physics\binding\_body.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-box2d\physics\binding\_world.cpp" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/build/modules/asura-box2d/asura-box2d.vcxproj.filters b/build/modules/asura-box2d/asura-box2d.vcxproj.filters index 4411d16..a7a33eb 100644 --- a/build/modules/asura-box2d/asura-box2d.vcxproj.filters +++ b/build/modules/asura-box2d/asura-box2d.vcxproj.filters @@ -1,40 +1,89 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClInclude Include="..\..\..\source\modules\asura-box2d\body.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\chain_shape.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\circle_shape.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\contact.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\edge_shape.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\fixture.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\friction_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\motor_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\mouse_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\polygon_shape.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\prismatic_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\pulley_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\revolute_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\rope_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\shape.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\weld_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\wheel_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\world.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\distance_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\gear_joint.h" /> - <ClInclude Include="..\..\..\source\modules\asura-box2d\debug_draw.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\box2d_module.h" /> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\body.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\chain_shape.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\circle_shape.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\contact.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\debug_draw.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\distance_joint.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\edge_shape.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\fixture.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\friction_joint.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\gear_joint.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\joint.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\motor_joint.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\mouse_joint.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\polygon_shape.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\prismatic_joint.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\pulley_joint.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\revolute_joint.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\rope_joint.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\shape.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\weld_joint.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\wheel_joint.h"> + <Filter>physics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-box2d\physics\world.h"> + <Filter>physics</Filter> + </ClInclude> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\source\modules\asura-box2d\binding\_body.cpp"> - <Filter>binding</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\modules\asura-box2d\binding\_world.cpp"> - <Filter>binding</Filter> - </ClCompile> + <Filter Include="physics"> + <UniqueIdentifier>{c01b5c57-f3a7-445f-aed3-e0a27dbe74c2}</UniqueIdentifier> + </Filter> + <Filter Include="physics\binding"> + <UniqueIdentifier>{3fb6587c-0c9d-4f6e-9e72-653032d9b238}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> - <Filter Include="binding"> - <UniqueIdentifier>{a446fe08-e138-456d-bbc0-4e8d4aa79989}</UniqueIdentifier> - </Filter> + <ClCompile Include="..\..\..\source\modules\asura-box2d\box2d_module.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-box2d\physics\binding\_body.cpp"> + <Filter>physics\binding</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-box2d\physics\binding\_world.cpp"> + <Filter>physics\binding</Filter> + </ClCompile> </ItemGroup> </Project>
\ No newline at end of file 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> diff --git a/build/modules/asura-json/asura-json.vcxproj b/build/modules/asura-json/asura-json.vcxproj index 755ca25..d4a2521 100644 --- a/build/modules/asura-json/asura-json.vcxproj +++ b/build/modules/asura-json/asura-json.vcxproj @@ -117,11 +117,11 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\source\modules\asura-json\json.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-json\json\json.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-json\json_module.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\source\modules\asura-json\json.h" /> + <ClInclude Include="..\..\..\source\modules\asura-json\json\json.h" /> <ClInclude Include="..\..\..\source\modules\asura-json\json_module.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/build/modules/asura-json/asura-json.vcxproj.filters b/build/modules/asura-json/asura-json.vcxproj.filters index 988e477..97944e6 100644 --- a/build/modules/asura-json/asura-json.vcxproj.filters +++ b/build/modules/asura-json/asura-json.vcxproj.filters @@ -1,11 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="..\..\..\source\modules\asura-json\json.cpp" /> <ClCompile Include="..\..\..\source\modules\asura-json\json_module.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-json\json\json.cpp"> + <Filter>json</Filter> + </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\source\modules\asura-json\json.h" /> <ClInclude Include="..\..\..\source\modules\asura-json\json_module.h" /> + <ClInclude Include="..\..\..\source\modules\asura-json\json\json.h"> + <Filter>json</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <Filter Include="json"> + <UniqueIdentifier>{2884af6d-6bc5-4714-8b32-32edd8099000}</UniqueIdentifier> + </Filter> </ItemGroup> </Project>
\ No newline at end of file diff --git a/build/modules/asura-network/asura-network.vcxproj b/build/modules/asura-network/asura-network.vcxproj index 957bce0..0ed3418 100644 --- a/build/modules/asura-network/asura-network.vcxproj +++ b/build/modules/asura-network/asura-network.vcxproj @@ -18,6 +18,9 @@ <Platform>x64</Platform> </ProjectConfiguration> </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\source\modules\asura-network\network_module.h" /> + </ItemGroup> <PropertyGroup Label="Globals"> <VCProjectVersion>15.0</VCProjectVersion> <ProjectGuid>{6361701E-BD43-4AE9-8AE2-5C8F87D436BA}</ProjectGuid> diff --git a/build/modules/asura-network/asura-network.vcxproj.filters b/build/modules/asura-network/asura-network.vcxproj.filters index 9cd8510..a475832 100644 --- a/build/modules/asura-network/asura-network.vcxproj.filters +++ b/build/modules/asura-network/asura-network.vcxproj.filters @@ -1,2 +1,11 @@ <?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> + <Filter Include="network"> + <UniqueIdentifier>{c48e682b-c747-4a26-aabc-98e5d05c179c}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\source\modules\asura-network\network_module.h" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/build/modules/asura-openal/asura-openal.vcxproj b/build/modules/asura-openal/asura-openal.vcxproj index 04827fa..3649648 100644 --- a/build/modules/asura-openal/asura-openal.vcxproj +++ b/build/modules/asura-openal/asura-openal.vcxproj @@ -117,24 +117,24 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\..\source\modules\asura-openal\audio.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-openal\mpg123_decoder.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-openal\sound.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-openal\sound_data.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-openal\sound_decoder.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-openal\sound_decode_task.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-openal\source.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-openal\vorbis_decoder.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\audio.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\mpg123_decoder.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\sound.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\sound_data.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\sound_decoder.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\sound_decode_task.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\source.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\vorbis_decoder.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\source\modules\asura-openal\audio.h" /> - <ClInclude Include="..\..\..\source\modules\asura-openal\mpg123_decoder.h" /> - <ClInclude Include="..\..\..\source\modules\asura-openal\sound.h" /> - <ClInclude Include="..\..\..\source\modules\asura-openal\sound_data.h" /> - <ClInclude Include="..\..\..\source\modules\asura-openal\sound_decoder.h" /> - <ClInclude Include="..\..\..\source\modules\asura-openal\sound_decode_task.h" /> - <ClInclude Include="..\..\..\source\modules\asura-openal\source.h" /> - <ClInclude Include="..\..\..\source\modules\asura-openal\vorbis_decoder.h" /> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\audio.h" /> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\mpg123_decoder.h" /> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\sound.h" /> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\sound_data.h" /> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\sound_decoder.h" /> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\sound_decode_task.h" /> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\source.h" /> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\vorbis_decoder.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/build/modules/asura-openal/asura-openal.vcxproj.filters b/build/modules/asura-openal/asura-openal.vcxproj.filters index ceb2b29..4a7af79 100644 --- a/build/modules/asura-openal/asura-openal.vcxproj.filters +++ b/build/modules/asura-openal/asura-openal.vcxproj.filters @@ -1,28 +1,63 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="..\..\..\source\modules\asura-openal\sound.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-openal\sound_decode_task.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-openal\sound_decoder.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-openal\audio.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-openal\mpg123_decoder.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-openal\sound_data.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-openal\source.cpp" /> - <ClCompile Include="..\..\..\source\modules\asura-openal\vorbis_decoder.cpp" /> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\audio.cpp"> + <Filter>audio</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\mpg123_decoder.cpp"> + <Filter>audio</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\sound.cpp"> + <Filter>audio</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\sound_data.cpp"> + <Filter>audio</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\sound_decode_task.cpp"> + <Filter>audio</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\sound_decoder.cpp"> + <Filter>audio</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\source.cpp"> + <Filter>audio</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\modules\asura-openal\audio\vorbis_decoder.cpp"> + <Filter>audio</Filter> + </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\source\modules\asura-openal\sound.h" /> - <ClInclude Include="..\..\..\source\modules\asura-openal\sound_decoder.h" /> - <ClInclude Include="..\..\..\source\modules\asura-openal\sound_decode_task.h" /> - <ClInclude Include="..\..\..\source\modules\asura-openal\audio.h" /> - <ClInclude Include="..\..\..\source\modules\asura-openal\mpg123_decoder.h" /> - <ClInclude Include="..\..\..\source\modules\asura-openal\sound_data.h" /> - <ClInclude Include="..\..\..\source\modules\asura-openal\source.h" /> - <ClInclude Include="..\..\..\source\modules\asura-openal\vorbis_decoder.h" /> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\audio.h"> + <Filter>audio</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\mpg123_decoder.h"> + <Filter>audio</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\sound.h"> + <Filter>audio</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\sound_data.h"> + <Filter>audio</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\sound_decode_task.h"> + <Filter>audio</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\sound_decoder.h"> + <Filter>audio</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\source.h"> + <Filter>audio</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\modules\asura-openal\audio\vorbis_decoder.h"> + <Filter>audio</Filter> + </ClInclude> </ItemGroup> <ItemGroup> - <Filter Include="binding"> - <UniqueIdentifier>{006a5466-b1f4-4ab3-9f6c-eae54a78df37}</UniqueIdentifier> + <Filter Include="audio"> + <UniqueIdentifier>{35f52c38-26da-43eb-9ca2-8c5d32f38b37}</UniqueIdentifier> + </Filter> + <Filter Include="audio\binding"> + <UniqueIdentifier>{dbd7324a-d1b4-4370-ba8d-df87b31d984c}</UniqueIdentifier> </Filter> </ItemGroup> </Project>
\ No newline at end of file diff --git a/build/modules/asura-plot/asura-plot.vcxproj.filters b/build/modules/asura-plot/asura-plot.vcxproj.filters index 3c6f4fd..13e717f 100644 --- a/build/modules/asura-plot/asura-plot.vcxproj.filters +++ b/build/modules/asura-plot/asura-plot.vcxproj.filters @@ -1,17 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Filter Include="源文件"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="头文件"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions> - </Filter> - <Filter Include="资源文件"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + <Filter Include="plot"> + <UniqueIdentifier>{0f829a34-bb64-4d78-b97a-32c6679fc43b}</UniqueIdentifier> </Filter> </ItemGroup> </Project>
\ No newline at end of file diff --git a/build/modules/asura-steam/asura-steam.vcxproj.filters b/build/modules/asura-steam/asura-steam.vcxproj.filters index 3c6f4fd..d48ea8c 100644 --- a/build/modules/asura-steam/asura-steam.vcxproj.filters +++ b/build/modules/asura-steam/asura-steam.vcxproj.filters @@ -1,17 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Filter Include="源文件"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="头文件"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions> - </Filter> - <Filter Include="资源文件"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + <Filter Include="steam"> + <UniqueIdentifier>{73580bc7-0dec-4284-a31a-9a84f284326a}</UniqueIdentifier> </Filter> </ItemGroup> </Project>
\ No newline at end of file diff --git a/build/modules/asura-xml/asura-xml.vcxproj.filters b/build/modules/asura-xml/asura-xml.vcxproj.filters index 9cd8510..d4c889c 100644 --- a/build/modules/asura-xml/asura-xml.vcxproj.filters +++ b/build/modules/asura-xml/asura-xml.vcxproj.filters @@ -1,2 +1,8 @@ <?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> + <Filter Include="xml"> + <UniqueIdentifier>{d8671556-9eb0-4627-a264-e7b667109bc4}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/build/tests/07-image/07-image.vcxproj b/build/tests/07-image/07-image.vcxproj index 11012d8..be7d160 100644 --- a/build/tests/07-image/07-image.vcxproj +++ b/build/tests/07-image/07-image.vcxproj @@ -115,6 +115,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\..\source\tests\07-image\main.cpp" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/build/tests/07-image/07-image.vcxproj.filters b/build/tests/07-image/07-image.vcxproj.filters index 3c6f4fd..77b23f4 100644 --- a/build/tests/07-image/07-image.vcxproj.filters +++ b/build/tests/07-image/07-image.vcxproj.filters @@ -1,17 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <Filter Include="源文件"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="头文件"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions> - </Filter> - <Filter Include="资源文件"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> + <ClCompile Include="..\..\..\source\tests\07-image\main.cpp" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/build/tools/bindingGen/main.cs b/build/tools/bindingGen/main.cs index 7f99da4..f58b846 100644 --- a/build/tools/bindingGen/main.cs +++ b/build/tools/bindingGen/main.cs @@ -20,6 +20,7 @@ namespace bindingGen static string output = @"#include ""../{0}.h"" using namespace std; +using namespace Luax; namespace {1} {{ @@ -78,14 +79,14 @@ namespace {1} return ""; string register_methods = ""; register_methods += "\t\t\tLUAX_REGISTER_METHODS(state,\n"; - int maxlen = 0; - foreach(var m in methods) + int maxlen = 0; + foreach (var m in methods) { string method = m.ToString(); if (method.Count() > maxlen) - maxlen = method.Count(); + maxlen = method.Count(); } - for(int i = 0; i < methods.Count; ++i) + for (int i = 0; i < methods.Count; ++i) { Match m = methods[i]; string method = m.ToString(); @@ -107,12 +108,12 @@ namespace {1} if (mc.Count == 0) return ""; - string methods = ""; + string methods = ""; - foreach(var m in mc) + foreach (var m in mc) { string name = m.ToString(); - if(name != "_New") + if (name != "_New") { methods += String.Format(method, cname, name.Substring(1, name.Count() - 1), cname.ToLower()); } @@ -125,16 +126,36 @@ namespace {1} return methods; } + static int IndexOfChar(string str, char c, int n) + { + int j = 0; + for (int i = 0; i < str.Count(); ++i) + { + char ch = str[i]; + if (ch == c) + { + if (j == n) + return i; + ++j; + } + } + return -1; + } + static string make_register_enum(MatchCollection mc, string src) { if (mc.Count == 0) return ""; string reg_enum_l = @"(?<=enum\s*"; - string reg_enum_r = @"[\s\n]*\{((?!\})[\s\S])*)[A-Z_]+(?=\s*)"; + string reg_enum_r = @"[\s\n]*\{((?!\})[\s\S])*\s)[A-Z_0-9]+(?=[\s\=,]+)"; string enums = ""; - foreach(var m in mc) + // 尝试查找下划线索引号，如果没有，代表这个枚举字符串全部都是key + string reg_under_line_l = @"(?<=LUAX_DECL_ENUM\s*\(\s*"; + string reg_under_line_r = @"\s*,\s*)[0-9]+(?=\s*\))"; + + foreach (var m in mc) { string name = m.ToString(); enums += "\t\t\tLUAX_REGISTER_ENUM(state, "; @@ -142,15 +163,30 @@ namespace {1} MatchCollection values = Regex.Matches(src, reg_enum_l + name + reg_enum_r); string[] enames = new string[values.Count]; string[] keys = new string[values.Count]; + int underline_index = -1; + Match underline = Regex.Match(src, reg_under_line_l + name + reg_under_line_r); + if (underline.Success) + { + underline_index = int.Parse(underline.ToString()); + } int maxEname = 0, maxKey = 0; for (int i = 0; i < values.Count; ++i) { - enames[i] = values[i].ToString(); - keys[i] = enames[i].Substring(enames[i].LastIndexOf('_') + 1, enames[i].Count() - enames[i].LastIndexOf('_') -1); + enames[i] = values[i].ToString(); + if(underline_index != -1) + { + int start = IndexOfChar(enames[i], '_', underline_index) + 1; + keys[i] = enames[i].Substring(start, enames[i].Count() - start); + } + else + { + // 表明全部都是key + keys[i] = enames[i]; + } if (enames[i].Count() > maxEname) maxEname = enames[i].Count(); if (keys[i].Count() > maxKey) maxKey = keys[i].Count(); } - for(int i = 0; i < values.Count; ++i) + for (int i = 0; i < values.Count; ++i) { enums += "\t\t\t\t{ "; enums += ('"' + keys[i] + "\",").PadRight(maxKey + 4); @@ -183,17 +219,18 @@ namespace {1} return; string reg_class = @"(?<=Portable\<)[0-9a-zA-Z]+(?=\>)"; + string reg_abclass = @"(?<=LUAX_DECL_ABSTRACT_FACTORY\s*\(\s*)[0-9a-zA-Z]+(?=\s*\))"; string reg_methods = @"(?<=LUAX_DECL_METHOD\()[0-9a-zA-Z_]+(?=\))"; - string reg_enums = @"(?<=LUAX_DECL_ENUM\()[0-9a-zA-Z_]+(?=\))"; + string reg_enums = @"(?<=LUAX_DECL_ENUM\()[0-9a-zA-Z_]+(?=\s*[\),]+)"; string reg_namespace = @"(?<=namespace\s)[0-9a-zA-Z]+(?=[\s\n]*\{)"; - if(!Directory.Exists(dir + "/binding")) + if (!Directory.Exists(dir + "/binding")) { Directory.CreateDirectory(dir + "/binding"); } string[] files = Directory.GetFiles(dir); - for(int i = 0; i < files.Count(); ++i) + for (int i = 0; i < files.Count(); ++i) { string file = files[i]; if (!File.Exists(file)) @@ -204,14 +241,24 @@ namespace {1} if (File.Exists(bindingFile)) continue; string code = File.ReadAllText(file); - // + // 工厂和单例 Match m = Regex.Match(code, reg_class); + string className = ""; + if (m.Success) + { + className = m.ToString(); + } if (!m.Success) - continue; - string className = m.ToString(); + { + // 抽象类，不会继承Portable模板 + Match abstract_m = Regex.Match(code, reg_abclass); + if (!abstract_m.Success) + continue; + className = abstract_m.ToString(); + } MatchCollection mc = Regex.Matches(code, reg_namespace); // 应该两个名称空间 - if(mc.Count != 2) + if (mc.Count != 2) { Console.WriteLine("Error: 源文件没有两个名称空间 " + file); continue; @@ -227,7 +274,7 @@ namespace {1} mc = Regex.Matches(code, reg_methods); content += make_impl_methods(mc, className); string binding = String.Format(output, name, namespace1, namespace2, content); - Console.WriteLine("输出: "+bindingFile); + Console.WriteLine("输出: " + bindingFile); File.WriteAllText(bindingFile, binding); } } diff --git a/build/tools/bindingGen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/build/tools/bindingGen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex b89f8dd..78a75d8 100644 --- a/build/tools/bindingGen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/build/tools/bindingGen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt b/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt index 3656c65..091c0f8 100644 --- a/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt +++ b/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt @@ -8,3 +8,10 @@ D:\Asura\build\tools\bindingGen\obj\Debug\bindingGen.pdb D:\Asura\bin\win64\bindingGen.exe.config D:\Asura\bin\win64\bindingGen.exe D:\Asura\bin\win64\bindingGen.pdb +D:\Documents\VisualStudio2017\Projects\Asura\bin\win64\bindingGen.exe.config +D:\Documents\VisualStudio2017\Projects\Asura\bin\win64\bindingGen.exe +D:\Documents\VisualStudio2017\Projects\Asura\bin\win64\bindingGen.pdb +D:\Documents\VisualStudio2017\Projects\Asura\Build\tools\bindingGen\obj\Debug\bindingGen.csprojAssemblyReference.cache +D:\Documents\VisualStudio2017\Projects\Asura\Build\tools\bindingGen\obj\Debug\bindingGen.csproj.CoreCompileInputs.cache +D:\Documents\VisualStudio2017\Projects\Asura\Build\tools\bindingGen\obj\Debug\bindingGen.exe +D:\Documents\VisualStudio2017\Projects\Asura\Build\tools\bindingGen\obj\Debug\bindingGen.pdb diff --git a/build/tools/bindingGen/obj/Debug/bindingGen.exe b/build/tools/bindingGen/obj/Debug/bindingGen.exe Binary files differindex b196836..016c299 100644 --- a/build/tools/bindingGen/obj/Debug/bindingGen.exe +++ b/build/tools/bindingGen/obj/Debug/bindingGen.exe |