diff options
| author | chai <chaifix@163.com> | 2019-03-27 09:07:54 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2019-03-27 09:07:54 +0800 |
| commit | 66c5fdc564dd892ed265132d6c1378dbe3cebcee (patch) | |
| tree | 909848ed622b35c8653c961c9ebed8c574bb150e | |
| parent | d9041d6e12ded456c17622f7f2e7bbacb9e99b1a (diff) | |
*misc
139 files changed, 7603 insertions, 619 deletions
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj index 3765ed4..892c3e3 100644 --- a/Build/Asura.Editor/Asura.Editor.vcxproj +++ b/Build/Asura.Editor/Asura.Editor.vcxproj @@ -122,6 +122,7 @@ <ClCompile Include="..\..\source\Asura.Editor\layout\horizontal_layout.cpp" /> <ClCompile Include="..\..\source\Asura.Editor\layout\vertical_layout.cpp" /> <ClCompile Include="..\..\source\Asura.Editor\main.cpp" /> + <ClCompile Include="..\..\source\Asura.Editor\system\file_watcher.cpp" /> <ClCompile Include="..\..\source\Asura.Editor\widgets\binding\_button.cpp" /> <ClCompile Include="..\..\source\Asura.Editor\widgets\button.cpp" /> <ClCompile Include="..\..\source\Asura.Editor\widgets\checkbox.cpp" /> @@ -141,6 +142,7 @@ <ClInclude Include="..\..\source\Asura.Editor\editor.h" /> <ClInclude Include="..\..\source\Asura.Editor\layout\horizontal_layout.h" /> <ClInclude Include="..\..\source\Asura.Editor\layout\vertical_layout.h" /> + <ClInclude Include="..\..\source\Asura.Editor\system\file_watcher.h" /> <ClInclude Include="..\..\source\Asura.Editor\widgets\button.h" /> <ClInclude Include="..\..\source\Asura.Editor\widgets\checkbox.h" /> <ClInclude Include="..\..\source\Asura.Editor\widgets\hslider.h" /> diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters index 8923f09..940a465 100644 --- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters +++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters @@ -13,8 +13,8 @@ <Filter Include="widgets\binding"> <UniqueIdentifier>{4be11763-e2f9-47a4-8947-5326a517e286}</UniqueIdentifier> </Filter> - <Filter Include="script"> - <UniqueIdentifier>{48e88630-25b8-42f8-b76b-fa55bcce298d}</UniqueIdentifier> + <Filter Include="system"> + <UniqueIdentifier>{48600309-cddd-49cd-b939-7a19a2b1eaa3}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> @@ -60,6 +60,9 @@ <ClCompile Include="..\..\source\Asura.Editor\widgets\binding\_button.cpp"> <Filter>widgets\binding</Filter> </ClCompile> + <ClCompile Include="..\..\source\Asura.Editor\system\file_watcher.cpp"> + <Filter>system</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\source\Asura.Editor\widgets\button.h"> @@ -109,5 +112,8 @@ <ClInclude Include="..\..\source\Asura.Editor\core\slot.h"> <Filter>core</Filter> </ClInclude> + <ClInclude Include="..\..\source\Asura.Editor\system\file_watcher.h"> + <Filter>system</Filter> + </ClInclude> </ItemGroup> </Project>
\ No newline at end of file diff --git a/Build/Asura.sln b/Build/Asura.sln index 3bd9d61..c467d40 100644 --- a/Build/Asura.sln +++ b/Build/Asura.sln @@ -53,8 +53,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-openal", "libs\as EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-utils", "libs\asura-lib-utils\asura-lib-utils.vcxproj", "{7D41093F-E356-4C5B-A25F-41779BF86E54}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cembed", "3rd-party\cembed\cembed.vcxproj", "{53A48355-B4B3-4775-B1A0-FBB3E02C6A06}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01-cursor", "tests\01-cursor\01-cursor.vcxproj", "{52D4B84B-0FEB-419F-AED4-2FC896AA93CF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02-luax", "tests\02-luax\02-luax.vcxproj", "{CF6D513F-746A-4541-957A-C80492DF09C9}" @@ -79,334 +77,468 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-xml", "libs\asura EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-log", "libs\asura-lib-log\asura-lib-log.vcxproj", "{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "3rd-party\tinyxml\tinyxml.vcxproj", "{9891C064-C897-424E-8EB6-CAD09812E032}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Preprocessor", "Preprocessor\Preprocessor.vcxproj", "{983F6496-7BB2-48E3-B8F4-68C2600EA315}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-steam", "libs\asura-lib-steam\asura-lib-steam.vcxproj", "{129C3826-B418-4C80-A126-0319C7E2A857}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05-physfs", "tests\05-physfs\05-physfs.vcxproj", "{5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{25C8D2F8-989B-4742-859D-E2FDBB14EC2F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bindingGen", "tools\bindingGen\bindingGen.csproj", "{95CAC424-D558-43D0-88B0-C67AF1C4EE90}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cembed", "tools\cembed\cembed.vcxproj", "{68FB36CB-C478-4158-A0BC-905B65340AE9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml2", "3rd-party\tinyxml2\tinyxml2.vcxproj", "{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "06-coroutine", "tests\06-coroutine\06-coroutine.vcxproj", "{C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-socket", "libs\asura-lib-socket\asura-lib-socket.vcxproj", "{FF8319D3-7ADC-41BC-A397-B31690A7AB5F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-http", "libs\asura-lib-http\asura-lib-http.vcxproj", "{DCD127A6-68B3-48CA-B769-0680C167D99B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Debug|Any CPU.ActiveCfg = Debug|Win32 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Debug|x64.ActiveCfg = Debug|x64 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Debug|x64.Build.0 = Debug|x64 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Debug|x86.ActiveCfg = Debug|Win32 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Debug|x86.Build.0 = Debug|Win32 + {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Release|Any CPU.ActiveCfg = Release|Win32 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Release|x64.ActiveCfg = Release|x64 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Release|x64.Build.0 = Release|x64 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Release|x86.ActiveCfg = Release|Win32 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Release|x86.Build.0 = Release|Win32 + {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Debug|Any CPU.ActiveCfg = Debug|Win32 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Debug|x64.ActiveCfg = Debug|x64 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Debug|x64.Build.0 = Debug|x64 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Debug|x86.ActiveCfg = Debug|Win32 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Debug|x86.Build.0 = Debug|Win32 + {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Release|Any CPU.ActiveCfg = Release|Win32 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Release|x64.ActiveCfg = Release|x64 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Release|x64.Build.0 = Release|x64 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Release|x86.ActiveCfg = Release|Win32 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Release|x86.Build.0 = Release|Win32 + {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Debug|Any CPU.ActiveCfg = Debug|Win32 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Debug|x64.ActiveCfg = Debug|x64 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Debug|x64.Build.0 = Debug|x64 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Debug|x86.ActiveCfg = Debug|Win32 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Debug|x86.Build.0 = Debug|Win32 + {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Release|Any CPU.ActiveCfg = Release|Win32 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Release|x64.ActiveCfg = Release|x64 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Release|x64.Build.0 = Release|x64 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Release|x86.ActiveCfg = Release|Win32 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Release|x86.Build.0 = Release|Win32 + {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Debug|Any CPU.ActiveCfg = Debug|Win32 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Debug|x64.ActiveCfg = Debug|x64 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Debug|x64.Build.0 = Debug|x64 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Debug|x86.ActiveCfg = Debug|Win32 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Debug|x86.Build.0 = Debug|Win32 + {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|Any CPU.ActiveCfg = Release|Win32 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|x64.ActiveCfg = Release|x64 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|x64.Build.0 = Release|x64 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|x86.ActiveCfg = Release|Win32 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|x86.Build.0 = Release|Win32 + {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|Any CPU.ActiveCfg = Debug|Win32 {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x64.ActiveCfg = Debug|x64 {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x64.Build.0 = Debug|x64 {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x86.ActiveCfg = Debug|Win32 {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x86.Build.0 = Debug|Win32 + {B8F9616D-5393-4B34-B191-D200D1985439}.Release|Any CPU.ActiveCfg = Release|Win32 {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x64.ActiveCfg = Release|x64 {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x64.Build.0 = Release|x64 {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x86.ActiveCfg = Release|Win32 {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x86.Build.0 = Release|Win32 + {208B9CB8-2101-42A9-9502-0CF54912BC57}.Debug|Any CPU.ActiveCfg = Debug|Win32 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Debug|x64.ActiveCfg = Debug|x64 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Debug|x64.Build.0 = Debug|x64 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Debug|x86.ActiveCfg = Debug|Win32 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Debug|x86.Build.0 = Debug|Win32 + {208B9CB8-2101-42A9-9502-0CF54912BC57}.Release|Any CPU.ActiveCfg = Release|Win32 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Release|x64.ActiveCfg = Release|x64 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Release|x64.Build.0 = Release|x64 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Release|x86.ActiveCfg = Release|Win32 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Release|x86.Build.0 = Release|Win32 + {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Debug|Any CPU.ActiveCfg = Debug|Win32 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Debug|x64.ActiveCfg = Debug|x64 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Debug|x64.Build.0 = Debug|x64 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Debug|x86.ActiveCfg = Debug|Win32 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Debug|x86.Build.0 = Debug|Win32 + {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Release|Any CPU.ActiveCfg = Release|Win32 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Release|x64.ActiveCfg = Release|x64 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Release|x64.Build.0 = Release|x64 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Release|x86.ActiveCfg = Release|Win32 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Release|x86.Build.0 = Release|Win32 + {AF237AA3-67F7-4C93-8249-920DB2878192}.Debug|Any CPU.ActiveCfg = Debug|Win32 {AF237AA3-67F7-4C93-8249-920DB2878192}.Debug|x64.ActiveCfg = Debug|x64 {AF237AA3-67F7-4C93-8249-920DB2878192}.Debug|x64.Build.0 = Debug|x64 {AF237AA3-67F7-4C93-8249-920DB2878192}.Debug|x86.ActiveCfg = Debug|Win32 {AF237AA3-67F7-4C93-8249-920DB2878192}.Debug|x86.Build.0 = Debug|Win32 + {AF237AA3-67F7-4C93-8249-920DB2878192}.Release|Any CPU.ActiveCfg = Release|Win32 {AF237AA3-67F7-4C93-8249-920DB2878192}.Release|x64.ActiveCfg = Release|x64 {AF237AA3-67F7-4C93-8249-920DB2878192}.Release|x64.Build.0 = Release|x64 {AF237AA3-67F7-4C93-8249-920DB2878192}.Release|x86.ActiveCfg = Release|Win32 {AF237AA3-67F7-4C93-8249-920DB2878192}.Release|x86.Build.0 = Release|Win32 + {38019689-27C2-488F-9C50-36CA6930CEB7}.Debug|Any CPU.ActiveCfg = Debug|Win32 {38019689-27C2-488F-9C50-36CA6930CEB7}.Debug|x64.ActiveCfg = Debug|x64 {38019689-27C2-488F-9C50-36CA6930CEB7}.Debug|x64.Build.0 = Debug|x64 {38019689-27C2-488F-9C50-36CA6930CEB7}.Debug|x86.ActiveCfg = Debug|Win32 {38019689-27C2-488F-9C50-36CA6930CEB7}.Debug|x86.Build.0 = Debug|Win32 + {38019689-27C2-488F-9C50-36CA6930CEB7}.Release|Any CPU.ActiveCfg = Release|Win32 {38019689-27C2-488F-9C50-36CA6930CEB7}.Release|x64.ActiveCfg = Release|x64 {38019689-27C2-488F-9C50-36CA6930CEB7}.Release|x64.Build.0 = Release|x64 {38019689-27C2-488F-9C50-36CA6930CEB7}.Release|x86.ActiveCfg = Release|Win32 {38019689-27C2-488F-9C50-36CA6930CEB7}.Release|x86.Build.0 = Release|Win32 + {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Debug|Any CPU.ActiveCfg = Debug|Win32 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Debug|x64.ActiveCfg = Debug|x64 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Debug|x64.Build.0 = Debug|x64 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Debug|x86.ActiveCfg = Debug|Win32 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Debug|x86.Build.0 = Debug|Win32 + {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Release|Any CPU.ActiveCfg = Release|Win32 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Release|x64.ActiveCfg = Release|x64 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Release|x64.Build.0 = Release|x64 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Release|x86.ActiveCfg = Release|Win32 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Release|x86.Build.0 = Release|Win32 + {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Debug|Any CPU.ActiveCfg = Debug|Win32 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Debug|x64.ActiveCfg = Debug|x64 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Debug|x64.Build.0 = Debug|x64 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Debug|x86.ActiveCfg = Debug|Win32 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Debug|x86.Build.0 = Debug|Win32 + {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|Any CPU.ActiveCfg = Release|Win32 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x64.ActiveCfg = Release|x64 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x64.Build.0 = Release|x64 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x86.ActiveCfg = Release|Win32 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x86.Build.0 = Release|Win32 + {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Debug|Any CPU.ActiveCfg = Debug|Win32 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Debug|x64.ActiveCfg = Debug|x64 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Debug|x64.Build.0 = Debug|x64 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Debug|x86.ActiveCfg = Debug|Win32 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Debug|x86.Build.0 = Debug|Win32 + {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Release|Any CPU.ActiveCfg = Release|Win32 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Release|x64.ActiveCfg = Release|x64 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Release|x64.Build.0 = Release|x64 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Release|x86.ActiveCfg = Release|Win32 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Release|x86.Build.0 = Release|Win32 + {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|Any CPU.ActiveCfg = Debug|Win32 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x64.ActiveCfg = Debug|x64 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x64.Build.0 = Debug|x64 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x86.ActiveCfg = Debug|Win32 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x86.Build.0 = Debug|Win32 + {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|Any CPU.ActiveCfg = Release|Win32 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x64.ActiveCfg = Release|x64 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x64.Build.0 = Release|x64 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x86.ActiveCfg = Release|Win32 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x86.Build.0 = Release|Win32 + {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Debug|Any CPU.ActiveCfg = Debug|Win32 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Debug|x64.ActiveCfg = Debug|x64 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Debug|x64.Build.0 = Debug|x64 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Debug|x86.ActiveCfg = Debug|Win32 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Debug|x86.Build.0 = Debug|Win32 + {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Release|Any CPU.ActiveCfg = Release|Win32 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Release|x64.ActiveCfg = Release|x64 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Release|x64.Build.0 = Release|x64 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Release|x86.ActiveCfg = Release|Win32 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Release|x86.Build.0 = Release|Win32 + {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Debug|Any CPU.ActiveCfg = Debug|Win32 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Debug|x64.ActiveCfg = Debug|x64 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Debug|x64.Build.0 = Debug|x64 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Debug|x86.ActiveCfg = Debug|Win32 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Debug|x86.Build.0 = Debug|Win32 + {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Release|Any CPU.ActiveCfg = Release|Win32 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Release|x64.ActiveCfg = Release|x64 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Release|x64.Build.0 = Release|x64 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Release|x86.ActiveCfg = Release|Win32 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Release|x86.Build.0 = Release|Win32 + {294889EA-93DE-4580-BF9D-87F605B229AA}.Debug|Any CPU.ActiveCfg = Debug|Win32 {294889EA-93DE-4580-BF9D-87F605B229AA}.Debug|x64.ActiveCfg = Debug|x64 {294889EA-93DE-4580-BF9D-87F605B229AA}.Debug|x64.Build.0 = Debug|x64 {294889EA-93DE-4580-BF9D-87F605B229AA}.Debug|x86.ActiveCfg = Debug|Win32 {294889EA-93DE-4580-BF9D-87F605B229AA}.Debug|x86.Build.0 = Debug|Win32 + {294889EA-93DE-4580-BF9D-87F605B229AA}.Release|Any CPU.ActiveCfg = Release|Win32 {294889EA-93DE-4580-BF9D-87F605B229AA}.Release|x64.ActiveCfg = Release|x64 {294889EA-93DE-4580-BF9D-87F605B229AA}.Release|x64.Build.0 = Release|x64 {294889EA-93DE-4580-BF9D-87F605B229AA}.Release|x86.ActiveCfg = Release|Win32 {294889EA-93DE-4580-BF9D-87F605B229AA}.Release|x86.Build.0 = Release|Win32 + {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Debug|Any CPU.ActiveCfg = Debug|Win32 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Debug|x64.ActiveCfg = Debug|x64 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Debug|x64.Build.0 = Debug|x64 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Debug|x86.ActiveCfg = Debug|Win32 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Debug|x86.Build.0 = Debug|Win32 + {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|Any CPU.ActiveCfg = Release|Win32 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|x64.ActiveCfg = Release|x64 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|x64.Build.0 = Release|x64 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|x86.ActiveCfg = Release|Win32 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|x86.Build.0 = Release|Win32 + {29A6837A-67FA-403F-83FD-E7975649404F}.Debug|Any CPU.ActiveCfg = Debug|Win32 {29A6837A-67FA-403F-83FD-E7975649404F}.Debug|x64.ActiveCfg = Debug|x64 {29A6837A-67FA-403F-83FD-E7975649404F}.Debug|x64.Build.0 = Debug|x64 {29A6837A-67FA-403F-83FD-E7975649404F}.Debug|x86.ActiveCfg = Debug|Win32 {29A6837A-67FA-403F-83FD-E7975649404F}.Debug|x86.Build.0 = Debug|Win32 + {29A6837A-67FA-403F-83FD-E7975649404F}.Release|Any CPU.ActiveCfg = Release|Win32 {29A6837A-67FA-403F-83FD-E7975649404F}.Release|x64.ActiveCfg = Release|x64 {29A6837A-67FA-403F-83FD-E7975649404F}.Release|x64.Build.0 = Release|x64 {29A6837A-67FA-403F-83FD-E7975649404F}.Release|x86.ActiveCfg = Release|Win32 {29A6837A-67FA-403F-83FD-E7975649404F}.Release|x86.Build.0 = Release|Win32 + {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Debug|Any CPU.ActiveCfg = Debug|Win32 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Debug|x64.ActiveCfg = Debug|x64 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Debug|x64.Build.0 = Debug|x64 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Debug|x86.ActiveCfg = Debug|Win32 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Debug|x86.Build.0 = Debug|Win32 + {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Release|Any CPU.ActiveCfg = Release|Win32 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Release|x64.ActiveCfg = Release|x64 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Release|x64.Build.0 = Release|x64 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Release|x86.ActiveCfg = Release|Win32 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Release|x86.Build.0 = Release|Win32 + {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Debug|Any CPU.ActiveCfg = Debug|Win32 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Debug|x64.ActiveCfg = Debug|x64 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Debug|x64.Build.0 = Debug|x64 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Debug|x86.ActiveCfg = Debug|Win32 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Debug|x86.Build.0 = Debug|Win32 + {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Release|Any CPU.ActiveCfg = Release|Win32 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Release|x64.ActiveCfg = Release|x64 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Release|x64.Build.0 = Release|x64 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Release|x86.ActiveCfg = Release|Win32 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Release|x86.Build.0 = Release|Win32 + {088C6ABA-26A6-43D1-8492-096EDB65597C}.Debug|Any CPU.ActiveCfg = Debug|Win32 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Debug|x64.ActiveCfg = Debug|x64 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Debug|x64.Build.0 = Debug|x64 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Debug|x86.ActiveCfg = Debug|Win32 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Debug|x86.Build.0 = Debug|Win32 + {088C6ABA-26A6-43D1-8492-096EDB65597C}.Release|Any CPU.ActiveCfg = Release|Win32 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Release|x64.ActiveCfg = Release|x64 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Release|x64.Build.0 = Release|x64 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Release|x86.ActiveCfg = Release|Win32 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Release|x86.Build.0 = Release|Win32 + {7D41093F-E356-4C5B-A25F-41779BF86E54}.Debug|Any CPU.ActiveCfg = Debug|Win32 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Debug|x64.ActiveCfg = Debug|x64 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Debug|x64.Build.0 = Debug|x64 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Debug|x86.ActiveCfg = Debug|Win32 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Debug|x86.Build.0 = Debug|Win32 + {7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|Any CPU.ActiveCfg = Release|Win32 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|x64.ActiveCfg = Release|x64 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|x64.Build.0 = Release|x64 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|x86.ActiveCfg = Release|Win32 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|x86.Build.0 = Release|Win32 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Debug|x64.ActiveCfg = Debug|x64 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Debug|x64.Build.0 = Debug|x64 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Debug|x86.ActiveCfg = Debug|Win32 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Debug|x86.Build.0 = Debug|Win32 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Release|x64.ActiveCfg = Release|x64 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Release|x64.Build.0 = Release|x64 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Release|x86.ActiveCfg = Release|Win32 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Release|x86.Build.0 = Release|Win32 + {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Debug|Any CPU.ActiveCfg = Debug|Win32 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Debug|x64.ActiveCfg = Debug|x64 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Debug|x64.Build.0 = Debug|x64 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Debug|x86.ActiveCfg = Debug|Win32 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Debug|x86.Build.0 = Debug|Win32 + {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Release|Any CPU.ActiveCfg = Release|Win32 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Release|x64.ActiveCfg = Release|x64 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Release|x64.Build.0 = Release|x64 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Release|x86.ActiveCfg = Release|Win32 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Release|x86.Build.0 = Release|Win32 + {CF6D513F-746A-4541-957A-C80492DF09C9}.Debug|Any CPU.ActiveCfg = Debug|Win32 {CF6D513F-746A-4541-957A-C80492DF09C9}.Debug|x64.ActiveCfg = Debug|x64 {CF6D513F-746A-4541-957A-C80492DF09C9}.Debug|x64.Build.0 = Debug|x64 {CF6D513F-746A-4541-957A-C80492DF09C9}.Debug|x86.ActiveCfg = Debug|Win32 {CF6D513F-746A-4541-957A-C80492DF09C9}.Debug|x86.Build.0 = Debug|Win32 + {CF6D513F-746A-4541-957A-C80492DF09C9}.Release|Any CPU.ActiveCfg = Release|Win32 {CF6D513F-746A-4541-957A-C80492DF09C9}.Release|x64.ActiveCfg = Release|x64 {CF6D513F-746A-4541-957A-C80492DF09C9}.Release|x64.Build.0 = Release|x64 {CF6D513F-746A-4541-957A-C80492DF09C9}.Release|x86.ActiveCfg = Release|Win32 {CF6D513F-746A-4541-957A-C80492DF09C9}.Release|x86.Build.0 = Release|Win32 + {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Debug|Any CPU.ActiveCfg = Debug|Win32 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Debug|x64.ActiveCfg = Debug|x64 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Debug|x64.Build.0 = Debug|x64 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Debug|x86.ActiveCfg = Debug|Win32 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Debug|x86.Build.0 = Debug|Win32 + {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Release|Any CPU.ActiveCfg = Release|Win32 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Release|x64.ActiveCfg = Release|x64 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Release|x64.Build.0 = Release|x64 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Release|x86.ActiveCfg = Release|Win32 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Release|x86.Build.0 = Release|Win32 + {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Debug|Any CPU.ActiveCfg = Debug|Win32 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Debug|x64.ActiveCfg = Debug|x64 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Debug|x64.Build.0 = Debug|x64 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Debug|x86.ActiveCfg = Debug|Win32 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Debug|x86.Build.0 = Debug|Win32 + {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Release|Any CPU.ActiveCfg = Release|Win32 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Release|x64.ActiveCfg = Release|x64 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Release|x64.Build.0 = Release|x64 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Release|x86.ActiveCfg = Release|Win32 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Release|x86.Build.0 = Release|Win32 + {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Debug|Any CPU.ActiveCfg = Debug|Win32 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Debug|x64.ActiveCfg = Debug|x64 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Debug|x64.Build.0 = Debug|x64 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Debug|x86.ActiveCfg = Debug|Win32 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Debug|x86.Build.0 = Debug|Win32 + {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Release|Any CPU.ActiveCfg = Release|Win32 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Release|x64.ActiveCfg = Release|x64 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Release|x64.Build.0 = Release|x64 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Release|x86.ActiveCfg = Release|Win32 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Release|x86.Build.0 = Release|Win32 + {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Debug|Any CPU.ActiveCfg = Debug|Win32 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Debug|x64.ActiveCfg = Debug|x64 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Debug|x64.Build.0 = Debug|x64 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Debug|x86.ActiveCfg = Debug|Win32 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Debug|x86.Build.0 = Debug|Win32 + {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Release|Any CPU.ActiveCfg = Release|Win32 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Release|x64.ActiveCfg = Release|x64 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Release|x64.Build.0 = Release|x64 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Release|x86.ActiveCfg = Release|Win32 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Release|x86.Build.0 = Release|Win32 + {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Debug|Any CPU.ActiveCfg = Debug|Win32 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Debug|x64.ActiveCfg = Debug|x64 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Debug|x64.Build.0 = Debug|x64 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Debug|x86.ActiveCfg = Debug|Win32 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Debug|x86.Build.0 = Debug|Win32 + {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Release|Any CPU.ActiveCfg = Release|Win32 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Release|x64.ActiveCfg = Release|x64 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Release|x64.Build.0 = Release|x64 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Release|x86.ActiveCfg = Release|Win32 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Release|x86.Build.0 = Release|Win32 + {57A3232A-FD44-46EB-B860-7CAB3929810F}.Debug|Any CPU.ActiveCfg = Debug|Win32 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Debug|x64.ActiveCfg = Debug|x64 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Debug|x64.Build.0 = Debug|x64 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Debug|x86.ActiveCfg = Debug|Win32 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Debug|x86.Build.0 = Debug|Win32 + {57A3232A-FD44-46EB-B860-7CAB3929810F}.Release|Any CPU.ActiveCfg = Release|Win32 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Release|x64.ActiveCfg = Release|x64 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Release|x64.Build.0 = Release|x64 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Release|x86.ActiveCfg = Release|Win32 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Release|x86.Build.0 = Release|Win32 + {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Debug|Any CPU.ActiveCfg = Debug|Win32 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Debug|x64.ActiveCfg = Debug|x64 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Debug|x64.Build.0 = Debug|x64 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Debug|x86.ActiveCfg = Debug|Win32 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Debug|x86.Build.0 = Debug|Win32 + {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Release|Any CPU.ActiveCfg = Release|Win32 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Release|x64.ActiveCfg = Release|x64 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Release|x64.Build.0 = Release|x64 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Release|x86.ActiveCfg = Release|Win32 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Release|x86.Build.0 = Release|Win32 + {1B83A353-9694-42E0-997E-79E150E1C2E5}.Debug|Any CPU.ActiveCfg = Debug|Win32 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Debug|x64.ActiveCfg = Debug|x64 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Debug|x64.Build.0 = Debug|x64 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Debug|x86.ActiveCfg = Debug|Win32 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Debug|x86.Build.0 = Debug|Win32 + {1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|Any CPU.ActiveCfg = Release|Win32 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|x64.ActiveCfg = Release|x64 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|x64.Build.0 = Release|x64 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|x86.ActiveCfg = Release|Win32 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|x86.Build.0 = Release|Win32 + {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|Any CPU.ActiveCfg = Debug|Win32 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x64.ActiveCfg = Debug|x64 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x64.Build.0 = Debug|x64 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x86.ActiveCfg = Debug|Win32 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x86.Build.0 = Debug|Win32 + {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|Any CPU.ActiveCfg = Release|Win32 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x64.ActiveCfg = Release|x64 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x64.Build.0 = Release|x64 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x86.ActiveCfg = Release|Win32 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x86.Build.0 = Release|Win32 + {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|Any CPU.ActiveCfg = Debug|Win32 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x64.ActiveCfg = Debug|x64 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x64.Build.0 = Debug|x64 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x86.ActiveCfg = Debug|Win32 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x86.Build.0 = Debug|Win32 + {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|Any CPU.ActiveCfg = Release|Win32 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x64.ActiveCfg = Release|x64 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x64.Build.0 = Release|x64 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x86.ActiveCfg = Release|Win32 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x86.Build.0 = Release|Win32 - {9891C064-C897-424E-8EB6-CAD09812E032}.Debug|x64.ActiveCfg = Debug|x64 - {9891C064-C897-424E-8EB6-CAD09812E032}.Debug|x64.Build.0 = Debug|x64 - {9891C064-C897-424E-8EB6-CAD09812E032}.Debug|x86.ActiveCfg = Debug|Win32 - {9891C064-C897-424E-8EB6-CAD09812E032}.Debug|x86.Build.0 = Debug|Win32 - {9891C064-C897-424E-8EB6-CAD09812E032}.Release|x64.ActiveCfg = Release|x64 - {9891C064-C897-424E-8EB6-CAD09812E032}.Release|x64.Build.0 = Release|x64 - {9891C064-C897-424E-8EB6-CAD09812E032}.Release|x86.ActiveCfg = Release|Win32 - {9891C064-C897-424E-8EB6-CAD09812E032}.Release|x86.Build.0 = Release|Win32 + {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Debug|Any CPU.ActiveCfg = Debug|Win32 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Debug|x64.ActiveCfg = Debug|x64 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Debug|x64.Build.0 = Debug|x64 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Debug|x86.ActiveCfg = Debug|Win32 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Debug|x86.Build.0 = Debug|Win32 + {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Release|Any CPU.ActiveCfg = Release|Win32 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Release|x64.ActiveCfg = Release|x64 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Release|x64.Build.0 = Release|x64 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Release|x86.ActiveCfg = Release|Win32 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Release|x86.Build.0 = Release|Win32 + {129C3826-B418-4C80-A126-0319C7E2A857}.Debug|Any CPU.ActiveCfg = Debug|Win32 {129C3826-B418-4C80-A126-0319C7E2A857}.Debug|x64.ActiveCfg = Debug|x64 {129C3826-B418-4C80-A126-0319C7E2A857}.Debug|x64.Build.0 = Debug|x64 {129C3826-B418-4C80-A126-0319C7E2A857}.Debug|x86.ActiveCfg = Debug|Win32 {129C3826-B418-4C80-A126-0319C7E2A857}.Debug|x86.Build.0 = Debug|Win32 + {129C3826-B418-4C80-A126-0319C7E2A857}.Release|Any CPU.ActiveCfg = Release|Win32 {129C3826-B418-4C80-A126-0319C7E2A857}.Release|x64.ActiveCfg = Release|x64 {129C3826-B418-4C80-A126-0319C7E2A857}.Release|x64.Build.0 = Release|x64 {129C3826-B418-4C80-A126-0319C7E2A857}.Release|x86.ActiveCfg = Release|Win32 {129C3826-B418-4C80-A126-0319C7E2A857}.Release|x86.Build.0 = Release|Win32 + {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Debug|Any CPU.ActiveCfg = Debug|Win32 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Debug|x64.ActiveCfg = Debug|x64 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Debug|x64.Build.0 = Debug|x64 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Debug|x86.ActiveCfg = Debug|Win32 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Debug|x86.Build.0 = Debug|Win32 + {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Release|Any CPU.ActiveCfg = Release|Win32 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Release|x64.ActiveCfg = Release|x64 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Release|x64.Build.0 = Release|x64 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Release|x86.ActiveCfg = Release|Win32 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Release|x86.Build.0 = Release|Win32 + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Debug|Any CPU.Build.0 = Debug|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Debug|x64.ActiveCfg = Debug|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Debug|x64.Build.0 = Debug|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Debug|x86.ActiveCfg = Debug|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Debug|x86.Build.0 = Debug|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Release|Any CPU.ActiveCfg = Release|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Release|Any CPU.Build.0 = Release|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Release|x64.ActiveCfg = Release|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Release|x64.Build.0 = Release|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Release|x86.ActiveCfg = Release|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Release|x86.Build.0 = Release|Any CPU + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Debug|x64.ActiveCfg = Debug|x64 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Debug|x64.Build.0 = Debug|x64 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Debug|x86.ActiveCfg = Debug|Win32 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Debug|x86.Build.0 = Debug|Win32 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Release|Any CPU.ActiveCfg = Release|Win32 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Release|x64.ActiveCfg = Release|x64 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Release|x64.Build.0 = Release|x64 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Release|x86.ActiveCfg = Release|Win32 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Release|x86.Build.0 = Release|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x64.ActiveCfg = Debug|x64 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x64.Build.0 = Debug|x64 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x86.ActiveCfg = Debug|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x86.Build.0 = Debug|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|Any CPU.ActiveCfg = Release|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x64.ActiveCfg = Release|x64 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x64.Build.0 = Release|x64 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x86.ActiveCfg = Release|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x86.Build.0 = Release|Win32 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Debug|x64.ActiveCfg = Debug|x64 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Debug|x64.Build.0 = Debug|x64 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Debug|x86.ActiveCfg = Debug|Win32 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Debug|x86.Build.0 = Debug|Win32 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Release|Any CPU.ActiveCfg = Release|Win32 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Release|x64.ActiveCfg = Release|x64 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Release|x64.Build.0 = Release|x64 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Release|x86.ActiveCfg = Release|Win32 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Release|x86.Build.0 = Release|Win32 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Debug|x64.ActiveCfg = Debug|x64 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Debug|x64.Build.0 = Debug|x64 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Debug|x86.ActiveCfg = Debug|Win32 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Debug|x86.Build.0 = Debug|Win32 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Release|Any CPU.ActiveCfg = Release|Win32 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Release|x64.ActiveCfg = Release|x64 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Release|x64.Build.0 = Release|x64 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Release|x86.ActiveCfg = Release|Win32 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Release|x86.Build.0 = Release|Win32 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Debug|x64.ActiveCfg = Debug|x64 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Debug|x64.Build.0 = Debug|x64 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Debug|x86.ActiveCfg = Debug|Win32 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Debug|x86.Build.0 = Debug|Win32 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Release|Any CPU.ActiveCfg = Release|Win32 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Release|x64.ActiveCfg = Release|x64 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Release|x64.Build.0 = Release|x64 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Release|x86.ActiveCfg = Release|Win32 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -434,7 +566,6 @@ Global {CB05752F-B785-4715-9AA3-818C15ABA5F0} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {088C6ABA-26A6-43D1-8492-096EDB65597C} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {7D41093F-E356-4C5B-A25F-41779BF86E54} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {52D4B84B-0FEB-419F-AED4-2FC896AA93CF} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} {CF6D513F-746A-4541-957A-C80492DF09C9} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} @@ -442,9 +573,14 @@ Global {1B83A353-9694-42E0-997E-79E150E1C2E5} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {73B0F8AB-EF5A-412A-9E34-0FD2574766B7} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} - {9891C064-C897-424E-8EB6-CAD09812E032} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {129C3826-B418-4C80-A126-0319C7E2A857} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} + {95CAC424-D558-43D0-88B0-C67AF1C4EE90} = {25C8D2F8-989B-4742-859D-E2FDBB14EC2F} + {68FB36CB-C478-4158-A0BC-905B65340AE9} = {25C8D2F8-989B-4742-859D-E2FDBB14EC2F} + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} + {DCD127A6-68B3-48CA-B769-0680C167D99B} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git a/Source/Asura.Editor/Scripts/scene_view.lua b/Source/Asura.Editor/Scripts/scene_view.lua index db4790f..b6097f3 100644 --- a/Source/Asura.Editor/Scripts/scene_view.lua +++ b/Source/Asura.Editor/Scripts/scene_view.lua @@ -1 +1,4 @@ -- 场景窗口 +local scene = AsuraEditor.Window.New("Window/Scene View") + + diff --git a/Source/Asura.Editor/scripts/scene_view.lua b/Source/Asura.Editor/scripts/scene_view.lua index db4790f..b6097f3 100644 --- a/Source/Asura.Editor/scripts/scene_view.lua +++ b/Source/Asura.Editor/scripts/scene_view.lua @@ -1 +1,4 @@ -- 场景窗口 +local scene = AsuraEditor.Window.New("Window/Scene View") + + diff --git a/bin/win64/02-luax.exe b/bin/win64/02-luax.exe Binary files differindex f9d8dc4..f9bb428 100644 --- a/bin/win64/02-luax.exe +++ b/bin/win64/02-luax.exe diff --git a/bin/win64/05-physfs.exe b/bin/win64/05-physfs.exe Binary files differindex 8229aff..a3d7410 100644 --- a/bin/win64/05-physfs.exe +++ b/bin/win64/05-physfs.exe diff --git a/bin/win64/bindingGen.exe b/bin/win64/bindingGen.exe Binary files differnew file mode 100644 index 0000000..930d6e4 --- /dev/null +++ b/bin/win64/bindingGen.exe diff --git a/bin/win64/bindingGen.exe.config b/bin/win64/bindingGen.exe.config new file mode 100644 index 0000000..731f6de --- /dev/null +++ b/bin/win64/bindingGen.exe.config @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> + </startup> +</configuration>
\ No newline at end of file diff --git a/source/3rd-party/cembed/main.cpp b/build/.vs/Asura/v15/Server/sqlite3/db.lock index e69de29..e69de29 100644 --- a/source/3rd-party/cembed/main.cpp +++ b/build/.vs/Asura/v15/Server/sqlite3/db.lock diff --git a/build/.vs/Asura/v15/Server/sqlite3/storage.ide b/build/.vs/Asura/v15/Server/sqlite3/storage.ide Binary files differnew file mode 100644 index 0000000..56758a8 --- /dev/null +++ b/build/.vs/Asura/v15/Server/sqlite3/storage.ide diff --git a/build/.vs/Asura/v15/Server/sqlite3/storage.ide-shm b/build/.vs/Asura/v15/Server/sqlite3/storage.ide-shm Binary files differnew file mode 100644 index 0000000..45f5fa8 --- /dev/null +++ b/build/.vs/Asura/v15/Server/sqlite3/storage.ide-shm diff --git a/build/.vs/Asura/v15/Server/sqlite3/storage.ide-wal b/build/.vs/Asura/v15/Server/sqlite3/storage.ide-wal Binary files differnew file mode 100644 index 0000000..ad14e31 --- /dev/null +++ b/build/.vs/Asura/v15/Server/sqlite3/storage.ide-wal diff --git a/build/3rd-party/tinyxml2/tinyxml2.vcxproj b/build/3rd-party/tinyxml2/tinyxml2.vcxproj index a662caf..a7325e7 100644 --- a/build/3rd-party/tinyxml2/tinyxml2.vcxproj +++ b/build/3rd-party/tinyxml2/tinyxml2.vcxproj @@ -115,6 +115,10 @@ </Link> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\..\source\3rd-party\tinyxml2\tinyxml2.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\source\3rd-party\tinyxml2\tinyxml2.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/build/3rd-party/tinyxml2/tinyxml2.vcxproj.filters b/build/3rd-party/tinyxml2/tinyxml2.vcxproj.filters index 3c6f4fd..589da61 100644 --- a/build/3rd-party/tinyxml2/tinyxml2.vcxproj.filters +++ b/build/3rd-party/tinyxml2/tinyxml2.vcxproj.filters @@ -1,17 +1,9 @@ <?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\3rd-party\tinyxml2\tinyxml2.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\source\3rd-party\tinyxml2\tinyxml2.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 3765ed4..892c3e3 100644 --- a/build/Asura.Editor/Asura.Editor.vcxproj +++ b/build/Asura.Editor/Asura.Editor.vcxproj @@ -122,6 +122,7 @@ <ClCompile Include="..\..\source\Asura.Editor\layout\horizontal_layout.cpp" /> <ClCompile Include="..\..\source\Asura.Editor\layout\vertical_layout.cpp" /> <ClCompile Include="..\..\source\Asura.Editor\main.cpp" /> + <ClCompile Include="..\..\source\Asura.Editor\system\file_watcher.cpp" /> <ClCompile Include="..\..\source\Asura.Editor\widgets\binding\_button.cpp" /> <ClCompile Include="..\..\source\Asura.Editor\widgets\button.cpp" /> <ClCompile Include="..\..\source\Asura.Editor\widgets\checkbox.cpp" /> @@ -141,6 +142,7 @@ <ClInclude Include="..\..\source\Asura.Editor\editor.h" /> <ClInclude Include="..\..\source\Asura.Editor\layout\horizontal_layout.h" /> <ClInclude Include="..\..\source\Asura.Editor\layout\vertical_layout.h" /> + <ClInclude Include="..\..\source\Asura.Editor\system\file_watcher.h" /> <ClInclude Include="..\..\source\Asura.Editor\widgets\button.h" /> <ClInclude Include="..\..\source\Asura.Editor\widgets\checkbox.h" /> <ClInclude Include="..\..\source\Asura.Editor\widgets\hslider.h" /> diff --git a/build/Asura.Editor/Asura.Editor.vcxproj.filters b/build/Asura.Editor/Asura.Editor.vcxproj.filters index 8923f09..940a465 100644 --- a/build/Asura.Editor/Asura.Editor.vcxproj.filters +++ b/build/Asura.Editor/Asura.Editor.vcxproj.filters @@ -13,8 +13,8 @@ <Filter Include="widgets\binding"> <UniqueIdentifier>{4be11763-e2f9-47a4-8947-5326a517e286}</UniqueIdentifier> </Filter> - <Filter Include="script"> - <UniqueIdentifier>{48e88630-25b8-42f8-b76b-fa55bcce298d}</UniqueIdentifier> + <Filter Include="system"> + <UniqueIdentifier>{48600309-cddd-49cd-b939-7a19a2b1eaa3}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> @@ -60,6 +60,9 @@ <ClCompile Include="..\..\source\Asura.Editor\widgets\binding\_button.cpp"> <Filter>widgets\binding</Filter> </ClCompile> + <ClCompile Include="..\..\source\Asura.Editor\system\file_watcher.cpp"> + <Filter>system</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\source\Asura.Editor\widgets\button.h"> @@ -109,5 +112,8 @@ <ClInclude Include="..\..\source\Asura.Editor\core\slot.h"> <Filter>core</Filter> </ClInclude> + <ClInclude Include="..\..\source\Asura.Editor\system\file_watcher.h"> + <Filter>system</Filter> + </ClInclude> </ItemGroup> </Project>
\ No newline at end of file diff --git a/build/Asura.sln b/build/Asura.sln index 3bd9d61..c467d40 100644 --- a/build/Asura.sln +++ b/build/Asura.sln @@ -53,8 +53,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-openal", "libs\as EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-utils", "libs\asura-lib-utils\asura-lib-utils.vcxproj", "{7D41093F-E356-4C5B-A25F-41779BF86E54}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cembed", "3rd-party\cembed\cembed.vcxproj", "{53A48355-B4B3-4775-B1A0-FBB3E02C6A06}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01-cursor", "tests\01-cursor\01-cursor.vcxproj", "{52D4B84B-0FEB-419F-AED4-2FC896AA93CF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02-luax", "tests\02-luax\02-luax.vcxproj", "{CF6D513F-746A-4541-957A-C80492DF09C9}" @@ -79,334 +77,468 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-xml", "libs\asura EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-log", "libs\asura-lib-log\asura-lib-log.vcxproj", "{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "3rd-party\tinyxml\tinyxml.vcxproj", "{9891C064-C897-424E-8EB6-CAD09812E032}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Preprocessor", "Preprocessor\Preprocessor.vcxproj", "{983F6496-7BB2-48E3-B8F4-68C2600EA315}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-steam", "libs\asura-lib-steam\asura-lib-steam.vcxproj", "{129C3826-B418-4C80-A126-0319C7E2A857}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05-physfs", "tests\05-physfs\05-physfs.vcxproj", "{5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{25C8D2F8-989B-4742-859D-E2FDBB14EC2F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bindingGen", "tools\bindingGen\bindingGen.csproj", "{95CAC424-D558-43D0-88B0-C67AF1C4EE90}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cembed", "tools\cembed\cembed.vcxproj", "{68FB36CB-C478-4158-A0BC-905B65340AE9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml2", "3rd-party\tinyxml2\tinyxml2.vcxproj", "{883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "06-coroutine", "tests\06-coroutine\06-coroutine.vcxproj", "{C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-socket", "libs\asura-lib-socket\asura-lib-socket.vcxproj", "{FF8319D3-7ADC-41BC-A397-B31690A7AB5F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-http", "libs\asura-lib-http\asura-lib-http.vcxproj", "{DCD127A6-68B3-48CA-B769-0680C167D99B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Debug|Any CPU.ActiveCfg = Debug|Win32 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Debug|x64.ActiveCfg = Debug|x64 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Debug|x64.Build.0 = Debug|x64 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Debug|x86.ActiveCfg = Debug|Win32 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Debug|x86.Build.0 = Debug|Win32 + {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Release|Any CPU.ActiveCfg = Release|Win32 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Release|x64.ActiveCfg = Release|x64 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Release|x64.Build.0 = Release|x64 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Release|x86.ActiveCfg = Release|Win32 {1350CEE9-B2C2-426A-AF4E-F651D51DD592}.Release|x86.Build.0 = Release|Win32 + {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Debug|Any CPU.ActiveCfg = Debug|Win32 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Debug|x64.ActiveCfg = Debug|x64 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Debug|x64.Build.0 = Debug|x64 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Debug|x86.ActiveCfg = Debug|Win32 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Debug|x86.Build.0 = Debug|Win32 + {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Release|Any CPU.ActiveCfg = Release|Win32 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Release|x64.ActiveCfg = Release|x64 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Release|x64.Build.0 = Release|x64 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Release|x86.ActiveCfg = Release|Win32 {C0ED7D78-570B-454A-B3B6-576FDCB43D69}.Release|x86.Build.0 = Release|Win32 + {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Debug|Any CPU.ActiveCfg = Debug|Win32 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Debug|x64.ActiveCfg = Debug|x64 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Debug|x64.Build.0 = Debug|x64 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Debug|x86.ActiveCfg = Debug|Win32 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Debug|x86.Build.0 = Debug|Win32 + {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Release|Any CPU.ActiveCfg = Release|Win32 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Release|x64.ActiveCfg = Release|x64 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Release|x64.Build.0 = Release|x64 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Release|x86.ActiveCfg = Release|Win32 {8B8FCA14-FC8A-45B4-BF3C-9340CB586076}.Release|x86.Build.0 = Release|Win32 + {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Debug|Any CPU.ActiveCfg = Debug|Win32 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Debug|x64.ActiveCfg = Debug|x64 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Debug|x64.Build.0 = Debug|x64 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Debug|x86.ActiveCfg = Debug|Win32 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Debug|x86.Build.0 = Debug|Win32 + {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|Any CPU.ActiveCfg = Release|Win32 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|x64.ActiveCfg = Release|x64 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|x64.Build.0 = Release|x64 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|x86.ActiveCfg = Release|Win32 {6F250ED2-F61B-4EB6-BF01-9AFE1409E8D4}.Release|x86.Build.0 = Release|Win32 + {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|Any CPU.ActiveCfg = Debug|Win32 {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x64.ActiveCfg = Debug|x64 {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x64.Build.0 = Debug|x64 {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x86.ActiveCfg = Debug|Win32 {B8F9616D-5393-4B34-B191-D200D1985439}.Debug|x86.Build.0 = Debug|Win32 + {B8F9616D-5393-4B34-B191-D200D1985439}.Release|Any CPU.ActiveCfg = Release|Win32 {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x64.ActiveCfg = Release|x64 {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x64.Build.0 = Release|x64 {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x86.ActiveCfg = Release|Win32 {B8F9616D-5393-4B34-B191-D200D1985439}.Release|x86.Build.0 = Release|Win32 + {208B9CB8-2101-42A9-9502-0CF54912BC57}.Debug|Any CPU.ActiveCfg = Debug|Win32 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Debug|x64.ActiveCfg = Debug|x64 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Debug|x64.Build.0 = Debug|x64 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Debug|x86.ActiveCfg = Debug|Win32 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Debug|x86.Build.0 = Debug|Win32 + {208B9CB8-2101-42A9-9502-0CF54912BC57}.Release|Any CPU.ActiveCfg = Release|Win32 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Release|x64.ActiveCfg = Release|x64 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Release|x64.Build.0 = Release|x64 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Release|x86.ActiveCfg = Release|Win32 {208B9CB8-2101-42A9-9502-0CF54912BC57}.Release|x86.Build.0 = Release|Win32 + {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Debug|Any CPU.ActiveCfg = Debug|Win32 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Debug|x64.ActiveCfg = Debug|x64 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Debug|x64.Build.0 = Debug|x64 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Debug|x86.ActiveCfg = Debug|Win32 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Debug|x86.Build.0 = Debug|Win32 + {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Release|Any CPU.ActiveCfg = Release|Win32 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Release|x64.ActiveCfg = Release|x64 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Release|x64.Build.0 = Release|x64 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Release|x86.ActiveCfg = Release|Win32 {E34EAF11-27F4-41E9-BBC6-9CE5DE3359BA}.Release|x86.Build.0 = Release|Win32 + {AF237AA3-67F7-4C93-8249-920DB2878192}.Debug|Any CPU.ActiveCfg = Debug|Win32 {AF237AA3-67F7-4C93-8249-920DB2878192}.Debug|x64.ActiveCfg = Debug|x64 {AF237AA3-67F7-4C93-8249-920DB2878192}.Debug|x64.Build.0 = Debug|x64 {AF237AA3-67F7-4C93-8249-920DB2878192}.Debug|x86.ActiveCfg = Debug|Win32 {AF237AA3-67F7-4C93-8249-920DB2878192}.Debug|x86.Build.0 = Debug|Win32 + {AF237AA3-67F7-4C93-8249-920DB2878192}.Release|Any CPU.ActiveCfg = Release|Win32 {AF237AA3-67F7-4C93-8249-920DB2878192}.Release|x64.ActiveCfg = Release|x64 {AF237AA3-67F7-4C93-8249-920DB2878192}.Release|x64.Build.0 = Release|x64 {AF237AA3-67F7-4C93-8249-920DB2878192}.Release|x86.ActiveCfg = Release|Win32 {AF237AA3-67F7-4C93-8249-920DB2878192}.Release|x86.Build.0 = Release|Win32 + {38019689-27C2-488F-9C50-36CA6930CEB7}.Debug|Any CPU.ActiveCfg = Debug|Win32 {38019689-27C2-488F-9C50-36CA6930CEB7}.Debug|x64.ActiveCfg = Debug|x64 {38019689-27C2-488F-9C50-36CA6930CEB7}.Debug|x64.Build.0 = Debug|x64 {38019689-27C2-488F-9C50-36CA6930CEB7}.Debug|x86.ActiveCfg = Debug|Win32 {38019689-27C2-488F-9C50-36CA6930CEB7}.Debug|x86.Build.0 = Debug|Win32 + {38019689-27C2-488F-9C50-36CA6930CEB7}.Release|Any CPU.ActiveCfg = Release|Win32 {38019689-27C2-488F-9C50-36CA6930CEB7}.Release|x64.ActiveCfg = Release|x64 {38019689-27C2-488F-9C50-36CA6930CEB7}.Release|x64.Build.0 = Release|x64 {38019689-27C2-488F-9C50-36CA6930CEB7}.Release|x86.ActiveCfg = Release|Win32 {38019689-27C2-488F-9C50-36CA6930CEB7}.Release|x86.Build.0 = Release|Win32 + {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Debug|Any CPU.ActiveCfg = Debug|Win32 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Debug|x64.ActiveCfg = Debug|x64 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Debug|x64.Build.0 = Debug|x64 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Debug|x86.ActiveCfg = Debug|Win32 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Debug|x86.Build.0 = Debug|Win32 + {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Release|Any CPU.ActiveCfg = Release|Win32 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Release|x64.ActiveCfg = Release|x64 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Release|x64.Build.0 = Release|x64 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Release|x86.ActiveCfg = Release|Win32 {83E0897A-E2F4-4057-8077-59C4A0C38E56}.Release|x86.Build.0 = Release|Win32 + {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Debug|Any CPU.ActiveCfg = Debug|Win32 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Debug|x64.ActiveCfg = Debug|x64 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Debug|x64.Build.0 = Debug|x64 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Debug|x86.ActiveCfg = Debug|Win32 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Debug|x86.Build.0 = Debug|Win32 + {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|Any CPU.ActiveCfg = Release|Win32 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x64.ActiveCfg = Release|x64 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x64.Build.0 = Release|x64 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x86.ActiveCfg = Release|Win32 {4122CC44-1E4C-4A08-B16F-1A650585EBD4}.Release|x86.Build.0 = Release|Win32 + {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Debug|Any CPU.ActiveCfg = Debug|Win32 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Debug|x64.ActiveCfg = Debug|x64 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Debug|x64.Build.0 = Debug|x64 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Debug|x86.ActiveCfg = Debug|Win32 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Debug|x86.Build.0 = Debug|Win32 + {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Release|Any CPU.ActiveCfg = Release|Win32 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Release|x64.ActiveCfg = Release|x64 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Release|x64.Build.0 = Release|x64 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Release|x86.ActiveCfg = Release|Win32 {3CD80326-A2FE-4073-8B1A-73E166C9A2AE}.Release|x86.Build.0 = Release|Win32 + {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|Any CPU.ActiveCfg = Debug|Win32 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x64.ActiveCfg = Debug|x64 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x64.Build.0 = Debug|x64 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x86.ActiveCfg = Debug|Win32 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Debug|x86.Build.0 = Debug|Win32 + {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|Any CPU.ActiveCfg = Release|Win32 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x64.ActiveCfg = Release|x64 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x64.Build.0 = Release|x64 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x86.ActiveCfg = Release|Win32 {4B970273-A352-433B-98B2-B4BF6DF72F71}.Release|x86.Build.0 = Release|Win32 + {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Debug|Any CPU.ActiveCfg = Debug|Win32 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Debug|x64.ActiveCfg = Debug|x64 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Debug|x64.Build.0 = Debug|x64 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Debug|x86.ActiveCfg = Debug|Win32 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Debug|x86.Build.0 = Debug|Win32 + {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Release|Any CPU.ActiveCfg = Release|Win32 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Release|x64.ActiveCfg = Release|x64 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Release|x64.Build.0 = Release|x64 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Release|x86.ActiveCfg = Release|Win32 {5AE9F39B-1885-4F81-96B1-121BB64F9939}.Release|x86.Build.0 = Release|Win32 + {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Debug|Any CPU.ActiveCfg = Debug|Win32 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Debug|x64.ActiveCfg = Debug|x64 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Debug|x64.Build.0 = Debug|x64 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Debug|x86.ActiveCfg = Debug|Win32 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Debug|x86.Build.0 = Debug|Win32 + {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Release|Any CPU.ActiveCfg = Release|Win32 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Release|x64.ActiveCfg = Release|x64 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Release|x64.Build.0 = Release|x64 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Release|x86.ActiveCfg = Release|Win32 {6BA52BBB-8DA5-4F51-BE3F-1E49F5089498}.Release|x86.Build.0 = Release|Win32 + {294889EA-93DE-4580-BF9D-87F605B229AA}.Debug|Any CPU.ActiveCfg = Debug|Win32 {294889EA-93DE-4580-BF9D-87F605B229AA}.Debug|x64.ActiveCfg = Debug|x64 {294889EA-93DE-4580-BF9D-87F605B229AA}.Debug|x64.Build.0 = Debug|x64 {294889EA-93DE-4580-BF9D-87F605B229AA}.Debug|x86.ActiveCfg = Debug|Win32 {294889EA-93DE-4580-BF9D-87F605B229AA}.Debug|x86.Build.0 = Debug|Win32 + {294889EA-93DE-4580-BF9D-87F605B229AA}.Release|Any CPU.ActiveCfg = Release|Win32 {294889EA-93DE-4580-BF9D-87F605B229AA}.Release|x64.ActiveCfg = Release|x64 {294889EA-93DE-4580-BF9D-87F605B229AA}.Release|x64.Build.0 = Release|x64 {294889EA-93DE-4580-BF9D-87F605B229AA}.Release|x86.ActiveCfg = Release|Win32 {294889EA-93DE-4580-BF9D-87F605B229AA}.Release|x86.Build.0 = Release|Win32 + {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Debug|Any CPU.ActiveCfg = Debug|Win32 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Debug|x64.ActiveCfg = Debug|x64 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Debug|x64.Build.0 = Debug|x64 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Debug|x86.ActiveCfg = Debug|Win32 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Debug|x86.Build.0 = Debug|Win32 + {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|Any CPU.ActiveCfg = Release|Win32 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|x64.ActiveCfg = Release|x64 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|x64.Build.0 = Release|x64 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|x86.ActiveCfg = Release|Win32 {AEE37589-DE0D-4139-8BDB-8179FDEFB835}.Release|x86.Build.0 = Release|Win32 + {29A6837A-67FA-403F-83FD-E7975649404F}.Debug|Any CPU.ActiveCfg = Debug|Win32 {29A6837A-67FA-403F-83FD-E7975649404F}.Debug|x64.ActiveCfg = Debug|x64 {29A6837A-67FA-403F-83FD-E7975649404F}.Debug|x64.Build.0 = Debug|x64 {29A6837A-67FA-403F-83FD-E7975649404F}.Debug|x86.ActiveCfg = Debug|Win32 {29A6837A-67FA-403F-83FD-E7975649404F}.Debug|x86.Build.0 = Debug|Win32 + {29A6837A-67FA-403F-83FD-E7975649404F}.Release|Any CPU.ActiveCfg = Release|Win32 {29A6837A-67FA-403F-83FD-E7975649404F}.Release|x64.ActiveCfg = Release|x64 {29A6837A-67FA-403F-83FD-E7975649404F}.Release|x64.Build.0 = Release|x64 {29A6837A-67FA-403F-83FD-E7975649404F}.Release|x86.ActiveCfg = Release|Win32 {29A6837A-67FA-403F-83FD-E7975649404F}.Release|x86.Build.0 = Release|Win32 + {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Debug|Any CPU.ActiveCfg = Debug|Win32 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Debug|x64.ActiveCfg = Debug|x64 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Debug|x64.Build.0 = Debug|x64 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Debug|x86.ActiveCfg = Debug|Win32 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Debug|x86.Build.0 = Debug|Win32 + {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Release|Any CPU.ActiveCfg = Release|Win32 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Release|x64.ActiveCfg = Release|x64 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Release|x64.Build.0 = Release|x64 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Release|x86.ActiveCfg = Release|Win32 {ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}.Release|x86.Build.0 = Release|Win32 + {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Debug|Any CPU.ActiveCfg = Debug|Win32 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Debug|x64.ActiveCfg = Debug|x64 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Debug|x64.Build.0 = Debug|x64 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Debug|x86.ActiveCfg = Debug|Win32 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Debug|x86.Build.0 = Debug|Win32 + {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Release|Any CPU.ActiveCfg = Release|Win32 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Release|x64.ActiveCfg = Release|x64 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Release|x64.Build.0 = Release|x64 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Release|x86.ActiveCfg = Release|Win32 {CB05752F-B785-4715-9AA3-818C15ABA5F0}.Release|x86.Build.0 = Release|Win32 + {088C6ABA-26A6-43D1-8492-096EDB65597C}.Debug|Any CPU.ActiveCfg = Debug|Win32 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Debug|x64.ActiveCfg = Debug|x64 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Debug|x64.Build.0 = Debug|x64 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Debug|x86.ActiveCfg = Debug|Win32 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Debug|x86.Build.0 = Debug|Win32 + {088C6ABA-26A6-43D1-8492-096EDB65597C}.Release|Any CPU.ActiveCfg = Release|Win32 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Release|x64.ActiveCfg = Release|x64 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Release|x64.Build.0 = Release|x64 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Release|x86.ActiveCfg = Release|Win32 {088C6ABA-26A6-43D1-8492-096EDB65597C}.Release|x86.Build.0 = Release|Win32 + {7D41093F-E356-4C5B-A25F-41779BF86E54}.Debug|Any CPU.ActiveCfg = Debug|Win32 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Debug|x64.ActiveCfg = Debug|x64 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Debug|x64.Build.0 = Debug|x64 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Debug|x86.ActiveCfg = Debug|Win32 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Debug|x86.Build.0 = Debug|Win32 + {7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|Any CPU.ActiveCfg = Release|Win32 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|x64.ActiveCfg = Release|x64 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|x64.Build.0 = Release|x64 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|x86.ActiveCfg = Release|Win32 {7D41093F-E356-4C5B-A25F-41779BF86E54}.Release|x86.Build.0 = Release|Win32 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Debug|x64.ActiveCfg = Debug|x64 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Debug|x64.Build.0 = Debug|x64 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Debug|x86.ActiveCfg = Debug|Win32 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Debug|x86.Build.0 = Debug|Win32 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Release|x64.ActiveCfg = Release|x64 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Release|x64.Build.0 = Release|x64 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Release|x86.ActiveCfg = Release|Win32 - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06}.Release|x86.Build.0 = Release|Win32 + {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Debug|Any CPU.ActiveCfg = Debug|Win32 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Debug|x64.ActiveCfg = Debug|x64 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Debug|x64.Build.0 = Debug|x64 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Debug|x86.ActiveCfg = Debug|Win32 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Debug|x86.Build.0 = Debug|Win32 + {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Release|Any CPU.ActiveCfg = Release|Win32 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Release|x64.ActiveCfg = Release|x64 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Release|x64.Build.0 = Release|x64 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Release|x86.ActiveCfg = Release|Win32 {52D4B84B-0FEB-419F-AED4-2FC896AA93CF}.Release|x86.Build.0 = Release|Win32 + {CF6D513F-746A-4541-957A-C80492DF09C9}.Debug|Any CPU.ActiveCfg = Debug|Win32 {CF6D513F-746A-4541-957A-C80492DF09C9}.Debug|x64.ActiveCfg = Debug|x64 {CF6D513F-746A-4541-957A-C80492DF09C9}.Debug|x64.Build.0 = Debug|x64 {CF6D513F-746A-4541-957A-C80492DF09C9}.Debug|x86.ActiveCfg = Debug|Win32 {CF6D513F-746A-4541-957A-C80492DF09C9}.Debug|x86.Build.0 = Debug|Win32 + {CF6D513F-746A-4541-957A-C80492DF09C9}.Release|Any CPU.ActiveCfg = Release|Win32 {CF6D513F-746A-4541-957A-C80492DF09C9}.Release|x64.ActiveCfg = Release|x64 {CF6D513F-746A-4541-957A-C80492DF09C9}.Release|x64.Build.0 = Release|x64 {CF6D513F-746A-4541-957A-C80492DF09C9}.Release|x86.ActiveCfg = Release|Win32 {CF6D513F-746A-4541-957A-C80492DF09C9}.Release|x86.Build.0 = Release|Win32 + {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Debug|Any CPU.ActiveCfg = Debug|Win32 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Debug|x64.ActiveCfg = Debug|x64 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Debug|x64.Build.0 = Debug|x64 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Debug|x86.ActiveCfg = Debug|Win32 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Debug|x86.Build.0 = Debug|Win32 + {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Release|Any CPU.ActiveCfg = Release|Win32 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Release|x64.ActiveCfg = Release|x64 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Release|x64.Build.0 = Release|x64 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Release|x86.ActiveCfg = Release|Win32 {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5}.Release|x86.Build.0 = Release|Win32 + {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Debug|Any CPU.ActiveCfg = Debug|Win32 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Debug|x64.ActiveCfg = Debug|x64 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Debug|x64.Build.0 = Debug|x64 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Debug|x86.ActiveCfg = Debug|Win32 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Debug|x86.Build.0 = Debug|Win32 + {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Release|Any CPU.ActiveCfg = Release|Win32 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Release|x64.ActiveCfg = Release|x64 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Release|x64.Build.0 = Release|x64 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Release|x86.ActiveCfg = Release|Win32 {38090AEB-3AA9-489B-BBEC-0CEDF9EAC0DE}.Release|x86.Build.0 = Release|Win32 + {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Debug|Any CPU.ActiveCfg = Debug|Win32 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Debug|x64.ActiveCfg = Debug|x64 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Debug|x64.Build.0 = Debug|x64 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Debug|x86.ActiveCfg = Debug|Win32 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Debug|x86.Build.0 = Debug|Win32 + {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Release|Any CPU.ActiveCfg = Release|Win32 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Release|x64.ActiveCfg = Release|x64 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Release|x64.Build.0 = Release|x64 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Release|x86.ActiveCfg = Release|Win32 {0AE416B4-648D-42F4-9E93-9DF4167F5614}.Release|x86.Build.0 = Release|Win32 + {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Debug|Any CPU.ActiveCfg = Debug|Win32 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Debug|x64.ActiveCfg = Debug|x64 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Debug|x64.Build.0 = Debug|x64 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Debug|x86.ActiveCfg = Debug|Win32 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Debug|x86.Build.0 = Debug|Win32 + {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Release|Any CPU.ActiveCfg = Release|Win32 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Release|x64.ActiveCfg = Release|x64 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Release|x64.Build.0 = Release|x64 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Release|x86.ActiveCfg = Release|Win32 {E21A839A-C7C6-4B83-89FB-C921AEBEA9CD}.Release|x86.Build.0 = Release|Win32 + {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Debug|Any CPU.ActiveCfg = Debug|Win32 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Debug|x64.ActiveCfg = Debug|x64 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Debug|x64.Build.0 = Debug|x64 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Debug|x86.ActiveCfg = Debug|Win32 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Debug|x86.Build.0 = Debug|Win32 + {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Release|Any CPU.ActiveCfg = Release|Win32 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Release|x64.ActiveCfg = Release|x64 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Release|x64.Build.0 = Release|x64 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Release|x86.ActiveCfg = Release|Win32 {0227A614-88E0-4482-8AE4-5C1A3F6EED2C}.Release|x86.Build.0 = Release|Win32 + {57A3232A-FD44-46EB-B860-7CAB3929810F}.Debug|Any CPU.ActiveCfg = Debug|Win32 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Debug|x64.ActiveCfg = Debug|x64 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Debug|x64.Build.0 = Debug|x64 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Debug|x86.ActiveCfg = Debug|Win32 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Debug|x86.Build.0 = Debug|Win32 + {57A3232A-FD44-46EB-B860-7CAB3929810F}.Release|Any CPU.ActiveCfg = Release|Win32 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Release|x64.ActiveCfg = Release|x64 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Release|x64.Build.0 = Release|x64 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Release|x86.ActiveCfg = Release|Win32 {57A3232A-FD44-46EB-B860-7CAB3929810F}.Release|x86.Build.0 = Release|Win32 + {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Debug|Any CPU.ActiveCfg = Debug|Win32 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Debug|x64.ActiveCfg = Debug|x64 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Debug|x64.Build.0 = Debug|x64 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Debug|x86.ActiveCfg = Debug|Win32 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Debug|x86.Build.0 = Debug|Win32 + {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Release|Any CPU.ActiveCfg = Release|Win32 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Release|x64.ActiveCfg = Release|x64 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Release|x64.Build.0 = Release|x64 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Release|x86.ActiveCfg = Release|Win32 {234E1397-269B-4A6A-9B4D-08EDBFFF210E}.Release|x86.Build.0 = Release|Win32 + {1B83A353-9694-42E0-997E-79E150E1C2E5}.Debug|Any CPU.ActiveCfg = Debug|Win32 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Debug|x64.ActiveCfg = Debug|x64 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Debug|x64.Build.0 = Debug|x64 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Debug|x86.ActiveCfg = Debug|Win32 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Debug|x86.Build.0 = Debug|Win32 + {1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|Any CPU.ActiveCfg = Release|Win32 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|x64.ActiveCfg = Release|x64 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|x64.Build.0 = Release|x64 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|x86.ActiveCfg = Release|Win32 {1B83A353-9694-42E0-997E-79E150E1C2E5}.Release|x86.Build.0 = Release|Win32 + {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|Any CPU.ActiveCfg = Debug|Win32 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x64.ActiveCfg = Debug|x64 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x64.Build.0 = Debug|x64 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x86.ActiveCfg = Debug|Win32 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Debug|x86.Build.0 = Debug|Win32 + {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|Any CPU.ActiveCfg = Release|Win32 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x64.ActiveCfg = Release|x64 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x64.Build.0 = Release|x64 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x86.ActiveCfg = Release|Win32 {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}.Release|x86.Build.0 = Release|Win32 + {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|Any CPU.ActiveCfg = Debug|Win32 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x64.ActiveCfg = Debug|x64 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x64.Build.0 = Debug|x64 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x86.ActiveCfg = Debug|Win32 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Debug|x86.Build.0 = Debug|Win32 + {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|Any CPU.ActiveCfg = Release|Win32 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x64.ActiveCfg = Release|x64 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x64.Build.0 = Release|x64 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x86.ActiveCfg = Release|Win32 {73B0F8AB-EF5A-412A-9E34-0FD2574766B7}.Release|x86.Build.0 = Release|Win32 - {9891C064-C897-424E-8EB6-CAD09812E032}.Debug|x64.ActiveCfg = Debug|x64 - {9891C064-C897-424E-8EB6-CAD09812E032}.Debug|x64.Build.0 = Debug|x64 - {9891C064-C897-424E-8EB6-CAD09812E032}.Debug|x86.ActiveCfg = Debug|Win32 - {9891C064-C897-424E-8EB6-CAD09812E032}.Debug|x86.Build.0 = Debug|Win32 - {9891C064-C897-424E-8EB6-CAD09812E032}.Release|x64.ActiveCfg = Release|x64 - {9891C064-C897-424E-8EB6-CAD09812E032}.Release|x64.Build.0 = Release|x64 - {9891C064-C897-424E-8EB6-CAD09812E032}.Release|x86.ActiveCfg = Release|Win32 - {9891C064-C897-424E-8EB6-CAD09812E032}.Release|x86.Build.0 = Release|Win32 + {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Debug|Any CPU.ActiveCfg = Debug|Win32 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Debug|x64.ActiveCfg = Debug|x64 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Debug|x64.Build.0 = Debug|x64 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Debug|x86.ActiveCfg = Debug|Win32 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Debug|x86.Build.0 = Debug|Win32 + {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Release|Any CPU.ActiveCfg = Release|Win32 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Release|x64.ActiveCfg = Release|x64 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Release|x64.Build.0 = Release|x64 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Release|x86.ActiveCfg = Release|Win32 {983F6496-7BB2-48E3-B8F4-68C2600EA315}.Release|x86.Build.0 = Release|Win32 + {129C3826-B418-4C80-A126-0319C7E2A857}.Debug|Any CPU.ActiveCfg = Debug|Win32 {129C3826-B418-4C80-A126-0319C7E2A857}.Debug|x64.ActiveCfg = Debug|x64 {129C3826-B418-4C80-A126-0319C7E2A857}.Debug|x64.Build.0 = Debug|x64 {129C3826-B418-4C80-A126-0319C7E2A857}.Debug|x86.ActiveCfg = Debug|Win32 {129C3826-B418-4C80-A126-0319C7E2A857}.Debug|x86.Build.0 = Debug|Win32 + {129C3826-B418-4C80-A126-0319C7E2A857}.Release|Any CPU.ActiveCfg = Release|Win32 {129C3826-B418-4C80-A126-0319C7E2A857}.Release|x64.ActiveCfg = Release|x64 {129C3826-B418-4C80-A126-0319C7E2A857}.Release|x64.Build.0 = Release|x64 {129C3826-B418-4C80-A126-0319C7E2A857}.Release|x86.ActiveCfg = Release|Win32 {129C3826-B418-4C80-A126-0319C7E2A857}.Release|x86.Build.0 = Release|Win32 + {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Debug|Any CPU.ActiveCfg = Debug|Win32 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Debug|x64.ActiveCfg = Debug|x64 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Debug|x64.Build.0 = Debug|x64 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Debug|x86.ActiveCfg = Debug|Win32 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Debug|x86.Build.0 = Debug|Win32 + {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Release|Any CPU.ActiveCfg = Release|Win32 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Release|x64.ActiveCfg = Release|x64 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Release|x64.Build.0 = Release|x64 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Release|x86.ActiveCfg = Release|Win32 {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}.Release|x86.Build.0 = Release|Win32 + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Debug|Any CPU.Build.0 = Debug|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Debug|x64.ActiveCfg = Debug|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Debug|x64.Build.0 = Debug|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Debug|x86.ActiveCfg = Debug|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Debug|x86.Build.0 = Debug|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Release|Any CPU.ActiveCfg = Release|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Release|Any CPU.Build.0 = Release|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Release|x64.ActiveCfg = Release|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Release|x64.Build.0 = Release|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Release|x86.ActiveCfg = Release|Any CPU + {95CAC424-D558-43D0-88B0-C67AF1C4EE90}.Release|x86.Build.0 = Release|Any CPU + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Debug|x64.ActiveCfg = Debug|x64 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Debug|x64.Build.0 = Debug|x64 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Debug|x86.ActiveCfg = Debug|Win32 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Debug|x86.Build.0 = Debug|Win32 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Release|Any CPU.ActiveCfg = Release|Win32 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Release|x64.ActiveCfg = Release|x64 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Release|x64.Build.0 = Release|x64 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Release|x86.ActiveCfg = Release|Win32 + {68FB36CB-C478-4158-A0BC-905B65340AE9}.Release|x86.Build.0 = Release|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x64.ActiveCfg = Debug|x64 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x64.Build.0 = Debug|x64 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x86.ActiveCfg = Debug|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Debug|x86.Build.0 = Debug|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|Any CPU.ActiveCfg = Release|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x64.ActiveCfg = Release|x64 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x64.Build.0 = Release|x64 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x86.ActiveCfg = Release|Win32 + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226}.Release|x86.Build.0 = Release|Win32 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Debug|x64.ActiveCfg = Debug|x64 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Debug|x64.Build.0 = Debug|x64 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Debug|x86.ActiveCfg = Debug|Win32 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Debug|x86.Build.0 = Debug|Win32 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Release|Any CPU.ActiveCfg = Release|Win32 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Release|x64.ActiveCfg = Release|x64 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Release|x64.Build.0 = Release|x64 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Release|x86.ActiveCfg = Release|Win32 + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}.Release|x86.Build.0 = Release|Win32 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Debug|x64.ActiveCfg = Debug|x64 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Debug|x64.Build.0 = Debug|x64 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Debug|x86.ActiveCfg = Debug|Win32 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Debug|x86.Build.0 = Debug|Win32 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Release|Any CPU.ActiveCfg = Release|Win32 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Release|x64.ActiveCfg = Release|x64 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Release|x64.Build.0 = Release|x64 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Release|x86.ActiveCfg = Release|Win32 + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F}.Release|x86.Build.0 = Release|Win32 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Debug|x64.ActiveCfg = Debug|x64 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Debug|x64.Build.0 = Debug|x64 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Debug|x86.ActiveCfg = Debug|Win32 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Debug|x86.Build.0 = Debug|Win32 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Release|Any CPU.ActiveCfg = Release|Win32 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Release|x64.ActiveCfg = Release|x64 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Release|x64.Build.0 = Release|x64 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Release|x86.ActiveCfg = Release|Win32 + {DCD127A6-68B3-48CA-B769-0680C167D99B}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -434,7 +566,6 @@ Global {CB05752F-B785-4715-9AA3-818C15ABA5F0} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {088C6ABA-26A6-43D1-8492-096EDB65597C} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {7D41093F-E356-4C5B-A25F-41779BF86E54} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} - {53A48355-B4B3-4775-B1A0-FBB3E02C6A06} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {52D4B84B-0FEB-419F-AED4-2FC896AA93CF} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} {CF6D513F-746A-4541-957A-C80492DF09C9} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} {41599A7C-B1F2-4D95-90CF-DB74AC4C7FA5} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} @@ -442,9 +573,14 @@ Global {1B83A353-9694-42E0-997E-79E150E1C2E5} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {73B0F8AB-EF5A-412A-9E34-0FD2574766B7} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} - {9891C064-C897-424E-8EB6-CAD09812E032} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {129C3826-B418-4C80-A126-0319C7E2A857} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {5BECAAB3-9C80-4A62-99BB-E48F4667D9CD} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} + {95CAC424-D558-43D0-88B0-C67AF1C4EE90} = {25C8D2F8-989B-4742-859D-E2FDBB14EC2F} + {68FB36CB-C478-4158-A0BC-905B65340AE9} = {25C8D2F8-989B-4742-859D-E2FDBB14EC2F} + {883BC26A-4C9E-44B3-B5C0-7F3E4EDC0226} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} + {C3CD1252-3C8D-45E2-B784-D0016E7F0BD3} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} + {FF8319D3-7ADC-41BC-A397-B31690A7AB5F} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} + {DCD127A6-68B3-48CA-B769-0680C167D99B} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git a/build/Preprocessor/Preprocessor.vcxproj b/build/Preprocessor/Preprocessor.vcxproj index 9fe75d2..5d9d036 100644 --- a/build/Preprocessor/Preprocessor.vcxproj +++ b/build/Preprocessor/Preprocessor.vcxproj @@ -115,6 +115,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="..\..\source\Preprocessor\main.cpp" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/build/Preprocessor/Preprocessor.vcxproj.filters b/build/Preprocessor/Preprocessor.vcxproj.filters index 3c6f4fd..27db1a6 100644 --- a/build/Preprocessor/Preprocessor.vcxproj.filters +++ b/build/Preprocessor/Preprocessor.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\Preprocessor\main.cpp" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/build/libs/asura-lib-core/asura-lib-core.vcxproj b/build/libs/asura-lib-core/asura-lib-core.vcxproj index c19c581..d69e2f0 100644 --- a/build/libs/asura-lib-core/asura-lib-core.vcxproj +++ b/build/libs/asura-lib-core/asura-lib-core.vcxproj @@ -118,30 +118,18 @@ </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\..\..\source\libs\asura-lib-core\application.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_application.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_cursor.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_thread.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_window.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\core_module.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\font\glyph.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\font\string.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\font\ttf.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_canvas.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_color.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_gif.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_image.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_image_data.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_mesh2d.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_mesh2d_data.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_shader.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_sprite_batch.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_window.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\canvas.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\color.cpp" /> + <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\color32.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\gif.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\gl.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\image.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\image_data.cpp" /> + <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\image_decode_task.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\mesh2d.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\mesh2d_data.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\png_decoder.cpp" /> @@ -153,24 +141,17 @@ <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\stb_decoder.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\texture.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\window.cpp" /> + <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_sdl.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\clipboard.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\cursor.cpp" /> + <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\cursor_impl_sdl.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\keyboard.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\mouse.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\profiler\stats.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\threading\binding\_coroutine.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\threading\binding\_thread.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\threading\coroutine.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\threading\thread.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-core\time\timer.cpp" /> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\source\libs\asura-lib-core\application.h" /> - <ClInclude Include="..\..\..\source\libs\asura-lib-core\client\client.h" /> - <ClInclude Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_application.h" /> - <ClInclude Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_cursor.h" /> - <ClInclude Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_thread.h" /> - <ClInclude Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_window.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\core_config.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\core_module.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\font\glyph.h" /> @@ -180,12 +161,14 @@ <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\blend_mode.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\canvas.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\color.h" /> + <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\color32.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\color_palette.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\gif.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\gl.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\image.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\image_data.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\image_decoder.h" /> + <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\image_decode_task.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\mesh2d.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\mesh2d_data.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\pixel_format.h" /> @@ -199,16 +182,16 @@ <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\stb_decoder.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\texture.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\window.h" /> + <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_sdl.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\clipboard.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\cursor.h" /> + <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\cursor_impl_sdl.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\event.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\input_device.hpp" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\joypad.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\keyboard.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\mouse.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\profiler\stats.h" /> - <ClInclude Include="..\..\..\source\libs\asura-lib-core\threading\coroutine.h" /> - <ClInclude Include="..\..\..\source\libs\asura-lib-core\threading\thread.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\time\timer.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\type.h" /> </ItemGroup> diff --git a/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters b/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters index 064cb2d..68b3ddc 100644 --- a/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters +++ b/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters @@ -16,24 +16,6 @@ <Filter Include="time"> <UniqueIdentifier>{81dedac2-8d27-4c19-bf40-1503f0dbad1b}</UniqueIdentifier> </Filter> - <Filter Include="graphics\binding"> - <UniqueIdentifier>{8457aa11-9956-49f4-9410-d54c3022dbe4}</UniqueIdentifier> - </Filter> - <Filter Include="client"> - <UniqueIdentifier>{1d0e7b78-1daa-44e4-ae94-d205d66f48f8}</UniqueIdentifier> - </Filter> - <Filter Include="client\sdl"> - <UniqueIdentifier>{4cf7bb4a-566e-4e71-a1e1-7e6e749f0b0e}</UniqueIdentifier> - </Filter> - <Filter Include="client\glut"> - <UniqueIdentifier>{c88e6733-13f6-4c25-9ffe-b162ad8b31cd}</UniqueIdentifier> - </Filter> - <Filter Include="threading"> - <UniqueIdentifier>{d6f2001c-3947-4674-8793-f6d8c4aa8078}</UniqueIdentifier> - </Filter> - <Filter Include="threading\binding"> - <UniqueIdentifier>{ce11bd01-5b5c-4b5f-ad67-bd54db8b277c}</UniqueIdentifier> - </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\source\libs\asura-lib-core\application.cpp" /> @@ -115,60 +97,18 @@ <ClCompile Include="..\..\..\source\libs\asura-lib-core\profiler\stats.cpp"> <Filter>profiler</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_application.cpp"> - <Filter>client\sdl</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_cursor.cpp"> - <Filter>client\sdl</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_window.cpp"> - <Filter>client\sdl</Filter> - </ClCompile> <ClCompile Include="..\..\..\source\libs\asura-lib-core\core_module.cpp" /> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_thread.cpp"> - <Filter>client\sdl</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_canvas.cpp"> - <Filter>graphics\binding</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_color.cpp"> - <Filter>graphics\binding</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_gif.cpp"> - <Filter>graphics\binding</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_image.cpp"> - <Filter>graphics\binding</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_image_data.cpp"> - <Filter>graphics\binding</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_mesh2d.cpp"> - <Filter>graphics\binding</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_mesh2d_data.cpp"> - <Filter>graphics\binding</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_shader.cpp"> - <Filter>graphics\binding</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_sprite_batch.cpp"> - <Filter>graphics\binding</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_window.cpp"> - <Filter>graphics\binding</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\threading\coroutine.cpp"> - <Filter>threading</Filter> + <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\color32.cpp"> + <Filter>graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\threading\thread.cpp"> - <Filter>threading</Filter> + <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_sdl.cpp"> + <Filter>graphics</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\threading\binding\_coroutine.cpp"> - <Filter>threading\binding</Filter> + <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\cursor_impl_sdl.cpp"> + <Filter>input</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\libs\asura-lib-core\threading\binding\_thread.cpp"> - <Filter>threading\binding</Filter> + <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\image_decode_task.cpp"> + <Filter>graphics</Filter> </ClCompile> </ItemGroup> <ItemGroup> @@ -272,23 +212,8 @@ <ClInclude Include="..\..\..\source\libs\asura-lib-core\profiler\stats.h"> <Filter>profiler</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\libs\asura-lib-core\client\client.h"> - <Filter>client</Filter> - </ClInclude> - <ClInclude Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_application.h"> - <Filter>client\sdl</Filter> - </ClInclude> - <ClInclude Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_cursor.h"> - <Filter>client\sdl</Filter> - </ClInclude> - <ClInclude Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_window.h"> - <Filter>client\sdl</Filter> - </ClInclude> <ClInclude Include="..\..\..\source\libs\asura-lib-core\core_module.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\type.h" /> - <ClInclude Include="..\..\..\source\libs\asura-lib-core\client\sdl\sdl_thread.h"> - <Filter>client\sdl</Filter> - </ClInclude> <ClInclude Include="..\..\..\source\libs\asura-lib-core\core_config.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\event.h"> <Filter>input</Filter> @@ -296,11 +221,17 @@ <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\joypad.h"> <Filter>input</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\libs\asura-lib-core\threading\coroutine.h"> - <Filter>threading</Filter> + <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\color32.h"> + <Filter>graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\window_impl_sdl.h"> + <Filter>graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\cursor_impl_sdl.h"> + <Filter>input</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\libs\asura-lib-core\threading\thread.h"> - <Filter>threading</Filter> + <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\image_decode_task.h"> + <Filter>graphics</Filter> </ClInclude> </ItemGroup> <ItemGroup> diff --git a/build/libs/asura-lib-http/asura-lib-http.vcxproj b/build/libs/asura-lib-http/asura-lib-http.vcxproj new file mode 100644 index 0000000..bf15337 --- /dev/null +++ b/build/libs/asura-lib-http/asura-lib-http.vcxproj @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{DCD127A6-68B3-48CA-B769-0680C167D99B}</ProjectGuid> + <RootNamespace>asuralibhttp</RootNamespace> + <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/build/libs/asura-lib-http/asura-lib-http.vcxproj.filters b/build/libs/asura-lib-http/asura-lib-http.vcxproj.filters new file mode 100644 index 0000000..3c6f4fd --- /dev/null +++ b/build/libs/asura-lib-http/asura-lib-http.vcxproj.filters @@ -0,0 +1,17 @@ +<?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> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/build/libs/asura-lib-http/asura-lib-http.vcxproj.user b/build/libs/asura-lib-http/asura-lib-http.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/libs/asura-lib-http/asura-lib-http.vcxproj.user @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup /> +</Project>
\ No newline at end of file diff --git a/build/libs/asura-lib-socket/asura-lib-socket.vcxproj b/build/libs/asura-lib-socket/asura-lib-socket.vcxproj new file mode 100644 index 0000000..4b7b44c --- /dev/null +++ b/build/libs/asura-lib-socket/asura-lib-socket.vcxproj @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{FF8319D3-7ADC-41BC-A397-B31690A7AB5F}</ProjectGuid> + <RootNamespace>asuralibsocket</RootNamespace> + <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/build/libs/asura-lib-socket/asura-lib-socket.vcxproj.filters b/build/libs/asura-lib-socket/asura-lib-socket.vcxproj.filters new file mode 100644 index 0000000..9cd8510 --- /dev/null +++ b/build/libs/asura-lib-socket/asura-lib-socket.vcxproj.filters @@ -0,0 +1,2 @@ +<?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 diff --git a/build/libs/asura-lib-socket/asura-lib-socket.vcxproj.user b/build/libs/asura-lib-socket/asura-lib-socket.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/libs/asura-lib-socket/asura-lib-socket.vcxproj.user @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup /> +</Project>
\ No newline at end of file diff --git a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj b/build/libs/asura-lib-utils/asura-lib-utils.vcxproj index 770df4a..2a97e55 100644 --- a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj +++ b/build/libs/asura-lib-utils/asura-lib-utils.vcxproj @@ -134,12 +134,21 @@ <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\file.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\file_data.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\file_system.cpp" /> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\io_task.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\curve.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\functions.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\matrix44.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\ranged_value.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\transform.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-utils\stringmap.cpp" /> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\coroutine.cpp" /> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\mutex.cpp" /> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread.cpp" /> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_posix.cpp" /> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_sdl.cpp" /> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_std.cpp" /> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_win32.cpp" /> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_task.cpp" /> <ClCompile Include="..\..\..\source\libs\asura-lib-utils\utils_module.cpp" /> </ItemGroup> <ItemGroup> @@ -150,6 +159,7 @@ <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\file.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\file_data.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\file_system.h" /> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\io_task.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\reloadable.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-utils\manager.hpp" /> <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\curve.h" /> @@ -165,6 +175,14 @@ <ClInclude Include="..\..\..\source\libs\asura-lib-utils\scripting\portable.hpp" /> <ClInclude Include="..\..\..\source\libs\asura-lib-utils\singleton.hpp" /> <ClInclude Include="..\..\..\source\libs\asura-lib-utils\stringmap.hpp" /> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\coroutine.h" /> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\mutex.h" /> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread.h" /> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_posix.h" /> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_sdl.h" /> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_std.h" /> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_win32.h" /> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_task.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-utils\type.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-utils\utils.h" /> <ClInclude Include="..\..\..\source\libs\asura-lib-utils\utils_config.h" /> diff --git a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters b/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters index f9b9007..50d0746 100644 --- a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters +++ b/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters @@ -16,6 +16,9 @@ <Filter Include="io\binding"> <UniqueIdentifier>{b4b078e1-bb8d-4cb3-84b9-963e851be123}</UniqueIdentifier> </Filter> + <Filter Include="threading"> + <UniqueIdentifier>{d617f453-4cd1-451b-801d-2f88d0072303}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\source\libs\asura-lib-utils\exceptions\exception.cpp"> @@ -71,6 +74,33 @@ <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\binding\_compressor.cpp"> <Filter>io\binding</Filter> </ClCompile> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\coroutine.cpp"> + <Filter>threading</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread.cpp"> + <Filter>threading</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_posix.cpp"> + <Filter>threading</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_sdl.cpp"> + <Filter>threading</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_std.cpp"> + <Filter>threading</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_win32.cpp"> + <Filter>threading</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_task.cpp"> + <Filter>threading</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\io_task.cpp"> + <Filter>io</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\mutex.cpp"> + <Filter>threading</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\source\libs\asura-lib-utils\exceptions\exception.h"> @@ -135,6 +165,33 @@ <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\compressor.h"> <Filter>io</Filter> </ClInclude> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\coroutine.h"> + <Filter>threading</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread.h"> + <Filter>threading</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_posix.h"> + <Filter>threading</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_sdl.h"> + <Filter>threading</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_std.h"> + <Filter>threading</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_win32.h"> + <Filter>threading</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_task.h"> + <Filter>threading</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\io_task.h"> + <Filter>io</Filter> + </ClInclude> + <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\mutex.h"> + <Filter>threading</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\..\..\source\libs\asura-lib-utils\math\rect.inl"> diff --git a/build/libs/asura-lib-xml/asura-lib-xml.vcxproj.filters b/build/libs/asura-lib-xml/asura-lib-xml.vcxproj.filters index 3c6f4fd..9cd8510 100644 --- a/build/libs/asura-lib-xml/asura-lib-xml.vcxproj.filters +++ b/build/libs/asura-lib-xml/asura-lib-xml.vcxproj.filters @@ -1,17 +1,2 @@ <?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> - </ItemGroup> -</Project>
\ No newline at end of file +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file diff --git a/build/tests/06-coroutine/06-coroutine.vcxproj b/build/tests/06-coroutine/06-coroutine.vcxproj new file mode 100644 index 0000000..53b04c8 --- /dev/null +++ b/build/tests/06-coroutine/06-coroutine.vcxproj @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}</ProjectGuid> + <RootNamespace>My06coroutine</RootNamespace> + <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\..\source\tests\06-coroutine\main.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/build/tests/06-coroutine/06-coroutine.vcxproj.filters b/build/tests/06-coroutine/06-coroutine.vcxproj.filters new file mode 100644 index 0000000..34d18a7 --- /dev/null +++ b/build/tests/06-coroutine/06-coroutine.vcxproj.filters @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="..\..\..\source\tests\06-coroutine\main.cpp" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/build/tests/06-coroutine/06-coroutine.vcxproj.user b/build/tests/06-coroutine/06-coroutine.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/tests/06-coroutine/06-coroutine.vcxproj.user @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup /> +</Project>
\ No newline at end of file diff --git a/build/tools/bindingGen/App.config b/build/tools/bindingGen/App.config new file mode 100644 index 0000000..731f6de --- /dev/null +++ b/build/tools/bindingGen/App.config @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> + </startup> +</configuration>
\ No newline at end of file diff --git a/build/tools/bindingGen/Properties/AssemblyInfo.cs b/build/tools/bindingGen/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..1244da3 --- /dev/null +++ b/build/tools/bindingGen/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("bindingGen")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("bindingGen")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("95cac424-d558-43d0-88b0-c67af1c4ee90")] + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 +// 方法是按如下所示使用“*”: : +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/build/tools/bindingGen/bin/Debug/bindingGen.exe b/build/tools/bindingGen/bin/Debug/bindingGen.exe Binary files differnew file mode 100644 index 0000000..ad0ab9e --- /dev/null +++ b/build/tools/bindingGen/bin/Debug/bindingGen.exe diff --git a/build/tools/bindingGen/bin/Debug/bindingGen.exe.config b/build/tools/bindingGen/bin/Debug/bindingGen.exe.config new file mode 100644 index 0000000..731f6de --- /dev/null +++ b/build/tools/bindingGen/bin/Debug/bindingGen.exe.config @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> + </startup> +</configuration>
\ No newline at end of file diff --git a/build/tools/bindingGen/bin/Release/bindingGen.exe b/build/tools/bindingGen/bin/Release/bindingGen.exe Binary files differnew file mode 100644 index 0000000..c61ceae --- /dev/null +++ b/build/tools/bindingGen/bin/Release/bindingGen.exe diff --git a/build/tools/bindingGen/bin/Release/bindingGen.exe.config b/build/tools/bindingGen/bin/Release/bindingGen.exe.config new file mode 100644 index 0000000..731f6de --- /dev/null +++ b/build/tools/bindingGen/bin/Release/bindingGen.exe.config @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> + </startup> +</configuration>
\ No newline at end of file diff --git a/build/tools/bindingGen/bindingGen.csproj b/build/tools/bindingGen/bindingGen.csproj new file mode 100644 index 0000000..c787d56 --- /dev/null +++ b/build/tools/bindingGen/bindingGen.csproj @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{95CAC424-D558-43D0-88B0-C67AF1C4EE90}</ProjectGuid> + <OutputType>Exe</OutputType> + <RootNamespace>bindingGen</RootNamespace> + <AssemblyName>bindingGen</AssemblyName> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>..\..\..\bin\win64\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <AllowUnsafeBlocks>false</AllowUnsafeBlocks> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>..\..\..\bin\win64\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Net.Http" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="main.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="App.config" /> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> +</Project>
\ No newline at end of file diff --git a/build/tools/bindingGen/bindingGen.csproj.user b/build/tools/bindingGen/bindingGen.csproj.user new file mode 100644 index 0000000..150d1c7 --- /dev/null +++ b/build/tools/bindingGen/bindingGen.csproj.user @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> + <StartArguments> + </StartArguments> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> + <StartArguments> + </StartArguments> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/build/tools/bindingGen/main.cs b/build/tools/bindingGen/main.cs new file mode 100644 index 0000000..700f98c --- /dev/null +++ b/build/tools/bindingGen/main.cs @@ -0,0 +1,233 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Text.RegularExpressions; +using System.IO; + +namespace bindingGen +{ + /// <summary> + /// 输入目录，在目录下生成./binding目录，存放导出的binding代码 + /// </summary> + class Program + { + // {0} 文件名 + // {1} 第一个名称空间 + // {2} 第二个名称空间 + // {3} 内容 + static string output = @"#include ""../{0}.h"" + +using namespace std; + +namespace {1} +{{ + namespace {2} + {{ + {3} + }} +}} +"; + + // {0} 类名 + // {1} 内容 + static string registry = @" + LUAX_REGISTRY({0}) + {{ +{1} + }} +"; + + // {0} 类名 + // {1} 内容 + static string postprocess = @" + LUAX_POSTPROCESS({0}) + {{ +{1} + }} +"; + + // {0} 类名 + // {1} 去掉_的函数名 + // {2} 小写的类名 + static string method = @" + // {2}:{1}() + LUAX_IMPL_METHOD({0}, _{1}) + {{ + LUAX_PREPARE(L, {0}); + + }} +"; + // {0} 类名 + // {1} 去掉_的函数名 + static string method_new = @" + // {0}.{1}() + LUAX_IMPL_METHOD({0}, _{1}) + {{ + LUAX_STATE(L); + + }} +"; + + static string make_register_methods(MatchCollection methods) + { + if (methods.Count == 0) + return ""; + string register_methods = ""; + register_methods += "\t\t\tLUAX_REGISTER_METHODS(state,\n"; + int maxlen = 0; + foreach(var m in methods) + { + string method = m.ToString(); + if (method.Count() > maxlen) + maxlen = method.Count(); + } + for(int i = 0; i < methods.Count; ++i) + { + Match m = methods[i]; + string method = m.ToString(); + register_methods += "\t\t\t\t"; + register_methods += "{ "; + register_methods += ('"' + method.Substring(1, method.Count() - 1) + "\",").PadRight(maxlen + 3, ' '); + register_methods += method.PadRight(maxlen + 1, ' '); + register_methods += "}"; + if (i != methods.Count - 1) + register_methods += ','; + register_methods += '\n'; + } + register_methods += "\t\t\t);"; + return register_methods; + } + + static string make_impl_methods(MatchCollection mc, string cname) + { + if (mc.Count == 0) + return ""; + + string methods = ""; + + foreach(var m in mc) + { + string name = m.ToString(); + if(name != "_New") + { + methods += String.Format(method, cname, name.Substring(1, name.Count() - 1), cname.ToLower()); + } + else + { + methods += String.Format(method_new, cname, name.Substring(1, name.Count() - 1)); + } + } + + return methods; + } + + 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 enums = ""; + + foreach(var m in mc) + { + string name = m.ToString(); + enums += "\t\t\tLUAX_REGISTER_ENUM(state, "; + enums += "\"E" + name + "\",\n"; + 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 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); + 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) + { + enums += "\t\t\t\t{ "; + enums += ('"' + keys[i] + "\",").PadRight(maxKey + 4); + enums += enames[i].PadRight(maxEname + 1); + enums += "}"; + if (i != values.Count - 1) + enums += ","; + enums += "\n"; + } + enums += "\t\t\t);\n"; + } + return enums; + } + + /// <summary> + /// 用法： + /// bindingGen <目录> + /// </summary> + /// <param name="args"></param> + static void Main(string[] args) + { + if (args.Length < 1) + return; + + string dir = args[0]; + + Console.WriteLine("源目录: " + dir); + + if (!Directory.Exists(dir)) + return; + + string reg_class = @"(?<=Portable\<)[0-9a-zA-Z]+(?=\>)"; + string reg_methods = @"(?<=LUAX_DECL_METHOD\()[0-9a-zA-Z_]+(?=\))"; + string reg_enums = @"(?<=LUAX_DECL_ENUM\()[0-9a-zA-Z_]+(?=\))"; + string reg_namespace = @"(?<=namespace\s)[0-9a-zA-Z]+(?=[\s\n]*\{)"; + + if(!Directory.Exists(dir + "/binding")) + { + Directory.CreateDirectory(dir + "/binding"); + } + + string[] files = Directory.GetFiles(dir); + for(int i = 0; i < files.Count(); ++i) + { + string file = files[i]; + if (!File.Exists(file)) + continue; + file = file.Replace('\\', '/'); + string name = file.Substring(file.LastIndexOf('/') + 1, file.LastIndexOf('.') - file.LastIndexOf('/') - 1); + string bindingFile = dir + "/binding/_" + name + ".cpp"; + if (File.Exists(bindingFile)) + continue; + string code = File.ReadAllText(file); + // + Match m = Regex.Match(code, reg_class); + if (!m.Success) + continue; + string className = m.ToString(); + MatchCollection mc = Regex.Matches(code, reg_namespace); + // 应该两个名称空间 + if(mc.Count != 2) + { + Console.WriteLine("Error: 源文件没有两个名称空间 " + file); + continue; + } + string namespace1 = mc[0].ToString(); + string namespace2 = mc[1].ToString(); + // 名称空间内的内容 + string content = ""; + mc = Regex.Matches(code, reg_methods); + content += String.Format(registry, className, make_register_methods(mc)); + mc = Regex.Matches(code, reg_enums); + content += String.Format(postprocess, className, make_register_enum(mc, code)); + mc = Regex.Matches(code, reg_methods); + content += make_impl_methods(mc, className); + string binding = String.Format(output, name, namespace1, namespace2, content); + 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 differnew file mode 100644 index 0000000..b89f8dd --- /dev/null +++ b/build/tools/bindingGen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/source/libs/asura-lib-core/client/sdl/sdl_application.cpp b/build/tools/bindingGen/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/client/sdl/sdl_application.cpp +++ b/build/tools/bindingGen/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs diff --git a/source/libs/asura-lib-core/client/sdl/sdl_cursor.cpp b/build/tools/bindingGen/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/client/sdl/sdl_cursor.cpp +++ b/build/tools/bindingGen/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs diff --git a/source/libs/asura-lib-core/client/sdl/sdl_cursor.h b/build/tools/bindingGen/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/client/sdl/sdl_cursor.h +++ b/build/tools/bindingGen/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs diff --git a/build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache b/build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..93b7e43 --- /dev/null +++ b/build/tools/bindingGen/obj/Debug/bindingGen.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +76869cb9eeaafde93fc35e764d87dc7f1f272b2f diff --git a/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt b/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..3656c65 --- /dev/null +++ b/build/tools/bindingGen/obj/Debug/bindingGen.csproj.FileListAbsolute.txt @@ -0,0 +1,10 @@ +D:\Asura\build\tools\bindingGen\bin\Debug\bindingGen.exe.config +D:\Asura\build\tools\bindingGen\bin\Debug\bindingGen.exe +D:\Asura\build\tools\bindingGen\bin\Debug\bindingGen.pdb +D:\Asura\build\tools\bindingGen\obj\Debug\bindingGen.csprojAssemblyReference.cache +D:\Asura\build\tools\bindingGen\obj\Debug\bindingGen.csproj.CoreCompileInputs.cache +D:\Asura\build\tools\bindingGen\obj\Debug\bindingGen.exe +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 diff --git a/build/tools/bindingGen/obj/Debug/bindingGen.csprojAssemblyReference.cache b/build/tools/bindingGen/obj/Debug/bindingGen.csprojAssemblyReference.cache Binary files differnew file mode 100644 index 0000000..d31b6fe --- /dev/null +++ b/build/tools/bindingGen/obj/Debug/bindingGen.csprojAssemblyReference.cache diff --git a/build/tools/bindingGen/obj/Debug/bindingGen.exe b/build/tools/bindingGen/obj/Debug/bindingGen.exe Binary files differnew file mode 100644 index 0000000..930d6e4 --- /dev/null +++ b/build/tools/bindingGen/obj/Debug/bindingGen.exe diff --git a/build/tools/bindingGen/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/build/tools/bindingGen/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache Binary files differnew file mode 100644 index 0000000..06f4073 --- /dev/null +++ b/build/tools/bindingGen/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/source/libs/asura-lib-core/client/sdl/sdl_thread.cpp b/build/tools/bindingGen/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/client/sdl/sdl_thread.cpp +++ b/build/tools/bindingGen/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs diff --git a/source/libs/asura-lib-core/client/sdl/sdl_thread.h b/build/tools/bindingGen/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/client/sdl/sdl_thread.h +++ b/build/tools/bindingGen/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs diff --git a/source/libs/asura-lib-core/client/sdl/sdl_window.cpp b/build/tools/bindingGen/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/client/sdl/sdl_window.cpp +++ b/build/tools/bindingGen/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs diff --git a/build/tools/bindingGen/obj/Release/bindingGen.csproj.CoreCompileInputs.cache b/build/tools/bindingGen/obj/Release/bindingGen.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..1808cd2 --- /dev/null +++ b/build/tools/bindingGen/obj/Release/bindingGen.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +164e0e4adeed5117be7ac06ca088f3bfb8ccc730 diff --git a/build/tools/bindingGen/obj/Release/bindingGen.csproj.FileListAbsolute.txt b/build/tools/bindingGen/obj/Release/bindingGen.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..a9c80ba --- /dev/null +++ b/build/tools/bindingGen/obj/Release/bindingGen.csproj.FileListAbsolute.txt @@ -0,0 +1,6 @@ +D:\Asura\build\tools\bindingGen\bin\Release\bindingGen.exe.config +D:\Asura\build\tools\bindingGen\bin\Release\bindingGen.exe +D:\Asura\build\tools\bindingGen\bin\Release\bindingGen.pdb +D:\Asura\build\tools\bindingGen\obj\Release\bindingGen.csproj.CoreCompileInputs.cache +D:\Asura\build\tools\bindingGen\obj\Release\bindingGen.exe +D:\Asura\build\tools\bindingGen\obj\Release\bindingGen.pdb diff --git a/build/tools/bindingGen/obj/Release/bindingGen.exe b/build/tools/bindingGen/obj/Release/bindingGen.exe Binary files differnew file mode 100644 index 0000000..c61ceae --- /dev/null +++ b/build/tools/bindingGen/obj/Release/bindingGen.exe diff --git a/build/tools/cembed/cembed.vcxproj b/build/tools/cembed/cembed.vcxproj new file mode 100644 index 0000000..5ee4263 --- /dev/null +++ b/build/tools/cembed/cembed.vcxproj @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{68FB36CB-C478-4158-A0BC-905B65340AE9}</ProjectGuid> + <RootNamespace>cembed</RootNamespace> + <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\..\source\tools\cembed\main.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/build/tools/cembed/cembed.vcxproj.filters b/build/tools/cembed/cembed.vcxproj.filters new file mode 100644 index 0000000..10ff2a3 --- /dev/null +++ b/build/tools/cembed/cembed.vcxproj.filters @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="..\..\..\source\tools\cembed\main.cpp" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/build/tools/cembed/cembed.vcxproj.user b/build/tools/cembed/cembed.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/tools/cembed/cembed.vcxproj.user @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup /> +</Project>
\ No newline at end of file diff --git a/source/3rd-party/Luax/luax_class.cpp b/source/3rd-party/Luax/luax_class.cpp index e2019d4..9f316c1 100644 --- a/source/3rd-party/Luax/luax_class.cpp +++ b/source/3rd-party/Luax/luax_class.cpp @@ -73,7 +73,7 @@ namespace Luax } /// - /// NewnԻȡCtorCtorʼʵ + /// NewnԻȡ__init__initʼʵ /// int LuaxPlainClass::l_New(lua_State* L) { @@ -95,11 +95,11 @@ namespace Luax lua_setmetatable(L, -2); // ҵ캯ᴥmetatable.__index,ݼ̳ҡ - lua_getfield(L, classTable, "Ctor"); + lua_getfield(L, classTable, "__init"); if (state.IsType(-1, LUA_TFUNCTION)) { // stack: - // -1: Ctor() + // -1: __init() // -2: instance // -3~-n-2: params @@ -107,27 +107,27 @@ namespace Luax // stack: // -1: instance // -2~-n-1: params - // -n-2: Ctor() + // -n-2: __init() lua_pushvalue(L, -1); // stack: // -1: instance // -2: instance // -3~-n-2: params - // -n-3: Ctor + // -n-3: __init lua_insert(L, -3 - n); // stack: // -1: instance // -2~-n-1: params - // -n-2: Ctor() + // -n-2: __init() // -n-3: instance lua_insert(L, -1 - n); // stack: // -1~-n: params // -n-1: instance - // -n-2: Ctor() + // -n-2: __init() // -n-3: instance lua_pcall(L, n + 1, 0, 0); diff --git a/source/3rd-party/Luax/luax_class.hpp b/source/3rd-party/Luax/luax_class.hpp index 3d7ede6..af52b5f 100644 --- a/source/3rd-party/Luax/luax_class.hpp +++ b/source/3rd-party/Luax/luax_class.hpp @@ -11,8 +11,6 @@ namespace Luax { -#define LUAX_DECL_METHOD(mtd) static int mtd(lua_State* L) - /// /// RegisterLuaxClass עķͳԱö١ȵclass table /// LuaxGetFactoryName ùͬʱעʱעΪsingletonͨʱ @@ -35,6 +33,10 @@ namespace Luax static const char* GetLuaxClassName() { return #type; }; \ static bool IsLuaxClassSingleton() { return true; }; +#define LUAX_DECL_METHOD(mtd) static int mtd(lua_State* L) + +#define LUAX_DECL_ENUM(e) + /// /// ʵֵĺꡣһL /// @@ -106,6 +108,7 @@ namespace Luax /// /// userdata pushջûгʼmUserdataʼúԪѳʼõuserdataջһá + /// һnativeȨƽluaƵķ /// bool PushLuaxUserdata(LuaxState& state); bool PushLuaxMemberTable(LuaxState& state); diff --git a/source/3rd-party/Luax/luax_class.inl b/source/3rd-party/Luax/luax_class.inl index e2b8de8..7ee3de9 100644 --- a/source/3rd-party/Luax/luax_class.inl +++ b/source/3rd-party/Luax/luax_class.inl @@ -363,8 +363,8 @@ namespace Luax #if LUAX_ENABLE_NATIVE_EXTEND /// - /// ࣬luaijԱΪƣDZ֤userdataͳһNative classṩCtor֧֣ - /// nativeʵ崴ʹCtorгʼӵкͻһNewбnativeһ͡ + /// ࣬luaijԱΪƣDZ֤userdataͳһNative classṩ__init֧֣ + /// nativeʵ崴ʹ__initгʼӵкͻһNewбnativeһ͡ /// template<typename T> int LuaxNativeClass<T>::l_ExtendFactory(lua_State* L) @@ -541,8 +541,8 @@ namespace Luax int args = state.AbsIndex(-1 - n); - // ԵCtor - lua_getfield(L, lua_upvalueindex(1), "Ctor"); + // Ե__init + lua_getfield(L, lua_upvalueindex(1), "__init"); if (state.IsType(-1, LUA_TFUNCTION)) { diff --git a/source/3rd-party/tinyxml2/tinyxml2.cpp b/source/3rd-party/tinyxml2/tinyxml2.cpp new file mode 100644 index 0000000..55876c1 --- /dev/null +++ b/source/3rd-party/tinyxml2/tinyxml2.cpp @@ -0,0 +1,2837 @@ +/* +Original code by Lee Thomason (www.grinninglizard.com) + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any +damages arising from the use of this software. + +Permission is granted to anyone to use this software for any +purpose, including commercial applications, and to alter it and +redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must +not claim that you wrote the original software. If you use this +software in a product, an acknowledgment in the product documentation +would be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and +must not be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source +distribution. +*/ + +#include "tinyxml2.h" + +#include <new> // yes, this one new style header, is in the Android SDK. +#if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__) +# include <stddef.h> +# include <stdarg.h> +#else +# include <cstddef> +# include <cstdarg> +#endif + +#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (!defined WINCE) + // Microsoft Visual Studio, version 2005 and higher. Not WinCE. + /*int _snprintf_s( + char *buffer, + size_t sizeOfBuffer, + size_t count, + const char *format [, + argument] ... + );*/ + static inline int TIXML_SNPRINTF( char* buffer, size_t size, const char* format, ... ) + { + va_list va; + va_start( va, format ); + const int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va ); + va_end( va ); + return result; + } + + static inline int TIXML_VSNPRINTF( char* buffer, size_t size, const char* format, va_list va ) + { + const int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va ); + return result; + } + + #define TIXML_VSCPRINTF _vscprintf + #define TIXML_SSCANF sscanf_s +#elif defined _MSC_VER + // Microsoft Visual Studio 2003 and earlier or WinCE + #define TIXML_SNPRINTF _snprintf + #define TIXML_VSNPRINTF _vsnprintf + #define TIXML_SSCANF sscanf + #if (_MSC_VER < 1400 ) && (!defined WINCE) + // Microsoft Visual Studio 2003 and not WinCE. + #define TIXML_VSCPRINTF _vscprintf // VS2003's C runtime has this, but VC6 C runtime or WinCE SDK doesn't have. + #else + // Microsoft Visual Studio 2003 and earlier or WinCE. + static inline int TIXML_VSCPRINTF( const char* format, va_list va ) + { + int len = 512; + for (;;) { + len = len*2; + char* str = new char[len](); + const int required = _vsnprintf(str, len, format, va); + delete[] str; + if ( required != -1 ) { + TIXMLASSERT( required >= 0 ); + len = required; + break; + } + } + TIXMLASSERT( len >= 0 ); + return len; + } + #endif +#else + // GCC version 3 and higher + //#warning( "Using sn* functions." ) + #define TIXML_SNPRINTF snprintf + #define TIXML_VSNPRINTF vsnprintf + static inline int TIXML_VSCPRINTF( const char* format, va_list va ) + { + int len = vsnprintf( 0, 0, format, va ); + TIXMLASSERT( len >= 0 ); + return len; + } + #define TIXML_SSCANF sscanf +#endif + + +static const char LINE_FEED = (char)0x0a; // all line endings are normalized to LF +static const char LF = LINE_FEED; +static const char CARRIAGE_RETURN = (char)0x0d; // CR gets filtered out +static const char CR = CARRIAGE_RETURN; +static const char SINGLE_QUOTE = '\''; +static const char DOUBLE_QUOTE = '\"'; + +// Bunch of unicode info at: +// http://www.unicode.org/faq/utf_bom.html +// ef bb bf (Microsoft "lead bytes") - designates UTF-8 + +static const unsigned char TIXML_UTF_LEAD_0 = 0xefU; +static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU; +static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU; + +namespace tinyxml2 +{ + +struct Entity { + const char* pattern; + int length; + char value; +}; + +static const int NUM_ENTITIES = 5; +static const Entity entities[NUM_ENTITIES] = { + { "quot", 4, DOUBLE_QUOTE }, + { "amp", 3, '&' }, + { "apos", 4, SINGLE_QUOTE }, + { "lt", 2, '<' }, + { "gt", 2, '>' } +}; + + +StrPair::~StrPair() +{ + Reset(); +} + + +void StrPair::TransferTo( StrPair* other ) +{ + if ( this == other ) { + return; + } + // This in effect implements the assignment operator by "moving" + // ownership (as in auto_ptr). + + TIXMLASSERT( other != 0 ); + TIXMLASSERT( other->_flags == 0 ); + TIXMLASSERT( other->_start == 0 ); + TIXMLASSERT( other->_end == 0 ); + + other->Reset(); + + other->_flags = _flags; + other->_start = _start; + other->_end = _end; + + _flags = 0; + _start = 0; + _end = 0; +} + + +void StrPair::Reset() +{ + if ( _flags & NEEDS_DELETE ) { + delete [] _start; + } + _flags = 0; + _start = 0; + _end = 0; +} + + +void StrPair::SetStr( const char* str, int flags ) +{ + TIXMLASSERT( str ); + Reset(); + size_t len = strlen( str ); + TIXMLASSERT( _start == 0 ); + _start = new char[ len+1 ]; + memcpy( _start, str, len+1 ); + _end = _start + len; + _flags = flags | NEEDS_DELETE; +} + + +char* StrPair::ParseText( char* p, const char* endTag, int strFlags, int* curLineNumPtr ) +{ + TIXMLASSERT( p ); + TIXMLASSERT( endTag && *endTag ); + TIXMLASSERT(curLineNumPtr); + + char* start = p; + const char endChar = *endTag; + size_t length = strlen( endTag ); + + // Inner loop of text parsing. + while ( *p ) { + if ( *p == endChar && strncmp( p, endTag, length ) == 0 ) { + Set( start, p, strFlags ); + return p + length; + } else if (*p == '\n') { + ++(*curLineNumPtr); + } + ++p; + TIXMLASSERT( p ); + } + return 0; +} + + +char* StrPair::ParseName( char* p ) +{ + if ( !p || !(*p) ) { + return 0; + } + if ( !XMLUtil::IsNameStartChar( *p ) ) { + return 0; + } + + char* const start = p; + ++p; + while ( *p && XMLUtil::IsNameChar( *p ) ) { + ++p; + } + + Set( start, p, 0 ); + return p; +} + + +void StrPair::CollapseWhitespace() +{ + // Adjusting _start would cause undefined behavior on delete[] + TIXMLASSERT( ( _flags & NEEDS_DELETE ) == 0 ); + // Trim leading space. + _start = XMLUtil::SkipWhiteSpace( _start, 0 ); + + if ( *_start ) { + const char* p = _start; // the read pointer + char* q = _start; // the write pointer + + while( *p ) { + if ( XMLUtil::IsWhiteSpace( *p )) { + p = XMLUtil::SkipWhiteSpace( p, 0 ); + if ( *p == 0 ) { + break; // don't write to q; this trims the trailing space. + } + *q = ' '; + ++q; + } + *q = *p; + ++q; + ++p; + } + *q = 0; + } +} + + +const char* StrPair::GetStr() +{ + TIXMLASSERT( _start ); + TIXMLASSERT( _end ); + if ( _flags & NEEDS_FLUSH ) { + *_end = 0; + _flags ^= NEEDS_FLUSH; + + if ( _flags ) { + const char* p = _start; // the read pointer + char* q = _start; // the write pointer + + while( p < _end ) { + if ( (_flags & NEEDS_NEWLINE_NORMALIZATION) && *p == CR ) { + // CR-LF pair becomes LF + // CR alone becomes LF + // LF-CR becomes LF + if ( *(p+1) == LF ) { + p += 2; + } + else { + ++p; + } + *q = LF; + ++q; + } + else if ( (_flags & NEEDS_NEWLINE_NORMALIZATION) && *p == LF ) { + if ( *(p+1) == CR ) { + p += 2; + } + else { + ++p; + } + *q = LF; + ++q; + } + else if ( (_flags & NEEDS_ENTITY_PROCESSING) && *p == '&' ) { + // Entities handled by tinyXML2: + // - special entities in the entity table [in/out] + // - numeric character reference [in] + // 中 or 中 + + if ( *(p+1) == '#' ) { + const int buflen = 10; + char buf[buflen] = { 0 }; + int len = 0; + const char* adjusted = const_cast<char*>( XMLUtil::GetCharacterRef( p, buf, &len ) ); + if ( adjusted == 0 ) { + *q = *p; + ++p; + ++q; + } + else { + TIXMLASSERT( 0 <= len && len <= buflen ); + TIXMLASSERT( q + len <= adjusted ); + p = adjusted; + memcpy( q, buf, len ); + q += len; + } + } + else { + bool entityFound = false; + for( int i = 0; i < NUM_ENTITIES; ++i ) { + const Entity& entity = entities[i]; + if ( strncmp( p + 1, entity.pattern, entity.length ) == 0 + && *( p + entity.length + 1 ) == ';' ) { + // Found an entity - convert. + *q = entity.value; + ++q; + p += entity.length + 2; + entityFound = true; + break; + } + } + if ( !entityFound ) { + // fixme: treat as error? + ++p; + ++q; + } + } + } + else { + *q = *p; + ++p; + ++q; + } + } + *q = 0; + } + // The loop below has plenty going on, and this + // is a less useful mode. Break it out. + if ( _flags & NEEDS_WHITESPACE_COLLAPSING ) { + CollapseWhitespace(); + } + _flags = (_flags & NEEDS_DELETE); + } + TIXMLASSERT( _start ); + return _start; +} + + + + +// --------- XMLUtil ----------- // + +const char* XMLUtil::writeBoolTrue = "true"; +const char* XMLUtil::writeBoolFalse = "false"; + +void XMLUtil::SetBoolSerialization(const char* writeTrue, const char* writeFalse) +{ + static const char* defTrue = "true"; + static const char* defFalse = "false"; + + writeBoolTrue = (writeTrue) ? writeTrue : defTrue; + writeBoolFalse = (writeFalse) ? writeFalse : defFalse; +} + + +const char* XMLUtil::ReadBOM( const char* p, bool* bom ) +{ + TIXMLASSERT( p ); + TIXMLASSERT( bom ); + *bom = false; + const unsigned char* pu = reinterpret_cast<const unsigned char*>(p); + // Check for BOM: + if ( *(pu+0) == TIXML_UTF_LEAD_0 + && *(pu+1) == TIXML_UTF_LEAD_1 + && *(pu+2) == TIXML_UTF_LEAD_2 ) { + *bom = true; + p += 3; + } + TIXMLASSERT( p ); + return p; +} + + +void XMLUtil::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length ) +{ + const unsigned long BYTE_MASK = 0xBF; + const unsigned long BYTE_MARK = 0x80; + const unsigned long FIRST_BYTE_MARK[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC }; + + if (input < 0x80) { + *length = 1; + } + else if ( input < 0x800 ) { + *length = 2; + } + else if ( input < 0x10000 ) { + *length = 3; + } + else if ( input < 0x200000 ) { + *length = 4; + } + else { + *length = 0; // This code won't convert this correctly anyway. + return; + } + + output += *length; + + // Scary scary fall throughs are annotated with carefully designed comments + // to suppress compiler warnings such as -Wimplicit-fallthrough in gcc + switch (*length) { + case 4: + --output; + *output = (char)((input | BYTE_MARK) & BYTE_MASK); + input >>= 6; + //fall through + case 3: + --output; + *output = (char)((input | BYTE_MARK) & BYTE_MASK); + input >>= 6; + //fall through + case 2: + --output; + *output = (char)((input | BYTE_MARK) & BYTE_MASK); + input >>= 6; + //fall through + case 1: + --output; + *output = (char)(input | FIRST_BYTE_MARK[*length]); + break; + default: + TIXMLASSERT( false ); + } +} + + +const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length ) +{ + // Presume an entity, and pull it out. + *length = 0; + + if ( *(p+1) == '#' && *(p+2) ) { + unsigned long ucs = 0; + TIXMLASSERT( sizeof( ucs ) >= 4 ); + ptrdiff_t delta = 0; + unsigned mult = 1; + static const char SEMICOLON = ';'; + + if ( *(p+2) == 'x' ) { + // Hexadecimal. + const char* q = p+3; + if ( !(*q) ) { + return 0; + } + + q = strchr( q, SEMICOLON ); + + if ( !q ) { + return 0; + } + TIXMLASSERT( *q == SEMICOLON ); + + delta = q-p; + --q; + + while ( *q != 'x' ) { + unsigned int digit = 0; + + if ( *q >= '0' && *q <= '9' ) { + digit = *q - '0'; + } + else if ( *q >= 'a' && *q <= 'f' ) { + digit = *q - 'a' + 10; + } + else if ( *q >= 'A' && *q <= 'F' ) { + digit = *q - 'A' + 10; + } + else { + return 0; + } + TIXMLASSERT( digit < 16 ); + TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit ); + const unsigned int digitScaled = mult * digit; + TIXMLASSERT( ucs <= ULONG_MAX - digitScaled ); + ucs += digitScaled; + TIXMLASSERT( mult <= UINT_MAX / 16 ); + mult *= 16; + --q; + } + } + else { + // Decimal. + const char* q = p+2; + if ( !(*q) ) { + return 0; + } + + q = strchr( q, SEMICOLON ); + + if ( !q ) { + return 0; + } + TIXMLASSERT( *q == SEMICOLON ); + + delta = q-p; + --q; + + while ( *q != '#' ) { + if ( *q >= '0' && *q <= '9' ) { + const unsigned int digit = *q - '0'; + TIXMLASSERT( digit < 10 ); + TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit ); + const unsigned int digitScaled = mult * digit; + TIXMLASSERT( ucs <= ULONG_MAX - digitScaled ); + ucs += digitScaled; + } + else { + return 0; + } + TIXMLASSERT( mult <= UINT_MAX / 10 ); + mult *= 10; + --q; + } + } + // convert the UCS to UTF-8 + ConvertUTF32ToUTF8( ucs, value, length ); + return p + delta + 1; + } + return p+1; +} + + +void XMLUtil::ToStr( int v, char* buffer, int bufferSize ) +{ + TIXML_SNPRINTF( buffer, bufferSize, "%d", v ); +} + + +void XMLUtil::ToStr( unsigned v, char* buffer, int bufferSize ) +{ + TIXML_SNPRINTF( buffer, bufferSize, "%u", v ); +} + + +void XMLUtil::ToStr( bool v, char* buffer, int bufferSize ) +{ + TIXML_SNPRINTF( buffer, bufferSize, "%s", v ? writeBoolTrue : writeBoolFalse); +} + +/* + ToStr() of a number is a very tricky topic. + https://github.com/leethomason/tinyxml2/issues/106 +*/ +void XMLUtil::ToStr( float v, char* buffer, int bufferSize ) +{ + TIXML_SNPRINTF( buffer, bufferSize, "%.8g", v ); +} + + +void XMLUtil::ToStr( double v, char* buffer, int bufferSize ) +{ + TIXML_SNPRINTF( buffer, bufferSize, "%.17g", v ); +} + + +void XMLUtil::ToStr(int64_t v, char* buffer, int bufferSize) +{ + // horrible syntax trick to make the compiler happy about %lld + TIXML_SNPRINTF(buffer, bufferSize, "%lld", (long long)v); +} + + +bool XMLUtil::ToInt( const char* str, int* value ) +{ + if ( TIXML_SSCANF( str, "%d", value ) == 1 ) { + return true; + } + return false; +} + +bool XMLUtil::ToUnsigned( const char* str, unsigned *value ) +{ + if ( TIXML_SSCANF( str, "%u", value ) == 1 ) { + return true; + } + return false; +} + +bool XMLUtil::ToBool( const char* str, bool* value ) +{ + int ival = 0; + if ( ToInt( str, &ival )) { + *value = (ival==0) ? false : true; + return true; + } + if ( StringEqual( str, "true" ) ) { + *value = true; + return true; + } + else if ( StringEqual( str, "false" ) ) { + *value = false; + return true; + } + return false; +} + + +bool XMLUtil::ToFloat( const char* str, float* value ) +{ + if ( TIXML_SSCANF( str, "%f", value ) == 1 ) { + return true; + } + return false; +} + + +bool XMLUtil::ToDouble( const char* str, double* value ) +{ + if ( TIXML_SSCANF( str, "%lf", value ) == 1 ) { + return true; + } + return false; +} + + +bool XMLUtil::ToInt64(const char* str, int64_t* value) +{ + long long v = 0; // horrible syntax trick to make the compiler happy about %lld + if (TIXML_SSCANF(str, "%lld", &v) == 1) { + *value = (int64_t)v; + return true; + } + return false; +} + + +char* XMLDocument::Identify( char* p, XMLNode** node ) +{ + TIXMLASSERT( node ); + TIXMLASSERT( p ); + char* const start = p; + int const startLine = _parseCurLineNum; + p = XMLUtil::SkipWhiteSpace( p, &_parseCurLineNum ); + if( !*p ) { + *node = 0; + TIXMLASSERT( p ); + return p; + } + + // These strings define the matching patterns: + static const char* xmlHeader = { "<?" }; + static const char* commentHeader = { "<!--" }; + static const char* cdataHeader = { "<![CDATA[" }; + static const char* dtdHeader = { "<!" }; + static const char* elementHeader = { "<" }; // and a header for everything else; check last. + + static const int xmlHeaderLen = 2; + static const int commentHeaderLen = 4; + static const int cdataHeaderLen = 9; + static const int dtdHeaderLen = 2; + static const int elementHeaderLen = 1; + + TIXMLASSERT( sizeof( XMLComment ) == sizeof( XMLUnknown ) ); // use same memory pool + TIXMLASSERT( sizeof( XMLComment ) == sizeof( XMLDeclaration ) ); // use same memory pool + XMLNode* returnNode = 0; + if ( XMLUtil::StringEqual( p, xmlHeader, xmlHeaderLen ) ) { + returnNode = CreateUnlinkedNode<XMLDeclaration>( _commentPool ); + returnNode->_parseLineNum = _parseCurLineNum; + p += xmlHeaderLen; + } + else if ( XMLUtil::StringEqual( p, commentHeader, commentHeaderLen ) ) { + returnNode = CreateUnlinkedNode<XMLComment>( _commentPool ); + returnNode->_parseLineNum = _parseCurLineNum; + p += commentHeaderLen; + } + else if ( XMLUtil::StringEqual( p, cdataHeader, cdataHeaderLen ) ) { + XMLText* text = CreateUnlinkedNode<XMLText>( _textPool ); + returnNode = text; + returnNode->_parseLineNum = _parseCurLineNum; + p += cdataHeaderLen; + text->SetCData( true ); + } + else if ( XMLUtil::StringEqual( p, dtdHeader, dtdHeaderLen ) ) { + returnNode = CreateUnlinkedNode<XMLUnknown>( _commentPool ); + returnNode->_parseLineNum = _parseCurLineNum; + p += dtdHeaderLen; + } + else if ( XMLUtil::StringEqual( p, elementHeader, elementHeaderLen ) ) { + returnNode = CreateUnlinkedNode<XMLElement>( _elementPool ); + returnNode->_parseLineNum = _parseCurLineNum; + p += elementHeaderLen; + } + else { + returnNode = CreateUnlinkedNode<XMLText>( _textPool ); + returnNode->_parseLineNum = _parseCurLineNum; // Report line of first non-whitespace character + p = start; // Back it up, all the text counts. + _parseCurLineNum = startLine; + } + + TIXMLASSERT( returnNode ); + TIXMLASSERT( p ); + *node = returnNode; + return p; +} + + +bool XMLDocument::Accept( XMLVisitor* visitor ) const +{ + TIXMLASSERT( visitor ); + if ( visitor->VisitEnter( *this ) ) { + for ( const XMLNode* node=FirstChild(); node; node=node->NextSibling() ) { + if ( !node->Accept( visitor ) ) { + break; + } + } + } + return visitor->VisitExit( *this ); +} + + +// --------- XMLNode ----------- // + +XMLNode::XMLNode( XMLDocument* doc ) : + _document( doc ), + _parent( 0 ), + _value(), + _parseLineNum( 0 ), + _firstChild( 0 ), _lastChild( 0 ), + _prev( 0 ), _next( 0 ), + _userData( 0 ), + _memPool( 0 ) +{ +} + + +XMLNode::~XMLNode() +{ + DeleteChildren(); + if ( _parent ) { + _parent->Unlink( this ); + } +} + +const char* XMLNode::Value() const +{ + // Edge case: XMLDocuments don't have a Value. Return null. + if ( this->ToDocument() ) + return 0; + return _value.GetStr(); +} + +void XMLNode::SetValue( const char* str, bool staticMem ) +{ + if ( staticMem ) { + _value.SetInternedStr( str ); + } + else { + _value.SetStr( str ); + } +} + +XMLNode* XMLNode::DeepClone(XMLDocument* target) const +{ + XMLNode* clone = this->ShallowClone(target); + if (!clone) return 0; + + for (const XMLNode* child = this->FirstChild(); child; child = child->NextSibling()) { + XMLNode* childClone = child->DeepClone(target); + TIXMLASSERT(childClone); + clone->InsertEndChild(childClone); + } + return clone; +} + +void XMLNode::DeleteChildren() +{ + while( _firstChild ) { + TIXMLASSERT( _lastChild ); + DeleteChild( _firstChild ); + } + _firstChild = _lastChild = 0; +} + + +void XMLNode::Unlink( XMLNode* child ) +{ + TIXMLASSERT( child ); + TIXMLASSERT( child->_document == _document ); + TIXMLASSERT( child->_parent == this ); + if ( child == _firstChild ) { + _firstChild = _firstChild->_next; + } + if ( child == _lastChild ) { + _lastChild = _lastChild->_prev; + } + + if ( child->_prev ) { + child->_prev->_next = child->_next; + } + if ( child->_next ) { + child->_next->_prev = child->_prev; + } + child->_next = 0; + child->_prev = 0; + child->_parent = 0; +} + + +void XMLNode::DeleteChild( XMLNode* node ) +{ + TIXMLASSERT( node ); + TIXMLASSERT( node->_document == _document ); + TIXMLASSERT( node->_parent == this ); + Unlink( node ); + TIXMLASSERT(node->_prev == 0); + TIXMLASSERT(node->_next == 0); + TIXMLASSERT(node->_parent == 0); + DeleteNode( node ); +} + + +XMLNode* XMLNode::InsertEndChild( XMLNode* addThis ) +{ + TIXMLASSERT( addThis ); + if ( addThis->_document != _document ) { + TIXMLASSERT( false ); + return 0; + } + InsertChildPreamble( addThis ); + + if ( _lastChild ) { + TIXMLASSERT( _firstChild ); + TIXMLASSERT( _lastChild->_next == 0 ); + _lastChild->_next = addThis; + addThis->_prev = _lastChild; + _lastChild = addThis; + + addThis->_next = 0; + } + else { + TIXMLASSERT( _firstChild == 0 ); + _firstChild = _lastChild = addThis; + + addThis->_prev = 0; + addThis->_next = 0; + } + addThis->_parent = this; + return addThis; +} + + +XMLNode* XMLNode::InsertFirstChild( XMLNode* addThis ) +{ + TIXMLASSERT( addThis ); + if ( addThis->_document != _document ) { + TIXMLASSERT( false ); + return 0; + } + InsertChildPreamble( addThis ); + + if ( _firstChild ) { + TIXMLASSERT( _lastChild ); + TIXMLASSERT( _firstChild->_prev == 0 ); + + _firstChild->_prev = addThis; + addThis->_next = _firstChild; + _firstChild = addThis; + + addThis->_prev = 0; + } + else { + TIXMLASSERT( _lastChild == 0 ); + _firstChild = _lastChild = addThis; + + addThis->_prev = 0; + addThis->_next = 0; + } + addThis->_parent = this; + return addThis; +} + + +XMLNode* XMLNode::InsertAfterChild( XMLNode* afterThis, XMLNode* addThis ) +{ + TIXMLASSERT( addThis ); + if ( addThis->_document != _document ) { + TIXMLASSERT( false ); + return 0; + } + + TIXMLASSERT( afterThis ); + + if ( afterThis->_parent != this ) { + TIXMLASSERT( false ); + return 0; + } + if ( afterThis == addThis ) { + // Current state: BeforeThis -> AddThis -> OneAfterAddThis + // Now AddThis must disappear from it's location and then + // reappear between BeforeThis and OneAfterAddThis. + // So just leave it where it is. + return addThis; + } + + if ( afterThis->_next == 0 ) { + // The last node or the only node. + return InsertEndChild( addThis ); + } + InsertChildPreamble( addThis ); + addThis->_prev = afterThis; + addThis->_next = afterThis->_next; + afterThis->_next->_prev = addThis; + afterThis->_next = addThis; + addThis->_parent = this; + return addThis; +} + + + + +const XMLElement* XMLNode::FirstChildElement( const char* name ) const +{ + for( const XMLNode* node = _firstChild; node; node = node->_next ) { + const XMLElement* element = node->ToElementWithName( name ); + if ( element ) { + return element; + } + } + return 0; +} + + +const XMLElement* XMLNode::LastChildElement( const char* name ) const +{ + for( const XMLNode* node = _lastChild; node; node = node->_prev ) { + const XMLElement* element = node->ToElementWithName( name ); + if ( element ) { + return element; + } + } + return 0; +} + + +const XMLElement* XMLNode::NextSiblingElement( const char* name ) const +{ + for( const XMLNode* node = _next; node; node = node->_next ) { + const XMLElement* element = node->ToElementWithName( name ); + if ( element ) { + return element; + } + } + return 0; +} + + +const XMLElement* XMLNode::PreviousSiblingElement( const char* name ) const +{ + for( const XMLNode* node = _prev; node; node = node->_prev ) { + const XMLElement* element = node->ToElementWithName( name ); + if ( element ) { + return element; + } + } + return 0; +} + + +char* XMLNode::ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) +{ + // This is a recursive method, but thinking about it "at the current level" + // it is a pretty simple flat list: + // <foo/> + // <!-- comment --> + // + // With a special case: + // <foo> + // </foo> + // <!-- comment --> + // + // Where the closing element (/foo) *must* be the next thing after the opening + // element, and the names must match. BUT the tricky bit is that the closing + // element will be read by the child. + // + // 'endTag' is the end tag for this node, it is returned by a call to a child. + // 'parentEnd' is the end tag for the parent, which is filled in and returned. + + XMLDocument::DepthTracker tracker(_document); + if (_document->Error()) + return 0; + + while( p && *p ) { + XMLNode* node = 0; + + p = _document->Identify( p, &node ); + TIXMLASSERT( p ); + if ( node == 0 ) { + break; + } + + const int initialLineNum = node->_parseLineNum; + + StrPair endTag; + p = node->ParseDeep( p, &endTag, curLineNumPtr ); + if ( !p ) { + DeleteNode( node ); + if ( !_document->Error() ) { + _document->SetError( XML_ERROR_PARSING, initialLineNum, 0); + } + break; + } + + const XMLDeclaration* const decl = node->ToDeclaration(); + if ( decl ) { + // Declarations are only allowed at document level + // + // Multiple declarations are allowed but all declarations + // must occur before anything else. + // + // Optimized due to a security test case. If the first node is + // a declaration, and the last node is a declaration, then only + // declarations have so far been added. + bool wellLocated = false; + + if (ToDocument()) { + if (FirstChild()) { + wellLocated = + FirstChild() && + FirstChild()->ToDeclaration() && + LastChild() && + LastChild()->ToDeclaration(); + } + else { + wellLocated = true; + } + } + if ( !wellLocated ) { + _document->SetError( XML_ERROR_PARSING_DECLARATION, initialLineNum, "XMLDeclaration value=%s", decl->Value()); + DeleteNode( node ); + break; + } + } + + XMLElement* ele = node->ToElement(); + if ( ele ) { + // We read the end tag. Return it to the parent. + if ( ele->ClosingType() == XMLElement::CLOSING ) { + if ( parentEndTag ) { + ele->_value.TransferTo( parentEndTag ); + } + node->_memPool->SetTracked(); // created and then immediately deleted. + DeleteNode( node ); + return p; + } + + // Handle an end tag returned to this level. + // And handle a bunch of annoying errors. + bool mismatch = false; + if ( endTag.Empty() ) { + if ( ele->ClosingType() == XMLElement::OPEN ) { + mismatch = true; + } + } + else { + if ( ele->ClosingType() != XMLElement::OPEN ) { + mismatch = true; + } + else if ( !XMLUtil::StringEqual( endTag.GetStr(), ele->Name() ) ) { + mismatch = true; + } + } + if ( mismatch ) { + _document->SetError( XML_ERROR_MISMATCHED_ELEMENT, initialLineNum, "XMLElement name=%s", ele->Name()); + DeleteNode( node ); + break; + } + } + InsertEndChild( node ); + } + return 0; +} + +/*static*/ void XMLNode::DeleteNode( XMLNode* node ) +{ + if ( node == 0 ) { + return; + } + TIXMLASSERT(node->_document); + if (!node->ToDocument()) { + node->_document->MarkInUse(node); + } + + MemPool* pool = node->_memPool; + node->~XMLNode(); + pool->Free( node ); +} + +void XMLNode::InsertChildPreamble( XMLNode* insertThis ) const +{ + TIXMLASSERT( insertThis ); + TIXMLASSERT( insertThis->_document == _document ); + + if (insertThis->_parent) { + insertThis->_parent->Unlink( insertThis ); + } + else { + insertThis->_document->MarkInUse(insertThis); + insertThis->_memPool->SetTracked(); + } +} + +const XMLElement* XMLNode::ToElementWithName( const char* name ) const +{ + const XMLElement* element = this->ToElement(); + if ( element == 0 ) { + return 0; + } + if ( name == 0 ) { + return element; + } + if ( XMLUtil::StringEqual( element->Name(), name ) ) { + return element; + } + return 0; +} + +// --------- XMLText ---------- // +char* XMLText::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) +{ + if ( this->CData() ) { + p = _value.ParseText( p, "]]>", StrPair::NEEDS_NEWLINE_NORMALIZATION, curLineNumPtr ); + if ( !p ) { + _document->SetError( XML_ERROR_PARSING_CDATA, _parseLineNum, 0 ); + } + return p; + } + else { + int flags = _document->ProcessEntities() ? StrPair::TEXT_ELEMENT : StrPair::TEXT_ELEMENT_LEAVE_ENTITIES; + if ( _document->WhitespaceMode() == COLLAPSE_WHITESPACE ) { + flags |= StrPair::NEEDS_WHITESPACE_COLLAPSING; + } + + p = _value.ParseText( p, "<", flags, curLineNumPtr ); + if ( p && *p ) { + return p-1; + } + if ( !p ) { + _document->SetError( XML_ERROR_PARSING_TEXT, _parseLineNum, 0 ); + } + } + return 0; +} + + +XMLNode* XMLText::ShallowClone( XMLDocument* doc ) const +{ + if ( !doc ) { + doc = _document; + } + XMLText* text = doc->NewText( Value() ); // fixme: this will always allocate memory. Intern? + text->SetCData( this->CData() ); + return text; +} + + +bool XMLText::ShallowEqual( const XMLNode* compare ) const +{ + TIXMLASSERT( compare ); + const XMLText* text = compare->ToText(); + return ( text && XMLUtil::StringEqual( text->Value(), Value() ) ); +} + + +bool XMLText::Accept( XMLVisitor* visitor ) const +{ + TIXMLASSERT( visitor ); + return visitor->Visit( *this ); +} + + +// --------- XMLComment ---------- // + +XMLComment::XMLComment( XMLDocument* doc ) : XMLNode( doc ) +{ +} + + +XMLComment::~XMLComment() +{ +} + + +char* XMLComment::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) +{ + // Comment parses as text. + p = _value.ParseText( p, "-->", StrPair::COMMENT, curLineNumPtr ); + if ( p == 0 ) { + _document->SetError( XML_ERROR_PARSING_COMMENT, _parseLineNum, 0 ); + } + return p; +} + + +XMLNode* XMLComment::ShallowClone( XMLDocument* doc ) const +{ + if ( !doc ) { + doc = _document; + } + XMLComment* comment = doc->NewComment( Value() ); // fixme: this will always allocate memory. Intern? + return comment; +} + + +bool XMLComment::ShallowEqual( const XMLNode* compare ) const +{ + TIXMLASSERT( compare ); + const XMLComment* comment = compare->ToComment(); + return ( comment && XMLUtil::StringEqual( comment->Value(), Value() )); +} + + +bool XMLComment::Accept( XMLVisitor* visitor ) const +{ + TIXMLASSERT( visitor ); + return visitor->Visit( *this ); +} + + +// --------- XMLDeclaration ---------- // + +XMLDeclaration::XMLDeclaration( XMLDocument* doc ) : XMLNode( doc ) +{ +} + + +XMLDeclaration::~XMLDeclaration() +{ + //printf( "~XMLDeclaration\n" ); +} + + +char* XMLDeclaration::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) +{ + // Declaration parses as text. + p = _value.ParseText( p, "?>", StrPair::NEEDS_NEWLINE_NORMALIZATION, curLineNumPtr ); + if ( p == 0 ) { + _document->SetError( XML_ERROR_PARSING_DECLARATION, _parseLineNum, 0 ); + } + return p; +} + + +XMLNode* XMLDeclaration::ShallowClone( XMLDocument* doc ) const +{ + if ( !doc ) { + doc = _document; + } + XMLDeclaration* dec = doc->NewDeclaration( Value() ); // fixme: this will always allocate memory. Intern? + return dec; +} + + +bool XMLDeclaration::ShallowEqual( const XMLNode* compare ) const +{ + TIXMLASSERT( compare ); + const XMLDeclaration* declaration = compare->ToDeclaration(); + return ( declaration && XMLUtil::StringEqual( declaration->Value(), Value() )); +} + + + +bool XMLDeclaration::Accept( XMLVisitor* visitor ) const +{ + TIXMLASSERT( visitor ); + return visitor->Visit( *this ); +} + +// --------- XMLUnknown ---------- // + +XMLUnknown::XMLUnknown( XMLDocument* doc ) : XMLNode( doc ) +{ +} + + +XMLUnknown::~XMLUnknown() +{ +} + + +char* XMLUnknown::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) +{ + // Unknown parses as text. + p = _value.ParseText( p, ">", StrPair::NEEDS_NEWLINE_NORMALIZATION, curLineNumPtr ); + if ( !p ) { + _document->SetError( XML_ERROR_PARSING_UNKNOWN, _parseLineNum, 0 ); + } + return p; +} + + +XMLNode* XMLUnknown::ShallowClone( XMLDocument* doc ) const +{ + if ( !doc ) { + doc = _document; + } + XMLUnknown* text = doc->NewUnknown( Value() ); // fixme: this will always allocate memory. Intern? + return text; +} + + +bool XMLUnknown::ShallowEqual( const XMLNode* compare ) const +{ + TIXMLASSERT( compare ); + const XMLUnknown* unknown = compare->ToUnknown(); + return ( unknown && XMLUtil::StringEqual( unknown->Value(), Value() )); +} + + +bool XMLUnknown::Accept( XMLVisitor* visitor ) const +{ + TIXMLASSERT( visitor ); + return visitor->Visit( *this ); +} + +// --------- XMLAttribute ---------- // + +const char* XMLAttribute::Name() const +{ + return _name.GetStr(); +} + +const char* XMLAttribute::Value() const +{ + return _value.GetStr(); +} + +char* XMLAttribute::ParseDeep( char* p, bool processEntities, int* curLineNumPtr ) +{ + // Parse using the name rules: bug fix, was using ParseText before + p = _name.ParseName( p ); + if ( !p || !*p ) { + return 0; + } + + // Skip white space before = + p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); + if ( *p != '=' ) { + return 0; + } + + ++p; // move up to opening quote + p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); + if ( *p != '\"' && *p != '\'' ) { + return 0; + } + + const char endTag[2] = { *p, 0 }; + ++p; // move past opening quote + + p = _value.ParseText( p, endTag, processEntities ? StrPair::ATTRIBUTE_VALUE : StrPair::ATTRIBUTE_VALUE_LEAVE_ENTITIES, curLineNumPtr ); + return p; +} + + +void XMLAttribute::SetName( const char* n ) +{ + _name.SetStr( n ); +} + + +XMLError XMLAttribute::QueryIntValue( int* value ) const +{ + if ( XMLUtil::ToInt( Value(), value )) { + return XML_SUCCESS; + } + return XML_WRONG_ATTRIBUTE_TYPE; +} + + +XMLError XMLAttribute::QueryUnsignedValue( unsigned int* value ) const +{ + if ( XMLUtil::ToUnsigned( Value(), value )) { + return XML_SUCCESS; + } + return XML_WRONG_ATTRIBUTE_TYPE; +} + + +XMLError XMLAttribute::QueryInt64Value(int64_t* value) const +{ + if (XMLUtil::ToInt64(Value(), value)) { + return XML_SUCCESS; + } + return XML_WRONG_ATTRIBUTE_TYPE; +} + + +XMLError XMLAttribute::QueryBoolValue( bool* value ) const +{ + if ( XMLUtil::ToBool( Value(), value )) { + return XML_SUCCESS; + } + return XML_WRONG_ATTRIBUTE_TYPE; +} + + +XMLError XMLAttribute::QueryFloatValue( float* value ) const +{ + if ( XMLUtil::ToFloat( Value(), value )) { + return XML_SUCCESS; + } + return XML_WRONG_ATTRIBUTE_TYPE; +} + + +XMLError XMLAttribute::QueryDoubleValue( double* value ) const +{ + if ( XMLUtil::ToDouble( Value(), value )) { + return XML_SUCCESS; + } + return XML_WRONG_ATTRIBUTE_TYPE; +} + + +void XMLAttribute::SetAttribute( const char* v ) +{ + _value.SetStr( v ); +} + + +void XMLAttribute::SetAttribute( int v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + _value.SetStr( buf ); +} + + +void XMLAttribute::SetAttribute( unsigned v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + _value.SetStr( buf ); +} + + +void XMLAttribute::SetAttribute(int64_t v) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr(v, buf, BUF_SIZE); + _value.SetStr(buf); +} + + + +void XMLAttribute::SetAttribute( bool v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + _value.SetStr( buf ); +} + +void XMLAttribute::SetAttribute( double v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + _value.SetStr( buf ); +} + +void XMLAttribute::SetAttribute( float v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + _value.SetStr( buf ); +} + + +// --------- XMLElement ---------- // +XMLElement::XMLElement( XMLDocument* doc ) : XMLNode( doc ), + _closingType( OPEN ), + _rootAttribute( 0 ) +{ +} + + +XMLElement::~XMLElement() +{ + while( _rootAttribute ) { + XMLAttribute* next = _rootAttribute->_next; + DeleteAttribute( _rootAttribute ); + _rootAttribute = next; + } +} + + +const XMLAttribute* XMLElement::FindAttribute( const char* name ) const +{ + for( XMLAttribute* a = _rootAttribute; a; a = a->_next ) { + if ( XMLUtil::StringEqual( a->Name(), name ) ) { + return a; + } + } + return 0; +} + + +const char* XMLElement::Attribute( const char* name, const char* value ) const +{ + const XMLAttribute* a = FindAttribute( name ); + if ( !a ) { + return 0; + } + if ( !value || XMLUtil::StringEqual( a->Value(), value )) { + return a->Value(); + } + return 0; +} + +int XMLElement::IntAttribute(const char* name, int defaultValue) const +{ + int i = defaultValue; + QueryIntAttribute(name, &i); + return i; +} + +unsigned XMLElement::UnsignedAttribute(const char* name, unsigned defaultValue) const +{ + unsigned i = defaultValue; + QueryUnsignedAttribute(name, &i); + return i; +} + +int64_t XMLElement::Int64Attribute(const char* name, int64_t defaultValue) const +{ + int64_t i = defaultValue; + QueryInt64Attribute(name, &i); + return i; +} + +bool XMLElement::BoolAttribute(const char* name, bool defaultValue) const +{ + bool b = defaultValue; + QueryBoolAttribute(name, &b); + return b; +} + +double XMLElement::DoubleAttribute(const char* name, double defaultValue) const +{ + double d = defaultValue; + QueryDoubleAttribute(name, &d); + return d; +} + +float XMLElement::FloatAttribute(const char* name, float defaultValue) const +{ + float f = defaultValue; + QueryFloatAttribute(name, &f); + return f; +} + +const char* XMLElement::GetText() const +{ + if ( FirstChild() && FirstChild()->ToText() ) { + return FirstChild()->Value(); + } + return 0; +} + + +void XMLElement::SetText( const char* inText ) +{ + if ( FirstChild() && FirstChild()->ToText() ) + FirstChild()->SetValue( inText ); + else { + XMLText* theText = GetDocument()->NewText( inText ); + InsertFirstChild( theText ); + } +} + + +void XMLElement::SetText( int v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + SetText( buf ); +} + + +void XMLElement::SetText( unsigned v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + SetText( buf ); +} + + +void XMLElement::SetText(int64_t v) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr(v, buf, BUF_SIZE); + SetText(buf); +} + + +void XMLElement::SetText( bool v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + SetText( buf ); +} + + +void XMLElement::SetText( float v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + SetText( buf ); +} + + +void XMLElement::SetText( double v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + SetText( buf ); +} + + +XMLError XMLElement::QueryIntText( int* ival ) const +{ + if ( FirstChild() && FirstChild()->ToText() ) { + const char* t = FirstChild()->Value(); + if ( XMLUtil::ToInt( t, ival ) ) { + return XML_SUCCESS; + } + return XML_CAN_NOT_CONVERT_TEXT; + } + return XML_NO_TEXT_NODE; +} + + +XMLError XMLElement::QueryUnsignedText( unsigned* uval ) const +{ + if ( FirstChild() && FirstChild()->ToText() ) { + const char* t = FirstChild()->Value(); + if ( XMLUtil::ToUnsigned( t, uval ) ) { + return XML_SUCCESS; + } + return XML_CAN_NOT_CONVERT_TEXT; + } + return XML_NO_TEXT_NODE; +} + + +XMLError XMLElement::QueryInt64Text(int64_t* ival) const +{ + if (FirstChild() && FirstChild()->ToText()) { + const char* t = FirstChild()->Value(); + if (XMLUtil::ToInt64(t, ival)) { + return XML_SUCCESS; + } + return XML_CAN_NOT_CONVERT_TEXT; + } + return XML_NO_TEXT_NODE; +} + + +XMLError XMLElement::QueryBoolText( bool* bval ) const +{ + if ( FirstChild() && FirstChild()->ToText() ) { + const char* t = FirstChild()->Value(); + if ( XMLUtil::ToBool( t, bval ) ) { + return XML_SUCCESS; + } + return XML_CAN_NOT_CONVERT_TEXT; + } + return XML_NO_TEXT_NODE; +} + + +XMLError XMLElement::QueryDoubleText( double* dval ) const +{ + if ( FirstChild() && FirstChild()->ToText() ) { + const char* t = FirstChild()->Value(); + if ( XMLUtil::ToDouble( t, dval ) ) { + return XML_SUCCESS; + } + return XML_CAN_NOT_CONVERT_TEXT; + } + return XML_NO_TEXT_NODE; +} + + +XMLError XMLElement::QueryFloatText( float* fval ) const +{ + if ( FirstChild() && FirstChild()->ToText() ) { + const char* t = FirstChild()->Value(); + if ( XMLUtil::ToFloat( t, fval ) ) { + return XML_SUCCESS; + } + return XML_CAN_NOT_CONVERT_TEXT; + } + return XML_NO_TEXT_NODE; +} + +int XMLElement::IntText(int defaultValue) const +{ + int i = defaultValue; + QueryIntText(&i); + return i; +} + +unsigned XMLElement::UnsignedText(unsigned defaultValue) const +{ + unsigned i = defaultValue; + QueryUnsignedText(&i); + return i; +} + +int64_t XMLElement::Int64Text(int64_t defaultValue) const +{ + int64_t i = defaultValue; + QueryInt64Text(&i); + return i; +} + +bool XMLElement::BoolText(bool defaultValue) const +{ + bool b = defaultValue; + QueryBoolText(&b); + return b; +} + +double XMLElement::DoubleText(double defaultValue) const +{ + double d = defaultValue; + QueryDoubleText(&d); + return d; +} + +float XMLElement::FloatText(float defaultValue) const +{ + float f = defaultValue; + QueryFloatText(&f); + return f; +} + + +XMLAttribute* XMLElement::FindOrCreateAttribute( const char* name ) +{ + XMLAttribute* last = 0; + XMLAttribute* attrib = 0; + for( attrib = _rootAttribute; + attrib; + last = attrib, attrib = attrib->_next ) { + if ( XMLUtil::StringEqual( attrib->Name(), name ) ) { + break; + } + } + if ( !attrib ) { + attrib = CreateAttribute(); + TIXMLASSERT( attrib ); + if ( last ) { + TIXMLASSERT( last->_next == 0 ); + last->_next = attrib; + } + else { + TIXMLASSERT( _rootAttribute == 0 ); + _rootAttribute = attrib; + } + attrib->SetName( name ); + } + return attrib; +} + + +void XMLElement::DeleteAttribute( const char* name ) +{ + XMLAttribute* prev = 0; + for( XMLAttribute* a=_rootAttribute; a; a=a->_next ) { + if ( XMLUtil::StringEqual( name, a->Name() ) ) { + if ( prev ) { + prev->_next = a->_next; + } + else { + _rootAttribute = a->_next; + } + DeleteAttribute( a ); + break; + } + prev = a; + } +} + + +char* XMLElement::ParseAttributes( char* p, int* curLineNumPtr ) +{ + XMLAttribute* prevAttribute = 0; + + // Read the attributes. + while( p ) { + p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); + if ( !(*p) ) { + _document->SetError( XML_ERROR_PARSING_ELEMENT, _parseLineNum, "XMLElement name=%s", Name() ); + return 0; + } + + // attribute. + if (XMLUtil::IsNameStartChar( *p ) ) { + XMLAttribute* attrib = CreateAttribute(); + TIXMLASSERT( attrib ); + attrib->_parseLineNum = _document->_parseCurLineNum; + + const int attrLineNum = attrib->_parseLineNum; + + p = attrib->ParseDeep( p, _document->ProcessEntities(), curLineNumPtr ); + if ( !p || Attribute( attrib->Name() ) ) { + DeleteAttribute( attrib ); + _document->SetError( XML_ERROR_PARSING_ATTRIBUTE, attrLineNum, "XMLElement name=%s", Name() ); + return 0; + } + // There is a minor bug here: if the attribute in the source xml + // document is duplicated, it will not be detected and the + // attribute will be doubly added. However, tracking the 'prevAttribute' + // avoids re-scanning the attribute list. Preferring performance for + // now, may reconsider in the future. + if ( prevAttribute ) { + TIXMLASSERT( prevAttribute->_next == 0 ); + prevAttribute->_next = attrib; + } + else { + TIXMLASSERT( _rootAttribute == 0 ); + _rootAttribute = attrib; + } + prevAttribute = attrib; + } + // end of the tag + else if ( *p == '>' ) { + ++p; + break; + } + // end of the tag + else if ( *p == '/' && *(p+1) == '>' ) { + _closingType = CLOSED; + return p+2; // done; sealed element. + } + else { + _document->SetError( XML_ERROR_PARSING_ELEMENT, _parseLineNum, 0 ); + return 0; + } + } + return p; +} + +void XMLElement::DeleteAttribute( XMLAttribute* attribute ) +{ + if ( attribute == 0 ) { + return; + } + MemPool* pool = attribute->_memPool; + attribute->~XMLAttribute(); + pool->Free( attribute ); +} + +XMLAttribute* XMLElement::CreateAttribute() +{ + TIXMLASSERT( sizeof( XMLAttribute ) == _document->_attributePool.ItemSize() ); + XMLAttribute* attrib = new (_document->_attributePool.Alloc() ) XMLAttribute(); + TIXMLASSERT( attrib ); + attrib->_memPool = &_document->_attributePool; + attrib->_memPool->SetTracked(); + return attrib; +} + +// +// <ele></ele> +// <ele>foo<b>bar</b></ele> +// +char* XMLElement::ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) +{ + // Read the element name. + p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); + + // The closing element is the </element> form. It is + // parsed just like a regular element then deleted from + // the DOM. + if ( *p == '/' ) { + _closingType = CLOSING; + ++p; + } + + p = _value.ParseName( p ); + if ( _value.Empty() ) { + return 0; + } + + p = ParseAttributes( p, curLineNumPtr ); + if ( !p || !*p || _closingType != OPEN ) { + return p; + } + + p = XMLNode::ParseDeep( p, parentEndTag, curLineNumPtr ); + return p; +} + + + +XMLNode* XMLElement::ShallowClone( XMLDocument* doc ) const +{ + if ( !doc ) { + doc = _document; + } + XMLElement* element = doc->NewElement( Value() ); // fixme: this will always allocate memory. Intern? + for( const XMLAttribute* a=FirstAttribute(); a; a=a->Next() ) { + element->SetAttribute( a->Name(), a->Value() ); // fixme: this will always allocate memory. Intern? + } + return element; +} + + +bool XMLElement::ShallowEqual( const XMLNode* compare ) const +{ + TIXMLASSERT( compare ); + const XMLElement* other = compare->ToElement(); + if ( other && XMLUtil::StringEqual( other->Name(), Name() )) { + + const XMLAttribute* a=FirstAttribute(); + const XMLAttribute* b=other->FirstAttribute(); + + while ( a && b ) { + if ( !XMLUtil::StringEqual( a->Value(), b->Value() ) ) { + return false; + } + a = a->Next(); + b = b->Next(); + } + if ( a || b ) { + // different count + return false; + } + return true; + } + return false; +} + + +bool XMLElement::Accept( XMLVisitor* visitor ) const +{ + TIXMLASSERT( visitor ); + if ( visitor->VisitEnter( *this, _rootAttribute ) ) { + for ( const XMLNode* node=FirstChild(); node; node=node->NextSibling() ) { + if ( !node->Accept( visitor ) ) { + break; + } + } + } + return visitor->VisitExit( *this ); +} + + +// --------- XMLDocument ----------- // + +// Warning: List must match 'enum XMLError' +const char* XMLDocument::_errorNames[XML_ERROR_COUNT] = { + "XML_SUCCESS", + "XML_NO_ATTRIBUTE", + "XML_WRONG_ATTRIBUTE_TYPE", + "XML_ERROR_FILE_NOT_FOUND", + "XML_ERROR_FILE_COULD_NOT_BE_OPENED", + "XML_ERROR_FILE_READ_ERROR", + "XML_ERROR_PARSING_ELEMENT", + "XML_ERROR_PARSING_ATTRIBUTE", + "XML_ERROR_PARSING_TEXT", + "XML_ERROR_PARSING_CDATA", + "XML_ERROR_PARSING_COMMENT", + "XML_ERROR_PARSING_DECLARATION", + "XML_ERROR_PARSING_UNKNOWN", + "XML_ERROR_EMPTY_DOCUMENT", + "XML_ERROR_MISMATCHED_ELEMENT", + "XML_ERROR_PARSING", + "XML_CAN_NOT_CONVERT_TEXT", + "XML_NO_TEXT_NODE", + "XML_ELEMENT_DEPTH_EXCEEDED" +}; + + +XMLDocument::XMLDocument( bool processEntities, Whitespace whitespaceMode ) : + XMLNode( 0 ), + _writeBOM( false ), + _processEntities( processEntities ), + _errorID(XML_SUCCESS), + _whitespaceMode( whitespaceMode ), + _errorStr(), + _errorLineNum( 0 ), + _charBuffer( 0 ), + _parseCurLineNum( 0 ), + _parsingDepth(0), + _unlinked(), + _elementPool(), + _attributePool(), + _textPool(), + _commentPool() +{ + // avoid VC++ C4355 warning about 'this' in initializer list (C4355 is off by default in VS2012+) + _document = this; +} + + +XMLDocument::~XMLDocument() +{ + Clear(); +} + + +void XMLDocument::MarkInUse(XMLNode* node) +{ + TIXMLASSERT(node); + TIXMLASSERT(node->_parent == 0); + + for (int i = 0; i < _unlinked.Size(); ++i) { + if (node == _unlinked[i]) { + _unlinked.SwapRemove(i); + break; + } + } +} + +void XMLDocument::Clear() +{ + DeleteChildren(); + while( _unlinked.Size()) { + DeleteNode(_unlinked[0]); // Will remove from _unlinked as part of delete. + } + +#ifdef TINYXML2_DEBUG + const bool hadError = Error(); +#endif + ClearError(); + + delete [] _charBuffer; + _charBuffer = 0; + _parsingDepth = 0; + +#if 0 + _textPool.Trace( "text" ); + _elementPool.Trace( "element" ); + _commentPool.Trace( "comment" ); + _attributePool.Trace( "attribute" ); +#endif + +#ifdef TINYXML2_DEBUG + if ( !hadError ) { + TIXMLASSERT( _elementPool.CurrentAllocs() == _elementPool.Untracked() ); + TIXMLASSERT( _attributePool.CurrentAllocs() == _attributePool.Untracked() ); + TIXMLASSERT( _textPool.CurrentAllocs() == _textPool.Untracked() ); + TIXMLASSERT( _commentPool.CurrentAllocs() == _commentPool.Untracked() ); + } +#endif +} + + +void XMLDocument::DeepCopy(XMLDocument* target) const +{ + TIXMLASSERT(target); + if (target == this) { + return; // technically success - a no-op. + } + + target->Clear(); + for (const XMLNode* node = this->FirstChild(); node; node = node->NextSibling()) { + target->InsertEndChild(node->DeepClone(target)); + } +} + +XMLElement* XMLDocument::NewElement( const char* name ) +{ + XMLElement* ele = CreateUnlinkedNode<XMLElement>( _elementPool ); + ele->SetName( name ); + return ele; +} + + +XMLComment* XMLDocument::NewComment( const char* str ) +{ + XMLComment* comment = CreateUnlinkedNode<XMLComment>( _commentPool ); + comment->SetValue( str ); + return comment; +} + + +XMLText* XMLDocument::NewText( const char* str ) +{ + XMLText* text = CreateUnlinkedNode<XMLText>( _textPool ); + text->SetValue( str ); + return text; +} + + +XMLDeclaration* XMLDocument::NewDeclaration( const char* str ) +{ + XMLDeclaration* dec = CreateUnlinkedNode<XMLDeclaration>( _commentPool ); + dec->SetValue( str ? str : "xml version=\"1.0\" encoding=\"UTF-8\"" ); + return dec; +} + + +XMLUnknown* XMLDocument::NewUnknown( const char* str ) +{ + XMLUnknown* unk = CreateUnlinkedNode<XMLUnknown>( _commentPool ); + unk->SetValue( str ); + return unk; +} + +static FILE* callfopen( const char* filepath, const char* mode ) +{ + TIXMLASSERT( filepath ); + TIXMLASSERT( mode ); +#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (!defined WINCE) + FILE* fp = 0; + const errno_t err = fopen_s( &fp, filepath, mode ); + if ( err ) { + return 0; + } +#else + FILE* fp = fopen( filepath, mode ); +#endif + return fp; +} + +void XMLDocument::DeleteNode( XMLNode* node ) { + TIXMLASSERT( node ); + TIXMLASSERT(node->_document == this ); + if (node->_parent) { + node->_parent->DeleteChild( node ); + } + else { + // Isn't in the tree. + // Use the parent delete. + // Also, we need to mark it tracked: we 'know' + // it was never used. + node->_memPool->SetTracked(); + // Call the static XMLNode version: + XMLNode::DeleteNode(node); + } +} + + +XMLError XMLDocument::LoadFile( const char* filename ) +{ + if ( !filename ) { + TIXMLASSERT( false ); + SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, 0, "filename=<null>" ); + return _errorID; + } + + Clear(); + FILE* fp = callfopen( filename, "rb" ); + if ( !fp ) { + SetError( XML_ERROR_FILE_NOT_FOUND, 0, "filename=%s", filename ); + return _errorID; + } + LoadFile( fp ); + fclose( fp ); + return _errorID; +} + +// This is likely overengineered template art to have a check that unsigned long value incremented +// by one still fits into size_t. If size_t type is larger than unsigned long type +// (x86_64-w64-mingw32 target) then the check is redundant and gcc and clang emit +// -Wtype-limits warning. This piece makes the compiler select code with a check when a check +// is useful and code with no check when a check is redundant depending on how size_t and unsigned long +// types sizes relate to each other. +template +<bool = (sizeof(unsigned long) >= sizeof(size_t))> +struct LongFitsIntoSizeTMinusOne { + static bool Fits( unsigned long value ) + { + return value < (size_t)-1; + } +}; + +template <> +struct LongFitsIntoSizeTMinusOne<false> { + static bool Fits( unsigned long ) + { + return true; + } +}; + +XMLError XMLDocument::LoadFile( FILE* fp ) +{ + Clear(); + + fseek( fp, 0, SEEK_SET ); + if ( fgetc( fp ) == EOF && ferror( fp ) != 0 ) { + SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); + return _errorID; + } + + fseek( fp, 0, SEEK_END ); + const long filelength = ftell( fp ); + fseek( fp, 0, SEEK_SET ); + if ( filelength == -1L ) { + SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); + return _errorID; + } + TIXMLASSERT( filelength >= 0 ); + + if ( !LongFitsIntoSizeTMinusOne<>::Fits( filelength ) ) { + // Cannot handle files which won't fit in buffer together with null terminator + SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); + return _errorID; + } + + if ( filelength == 0 ) { + SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); + return _errorID; + } + + const size_t size = filelength; + TIXMLASSERT( _charBuffer == 0 ); + _charBuffer = new char[size+1]; + const size_t read = fread( _charBuffer, 1, size, fp ); + if ( read != size ) { + SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); + return _errorID; + } + + _charBuffer[size] = 0; + + Parse(); + return _errorID; +} + + +XMLError XMLDocument::SaveFile( const char* filename, bool compact ) +{ + if ( !filename ) { + TIXMLASSERT( false ); + SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, 0, "filename=<null>" ); + return _errorID; + } + + FILE* fp = callfopen( filename, "w" ); + if ( !fp ) { + SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, 0, "filename=%s", filename ); + return _errorID; + } + SaveFile(fp, compact); + fclose( fp ); + return _errorID; +} + + +XMLError XMLDocument::SaveFile( FILE* fp, bool compact ) +{ + // Clear any error from the last save, otherwise it will get reported + // for *this* call. + ClearError(); + XMLPrinter stream( fp, compact ); + Print( &stream ); + return _errorID; +} + + +XMLError XMLDocument::Parse( const char* p, size_t len ) +{ + Clear(); + + if ( len == 0 || !p || !*p ) { + SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); + return _errorID; + } + if ( len == (size_t)(-1) ) { + len = strlen( p ); + } + TIXMLASSERT( _charBuffer == 0 ); + _charBuffer = new char[ len+1 ]; + memcpy( _charBuffer, p, len ); + _charBuffer[len] = 0; + + Parse(); + if ( Error() ) { + // clean up now essentially dangling memory. + // and the parse fail can put objects in the + // pools that are dead and inaccessible. + DeleteChildren(); + _elementPool.Clear(); + _attributePool.Clear(); + _textPool.Clear(); + _commentPool.Clear(); + } + return _errorID; +} + + +void XMLDocument::Print( XMLPrinter* streamer ) const +{ + if ( streamer ) { + Accept( streamer ); + } + else { + XMLPrinter stdoutStreamer( stdout ); + Accept( &stdoutStreamer ); + } +} + + +void XMLDocument::SetError( XMLError error, int lineNum, const char* format, ... ) +{ + TIXMLASSERT( error >= 0 && error < XML_ERROR_COUNT ); + _errorID = error; + _errorLineNum = lineNum; + _errorStr.Reset(); + + const size_t BUFFER_SIZE = 1000; + char* buffer = new char[BUFFER_SIZE]; + + TIXMLASSERT(sizeof(error) <= sizeof(int)); + TIXML_SNPRINTF(buffer, BUFFER_SIZE, "Error=%s ErrorID=%d (0x%x) Line number=%d", ErrorIDToName(error), int(error), int(error), lineNum); + + if (format) { + size_t len = strlen(buffer); + TIXML_SNPRINTF(buffer + len, BUFFER_SIZE - len, ": "); + len = strlen(buffer); + + va_list va; + va_start(va, format); + TIXML_VSNPRINTF(buffer + len, BUFFER_SIZE - len, format, va); + va_end(va); + } + _errorStr.SetStr(buffer); + delete[] buffer; +} + + +/*static*/ const char* XMLDocument::ErrorIDToName(XMLError errorID) +{ + TIXMLASSERT( errorID >= 0 && errorID < XML_ERROR_COUNT ); + const char* errorName = _errorNames[errorID]; + TIXMLASSERT( errorName && errorName[0] ); + return errorName; +} + +const char* XMLDocument::ErrorStr() const +{ + return _errorStr.Empty() ? "" : _errorStr.GetStr(); +} + + +void XMLDocument::PrintError() const +{ + printf("%s\n", ErrorStr()); +} + +const char* XMLDocument::ErrorName() const +{ + return ErrorIDToName(_errorID); +} + +void XMLDocument::Parse() +{ + TIXMLASSERT( NoChildren() ); // Clear() must have been called previously + TIXMLASSERT( _charBuffer ); + _parseCurLineNum = 1; + _parseLineNum = 1; + char* p = _charBuffer; + p = XMLUtil::SkipWhiteSpace( p, &_parseCurLineNum ); + p = const_cast<char*>( XMLUtil::ReadBOM( p, &_writeBOM ) ); + if ( !*p ) { + SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); + return; + } + ParseDeep(p, 0, &_parseCurLineNum ); +} + +void XMLDocument::PushDepth() +{ + _parsingDepth++; + if (_parsingDepth == TINYXML2_MAX_ELEMENT_DEPTH) { + SetError(XML_ELEMENT_DEPTH_EXCEEDED, _parseCurLineNum, "Element nesting is too deep." ); + } +} + +void XMLDocument::PopDepth() +{ + TIXMLASSERT(_parsingDepth > 0); + --_parsingDepth; +} + +XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) : + _elementJustOpened( false ), + _stack(), + _firstElement( true ), + _fp( file ), + _depth( depth ), + _textDepth( -1 ), + _processEntities( true ), + _compactMode( compact ), + _buffer() +{ + for( int i=0; i<ENTITY_RANGE; ++i ) { + _entityFlag[i] = false; + _restrictedEntityFlag[i] = false; + } + for( int i=0; i<NUM_ENTITIES; ++i ) { + const char entityValue = entities[i].value; + const unsigned char flagIndex = (unsigned char)entityValue; + TIXMLASSERT( flagIndex < ENTITY_RANGE ); + _entityFlag[flagIndex] = true; + } + _restrictedEntityFlag[(unsigned char)'&'] = true; + _restrictedEntityFlag[(unsigned char)'<'] = true; + _restrictedEntityFlag[(unsigned char)'>'] = true; // not required, but consistency is nice + _buffer.Push( 0 ); +} + + +void XMLPrinter::Print( const char* format, ... ) +{ + va_list va; + va_start( va, format ); + + if ( _fp ) { + vfprintf( _fp, format, va ); + } + else { + const int len = TIXML_VSCPRINTF( format, va ); + // Close out and re-start the va-args + va_end( va ); + TIXMLASSERT( len >= 0 ); + va_start( va, format ); + TIXMLASSERT( _buffer.Size() > 0 && _buffer[_buffer.Size() - 1] == 0 ); + char* p = _buffer.PushArr( len ) - 1; // back up over the null terminator. + TIXML_VSNPRINTF( p, len+1, format, va ); + } + va_end( va ); +} + + +void XMLPrinter::Write( const char* data, size_t size ) +{ + if ( _fp ) { + fwrite ( data , sizeof(char), size, _fp); + } + else { + char* p = _buffer.PushArr( static_cast<int>(size) ) - 1; // back up over the null terminator. + memcpy( p, data, size ); + p[size] = 0; + } +} + + +void XMLPrinter::Putc( char ch ) +{ + if ( _fp ) { + fputc ( ch, _fp); + } + else { + char* p = _buffer.PushArr( sizeof(char) ) - 1; // back up over the null terminator. + p[0] = ch; + p[1] = 0; + } +} + + +void XMLPrinter::PrintSpace( int depth ) +{ + for( int i=0; i<depth; ++i ) { + Write( " " ); + } +} + + +void XMLPrinter::PrintString( const char* p, bool restricted ) +{ + // Look for runs of bytes between entities to print. + const char* q = p; + + if ( _processEntities ) { + const bool* flag = restricted ? _restrictedEntityFlag : _entityFlag; + while ( *q ) { + TIXMLASSERT( p <= q ); + // Remember, char is sometimes signed. (How many times has that bitten me?) + if ( *q > 0 && *q < ENTITY_RANGE ) { + // Check for entities. If one is found, flush + // the stream up until the entity, write the + // entity, and keep looking. + if ( flag[(unsigned char)(*q)] ) { + while ( p < q ) { + const size_t delta = q - p; + const int toPrint = ( INT_MAX < delta ) ? INT_MAX : (int)delta; + Write( p, toPrint ); + p += toPrint; + } + bool entityPatternPrinted = false; + for( int i=0; i<NUM_ENTITIES; ++i ) { + if ( entities[i].value == *q ) { + Putc( '&' ); + Write( entities[i].pattern, entities[i].length ); + Putc( ';' ); + entityPatternPrinted = true; + break; + } + } + if ( !entityPatternPrinted ) { + // TIXMLASSERT( entityPatternPrinted ) causes gcc -Wunused-but-set-variable in release + TIXMLASSERT( false ); + } + ++p; + } + } + ++q; + TIXMLASSERT( p <= q ); + } + // Flush the remaining string. This will be the entire + // string if an entity wasn't found. + if ( p < q ) { + const size_t delta = q - p; + const int toPrint = ( INT_MAX < delta ) ? INT_MAX : (int)delta; + Write( p, toPrint ); + } + } + else { + Write( p ); + } +} + + +void XMLPrinter::PushHeader( bool writeBOM, bool writeDec ) +{ + if ( writeBOM ) { + static const unsigned char bom[] = { TIXML_UTF_LEAD_0, TIXML_UTF_LEAD_1, TIXML_UTF_LEAD_2, 0 }; + Write( reinterpret_cast< const char* >( bom ) ); + } + if ( writeDec ) { + PushDeclaration( "xml version=\"1.0\"" ); + } +} + + +void XMLPrinter::OpenElement( const char* name, bool compactMode ) +{ + SealElementIfJustOpened(); + _stack.Push( name ); + + if ( _textDepth < 0 && !_firstElement && !compactMode ) { + Putc( '\n' ); + } + if ( !compactMode ) { + PrintSpace( _depth ); + } + + Write ( "<" ); + Write ( name ); + + _elementJustOpened = true; + _firstElement = false; + ++_depth; +} + + +void XMLPrinter::PushAttribute( const char* name, const char* value ) +{ + TIXMLASSERT( _elementJustOpened ); + Putc ( ' ' ); + Write( name ); + Write( "=\"" ); + PrintString( value, false ); + Putc ( '\"' ); +} + + +void XMLPrinter::PushAttribute( const char* name, int v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + PushAttribute( name, buf ); +} + + +void XMLPrinter::PushAttribute( const char* name, unsigned v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + PushAttribute( name, buf ); +} + + +void XMLPrinter::PushAttribute(const char* name, int64_t v) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr(v, buf, BUF_SIZE); + PushAttribute(name, buf); +} + + +void XMLPrinter::PushAttribute( const char* name, bool v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + PushAttribute( name, buf ); +} + + +void XMLPrinter::PushAttribute( const char* name, double v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + PushAttribute( name, buf ); +} + + +void XMLPrinter::CloseElement( bool compactMode ) +{ + --_depth; + const char* name = _stack.Pop(); + + if ( _elementJustOpened ) { + Write( "/>" ); + } + else { + if ( _textDepth < 0 && !compactMode) { + Putc( '\n' ); + PrintSpace( _depth ); + } + Write ( "</" ); + Write ( name ); + Write ( ">" ); + } + + if ( _textDepth == _depth ) { + _textDepth = -1; + } + if ( _depth == 0 && !compactMode) { + Putc( '\n' ); + } + _elementJustOpened = false; +} + + +void XMLPrinter::SealElementIfJustOpened() +{ + if ( !_elementJustOpened ) { + return; + } + _elementJustOpened = false; + Putc( '>' ); +} + + +void XMLPrinter::PushText( const char* text, bool cdata ) +{ + _textDepth = _depth-1; + + SealElementIfJustOpened(); + if ( cdata ) { + Write( "<![CDATA[" ); + Write( text ); + Write( "]]>" ); + } + else { + PrintString( text, true ); + } +} + +void XMLPrinter::PushText( int64_t value ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( value, buf, BUF_SIZE ); + PushText( buf, false ); +} + +void XMLPrinter::PushText( int value ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( value, buf, BUF_SIZE ); + PushText( buf, false ); +} + + +void XMLPrinter::PushText( unsigned value ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( value, buf, BUF_SIZE ); + PushText( buf, false ); +} + + +void XMLPrinter::PushText( bool value ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( value, buf, BUF_SIZE ); + PushText( buf, false ); +} + + +void XMLPrinter::PushText( float value ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( value, buf, BUF_SIZE ); + PushText( buf, false ); +} + + +void XMLPrinter::PushText( double value ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( value, buf, BUF_SIZE ); + PushText( buf, false ); +} + + +void XMLPrinter::PushComment( const char* comment ) +{ + SealElementIfJustOpened(); + if ( _textDepth < 0 && !_firstElement && !_compactMode) { + Putc( '\n' ); + PrintSpace( _depth ); + } + _firstElement = false; + + Write( "<!--" ); + Write( comment ); + Write( "-->" ); +} + + +void XMLPrinter::PushDeclaration( const char* value ) +{ + SealElementIfJustOpened(); + if ( _textDepth < 0 && !_firstElement && !_compactMode) { + Putc( '\n' ); + PrintSpace( _depth ); + } + _firstElement = false; + + Write( "<?" ); + Write( value ); + Write( "?>" ); +} + + +void XMLPrinter::PushUnknown( const char* value ) +{ + SealElementIfJustOpened(); + if ( _textDepth < 0 && !_firstElement && !_compactMode) { + Putc( '\n' ); + PrintSpace( _depth ); + } + _firstElement = false; + + Write( "<!" ); + Write( value ); + Putc( '>' ); +} + + +bool XMLPrinter::VisitEnter( const XMLDocument& doc ) +{ + _processEntities = doc.ProcessEntities(); + if ( doc.HasBOM() ) { + PushHeader( true, false ); + } + return true; +} + + +bool XMLPrinter::VisitEnter( const XMLElement& element, const XMLAttribute* attribute ) +{ + const XMLElement* parentElem = 0; + if ( element.Parent() ) { + parentElem = element.Parent()->ToElement(); + } + const bool compactMode = parentElem ? CompactMode( *parentElem ) : _compactMode; + OpenElement( element.Name(), compactMode ); + while ( attribute ) { + PushAttribute( attribute->Name(), attribute->Value() ); + attribute = attribute->Next(); + } + return true; +} + + +bool XMLPrinter::VisitExit( const XMLElement& element ) +{ + CloseElement( CompactMode(element) ); + return true; +} + + +bool XMLPrinter::Visit( const XMLText& text ) +{ + PushText( text.Value(), text.CData() ); + return true; +} + + +bool XMLPrinter::Visit( const XMLComment& comment ) +{ + PushComment( comment.Value() ); + return true; +} + +bool XMLPrinter::Visit( const XMLDeclaration& declaration ) +{ + PushDeclaration( declaration.Value() ); + return true; +} + + +bool XMLPrinter::Visit( const XMLUnknown& unknown ) +{ + PushUnknown( unknown.Value() ); + return true; +} + +} // namespace tinyxml2 diff --git a/source/3rd-party/tinyxml2/tinyxml2.h b/source/3rd-party/tinyxml2/tinyxml2.h new file mode 100644 index 0000000..4715ae9 --- /dev/null +++ b/source/3rd-party/tinyxml2/tinyxml2.h @@ -0,0 +1,2309 @@ +/* +Original code by Lee Thomason (www.grinninglizard.com) + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any +damages arising from the use of this software. + +Permission is granted to anyone to use this software for any +purpose, including commercial applications, and to alter it and +redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must +not claim that you wrote the original software. If you use this +software in a product, an acknowledgment in the product documentation +would be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and +must not be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source +distribution. +*/ + +#ifndef TINYXML2_INCLUDED +#define TINYXML2_INCLUDED + +#if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__) +# include <ctype.h> +# include <limits.h> +# include <stdio.h> +# include <stdlib.h> +# include <string.h> +# if defined(__PS3__) +# include <stddef.h> +# endif +#else +# include <cctype> +# include <climits> +# include <cstdio> +# include <cstdlib> +# include <cstring> +#endif +#include <stdint.h> + +/* + TODO: intern strings instead of allocation. +*/ +/* + gcc: + g++ -Wall -DTINYXML2_DEBUG tinyxml2.cpp xmltest.cpp -o gccxmltest.exe + + Formatting, Artistic Style: + AStyle.exe --style=1tbs --indent-switches --break-closing-brackets --indent-preprocessor tinyxml2.cpp tinyxml2.h +*/ + +#if defined( _DEBUG ) || defined (__DEBUG__) +# ifndef TINYXML2_DEBUG +# define TINYXML2_DEBUG +# endif +#endif + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable: 4251) +#endif + +#ifdef _WIN32 +# ifdef TINYXML2_EXPORT +# define TINYXML2_LIB __declspec(dllexport) +# elif defined(TINYXML2_IMPORT) +# define TINYXML2_LIB __declspec(dllimport) +# else +# define TINYXML2_LIB +# endif +#elif __GNUC__ >= 4 +# define TINYXML2_LIB __attribute__((visibility("default"))) +#else +# define TINYXML2_LIB +#endif + + +#if defined(TINYXML2_DEBUG) +# if defined(_MSC_VER) +# // "(void)0," is for suppressing C4127 warning in "assert(false)", "assert(true)" and the like +# define TIXMLASSERT( x ) if ( !((void)0,(x))) { __debugbreak(); } +# elif defined (ANDROID_NDK) +# include <android/log.h> +# define TIXMLASSERT( x ) if ( !(x)) { __android_log_assert( "assert", "grinliz", "ASSERT in '%s' at %d.", __FILE__, __LINE__ ); } +# else +# include <assert.h> +# define TIXMLASSERT assert +# endif +#else +# define TIXMLASSERT( x ) {} +#endif + + +/* Versioning, past 1.0.14: + http://semver.org/ +*/ +static const int TIXML2_MAJOR_VERSION = 7; +static const int TIXML2_MINOR_VERSION = 0; +static const int TIXML2_PATCH_VERSION = 1; + +#define TINYXML2_MAJOR_VERSION 7 +#define TINYXML2_MINOR_VERSION 0 +#define TINYXML2_PATCH_VERSION 1 + +// A fixed element depth limit is problematic. There needs to be a +// limit to avoid a stack overflow. However, that limit varies per +// system, and the capacity of the stack. On the other hand, it's a trivial +// attack that can result from ill, malicious, or even correctly formed XML, +// so there needs to be a limit in place. +static const int TINYXML2_MAX_ELEMENT_DEPTH = 100; + +namespace tinyxml2 +{ +class XMLDocument; +class XMLElement; +class XMLAttribute; +class XMLComment; +class XMLText; +class XMLDeclaration; +class XMLUnknown; +class XMLPrinter; + +/* + A class that wraps strings. Normally stores the start and end + pointers into the XML file itself, and will apply normalization + and entity translation if actually read. Can also store (and memory + manage) a traditional char[] + + Isn't clear why TINYXML2_LIB is needed; but seems to fix #719 +*/ +class TINYXML2_LIB StrPair +{ +public: + enum { + NEEDS_ENTITY_PROCESSING = 0x01, + NEEDS_NEWLINE_NORMALIZATION = 0x02, + NEEDS_WHITESPACE_COLLAPSING = 0x04, + + TEXT_ELEMENT = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION, + TEXT_ELEMENT_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION, + ATTRIBUTE_NAME = 0, + ATTRIBUTE_VALUE = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION, + ATTRIBUTE_VALUE_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION, + COMMENT = NEEDS_NEWLINE_NORMALIZATION + }; + + StrPair() : _flags( 0 ), _start( 0 ), _end( 0 ) {} + ~StrPair(); + + void Set( char* start, char* end, int flags ) { + TIXMLASSERT( start ); + TIXMLASSERT( end ); + Reset(); + _start = start; + _end = end; + _flags = flags | NEEDS_FLUSH; + } + + const char* GetStr(); + + bool Empty() const { + return _start == _end; + } + + void SetInternedStr( const char* str ) { + Reset(); + _start = const_cast<char*>(str); + } + + void SetStr( const char* str, int flags=0 ); + + char* ParseText( char* in, const char* endTag, int strFlags, int* curLineNumPtr ); + char* ParseName( char* in ); + + void TransferTo( StrPair* other ); + void Reset(); + +private: + void CollapseWhitespace(); + + enum { + NEEDS_FLUSH = 0x100, + NEEDS_DELETE = 0x200 + }; + + int _flags; + char* _start; + char* _end; + + StrPair( const StrPair& other ); // not supported + void operator=( const StrPair& other ); // not supported, use TransferTo() +}; + + +/* + A dynamic array of Plain Old Data. Doesn't support constructors, etc. + Has a small initial memory pool, so that low or no usage will not + cause a call to new/delete +*/ +template <class T, int INITIAL_SIZE> +class DynArray +{ +public: + DynArray() : + _mem( _pool ), + _allocated( INITIAL_SIZE ), + _size( 0 ) + { + } + + ~DynArray() { + if ( _mem != _pool ) { + delete [] _mem; + } + } + + void Clear() { + _size = 0; + } + + void Push( T t ) { + TIXMLASSERT( _size < INT_MAX ); + EnsureCapacity( _size+1 ); + _mem[_size] = t; + ++_size; + } + + T* PushArr( int count ) { + TIXMLASSERT( count >= 0 ); + TIXMLASSERT( _size <= INT_MAX - count ); + EnsureCapacity( _size+count ); + T* ret = &_mem[_size]; + _size += count; + return ret; + } + + T Pop() { + TIXMLASSERT( _size > 0 ); + --_size; + return _mem[_size]; + } + + void PopArr( int count ) { + TIXMLASSERT( _size >= count ); + _size -= count; + } + + bool Empty() const { + return _size == 0; + } + + T& operator[](int i) { + TIXMLASSERT( i>= 0 && i < _size ); + return _mem[i]; + } + + const T& operator[](int i) const { + TIXMLASSERT( i>= 0 && i < _size ); + return _mem[i]; + } + + const T& PeekTop() const { + TIXMLASSERT( _size > 0 ); + return _mem[ _size - 1]; + } + + int Size() const { + TIXMLASSERT( _size >= 0 ); + return _size; + } + + int Capacity() const { + TIXMLASSERT( _allocated >= INITIAL_SIZE ); + return _allocated; + } + + void SwapRemove(int i) { + TIXMLASSERT(i >= 0 && i < _size); + TIXMLASSERT(_size > 0); + _mem[i] = _mem[_size - 1]; + --_size; + } + + const T* Mem() const { + TIXMLASSERT( _mem ); + return _mem; + } + + T* Mem() { + TIXMLASSERT( _mem ); + return _mem; + } + +private: + DynArray( const DynArray& ); // not supported + void operator=( const DynArray& ); // not supported + + void EnsureCapacity( int cap ) { + TIXMLASSERT( cap > 0 ); + if ( cap > _allocated ) { + TIXMLASSERT( cap <= INT_MAX / 2 ); + const int newAllocated = cap * 2; + T* newMem = new T[newAllocated]; + TIXMLASSERT( newAllocated >= _size ); + memcpy( newMem, _mem, sizeof(T)*_size ); // warning: not using constructors, only works for PODs + if ( _mem != _pool ) { + delete [] _mem; + } + _mem = newMem; + _allocated = newAllocated; + } + } + + T* _mem; + T _pool[INITIAL_SIZE]; + int _allocated; // objects allocated + int _size; // number objects in use +}; + + +/* + Parent virtual class of a pool for fast allocation + and deallocation of objects. +*/ +class MemPool +{ +public: + MemPool() {} + virtual ~MemPool() {} + + virtual int ItemSize() const = 0; + virtual void* Alloc() = 0; + virtual void Free( void* ) = 0; + virtual void SetTracked() = 0; +}; + + +/* + Template child class to create pools of the correct type. +*/ +template< int ITEM_SIZE > +class MemPoolT : public MemPool +{ +public: + MemPoolT() : _blockPtrs(), _root(0), _currentAllocs(0), _nAllocs(0), _maxAllocs(0), _nUntracked(0) {} + ~MemPoolT() { + MemPoolT< ITEM_SIZE >::Clear(); + } + + void Clear() { + // Delete the blocks. + while( !_blockPtrs.Empty()) { + Block* lastBlock = _blockPtrs.Pop(); + delete lastBlock; + } + _root = 0; + _currentAllocs = 0; + _nAllocs = 0; + _maxAllocs = 0; + _nUntracked = 0; + } + + virtual int ItemSize() const { + return ITEM_SIZE; + } + int CurrentAllocs() const { + return _currentAllocs; + } + + virtual void* Alloc() { + if ( !_root ) { + // Need a new block. + Block* block = new Block(); + _blockPtrs.Push( block ); + + Item* blockItems = block->items; + for( int i = 0; i < ITEMS_PER_BLOCK - 1; ++i ) { + blockItems[i].next = &(blockItems[i + 1]); + } + blockItems[ITEMS_PER_BLOCK - 1].next = 0; + _root = blockItems; + } + Item* const result = _root; + TIXMLASSERT( result != 0 ); + _root = _root->next; + + ++_currentAllocs; + if ( _currentAllocs > _maxAllocs ) { + _maxAllocs = _currentAllocs; + } + ++_nAllocs; + ++_nUntracked; + return result; + } + + virtual void Free( void* mem ) { + if ( !mem ) { + return; + } + --_currentAllocs; + Item* item = static_cast<Item*>( mem ); +#ifdef TINYXML2_DEBUG + memset( item, 0xfe, sizeof( *item ) ); +#endif + item->next = _root; + _root = item; + } + void Trace( const char* name ) { + printf( "Mempool %s watermark=%d [%dk] current=%d size=%d nAlloc=%d blocks=%d\n", + name, _maxAllocs, _maxAllocs * ITEM_SIZE / 1024, _currentAllocs, + ITEM_SIZE, _nAllocs, _blockPtrs.Size() ); + } + + void SetTracked() { + --_nUntracked; + } + + int Untracked() const { + return _nUntracked; + } + + // This number is perf sensitive. 4k seems like a good tradeoff on my machine. + // The test file is large, 170k. + // Release: VS2010 gcc(no opt) + // 1k: 4000 + // 2k: 4000 + // 4k: 3900 21000 + // 16k: 5200 + // 32k: 4300 + // 64k: 4000 21000 + // Declared public because some compilers do not accept to use ITEMS_PER_BLOCK + // in private part if ITEMS_PER_BLOCK is private + enum { ITEMS_PER_BLOCK = (4 * 1024) / ITEM_SIZE }; + +private: + MemPoolT( const MemPoolT& ); // not supported + void operator=( const MemPoolT& ); // not supported + + union Item { + Item* next; + char itemData[ITEM_SIZE]; + }; + struct Block { + Item items[ITEMS_PER_BLOCK]; + }; + DynArray< Block*, 10 > _blockPtrs; + Item* _root; + + int _currentAllocs; + int _nAllocs; + int _maxAllocs; + int _nUntracked; +}; + + + +/** + Implements the interface to the "Visitor pattern" (see the Accept() method.) + If you call the Accept() method, it requires being passed a XMLVisitor + class to handle callbacks. For nodes that contain other nodes (Document, Element) + you will get called with a VisitEnter/VisitExit pair. Nodes that are always leafs + are simply called with Visit(). + + If you return 'true' from a Visit method, recursive parsing will continue. If you return + false, <b>no children of this node or its siblings</b> will be visited. + + All flavors of Visit methods have a default implementation that returns 'true' (continue + visiting). You need to only override methods that are interesting to you. + + Generally Accept() is called on the XMLDocument, although all nodes support visiting. + + You should never change the document from a callback. + + @sa XMLNode::Accept() +*/ +class TINYXML2_LIB XMLVisitor +{ +public: + virtual ~XMLVisitor() {} + + /// Visit a document. + virtual bool VisitEnter( const XMLDocument& /*doc*/ ) { + return true; + } + /// Visit a document. + virtual bool VisitExit( const XMLDocument& /*doc*/ ) { + return true; + } + + /// Visit an element. + virtual bool VisitEnter( const XMLElement& /*element*/, const XMLAttribute* /*firstAttribute*/ ) { + return true; + } + /// Visit an element. + virtual bool VisitExit( const XMLElement& /*element*/ ) { + return true; + } + + /// Visit a declaration. + virtual bool Visit( const XMLDeclaration& /*declaration*/ ) { + return true; + } + /// Visit a text node. + virtual bool Visit( const XMLText& /*text*/ ) { + return true; + } + /// Visit a comment node. + virtual bool Visit( const XMLComment& /*comment*/ ) { + return true; + } + /// Visit an unknown node. + virtual bool Visit( const XMLUnknown& /*unknown*/ ) { + return true; + } +}; + +// WARNING: must match XMLDocument::_errorNames[] +enum XMLError { + XML_SUCCESS = 0, + XML_NO_ATTRIBUTE, + XML_WRONG_ATTRIBUTE_TYPE, + XML_ERROR_FILE_NOT_FOUND, + XML_ERROR_FILE_COULD_NOT_BE_OPENED, + XML_ERROR_FILE_READ_ERROR, + XML_ERROR_PARSING_ELEMENT, + XML_ERROR_PARSING_ATTRIBUTE, + XML_ERROR_PARSING_TEXT, + XML_ERROR_PARSING_CDATA, + XML_ERROR_PARSING_COMMENT, + XML_ERROR_PARSING_DECLARATION, + XML_ERROR_PARSING_UNKNOWN, + XML_ERROR_EMPTY_DOCUMENT, + XML_ERROR_MISMATCHED_ELEMENT, + XML_ERROR_PARSING, + XML_CAN_NOT_CONVERT_TEXT, + XML_NO_TEXT_NODE, + XML_ELEMENT_DEPTH_EXCEEDED, + + XML_ERROR_COUNT +}; + + +/* + Utility functionality. +*/ +class TINYXML2_LIB XMLUtil +{ +public: + static const char* SkipWhiteSpace( const char* p, int* curLineNumPtr ) { + TIXMLASSERT( p ); + + while( IsWhiteSpace(*p) ) { + if (curLineNumPtr && *p == '\n') { + ++(*curLineNumPtr); + } + ++p; + } + TIXMLASSERT( p ); + return p; + } + static char* SkipWhiteSpace( char* p, int* curLineNumPtr ) { + return const_cast<char*>( SkipWhiteSpace( const_cast<const char*>(p), curLineNumPtr ) ); + } + + // Anything in the high order range of UTF-8 is assumed to not be whitespace. This isn't + // correct, but simple, and usually works. + static bool IsWhiteSpace( char p ) { + return !IsUTF8Continuation(p) && isspace( static_cast<unsigned char>(p) ); + } + + inline static bool IsNameStartChar( unsigned char ch ) { + if ( ch >= 128 ) { + // This is a heuristic guess in attempt to not implement Unicode-aware isalpha() + return true; + } + if ( isalpha( ch ) ) { + return true; + } + return ch == ':' || ch == '_'; + } + + inline static bool IsNameChar( unsigned char ch ) { + return IsNameStartChar( ch ) + || isdigit( ch ) + || ch == '.' + || ch == '-'; + } + + inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX ) { + if ( p == q ) { + return true; + } + TIXMLASSERT( p ); + TIXMLASSERT( q ); + TIXMLASSERT( nChar >= 0 ); + return strncmp( p, q, nChar ) == 0; + } + + inline static bool IsUTF8Continuation( char p ) { + return ( p & 0x80 ) != 0; + } + + static const char* ReadBOM( const char* p, bool* hasBOM ); + // p is the starting location, + // the UTF-8 value of the entity will be placed in value, and length filled in. + static const char* GetCharacterRef( const char* p, char* value, int* length ); + static void ConvertUTF32ToUTF8( unsigned long input, char* output, int* length ); + + // converts primitive types to strings + static void ToStr( int v, char* buffer, int bufferSize ); + static void ToStr( unsigned v, char* buffer, int bufferSize ); + static void ToStr( bool v, char* buffer, int bufferSize ); + static void ToStr( float v, char* buffer, int bufferSize ); + static void ToStr( double v, char* buffer, int bufferSize ); + static void ToStr(int64_t v, char* buffer, int bufferSize); + + // converts strings to primitive types + static bool ToInt( const char* str, int* value ); + static bool ToUnsigned( const char* str, unsigned* value ); + static bool ToBool( const char* str, bool* value ); + static bool ToFloat( const char* str, float* value ); + static bool ToDouble( const char* str, double* value ); + static bool ToInt64(const char* str, int64_t* value); + + // Changes what is serialized for a boolean value. + // Default to "true" and "false". Shouldn't be changed + // unless you have a special testing or compatibility need. + // Be careful: static, global, & not thread safe. + // Be sure to set static const memory as parameters. + static void SetBoolSerialization(const char* writeTrue, const char* writeFalse); + +private: + static const char* writeBoolTrue; + static const char* writeBoolFalse; +}; + + +/** XMLNode is a base class for every object that is in the + XML Document Object Model (DOM), except XMLAttributes. + Nodes have siblings, a parent, and children which can + be navigated. A node is always in a XMLDocument. + The type of a XMLNode can be queried, and it can + be cast to its more defined type. + + A XMLDocument allocates memory for all its Nodes. + When the XMLDocument gets deleted, all its Nodes + will also be deleted. + + @verbatim + A Document can contain: Element (container or leaf) + Comment (leaf) + Unknown (leaf) + Declaration( leaf ) + + An Element can contain: Element (container or leaf) + Text (leaf) + Attributes (not on tree) + Comment (leaf) + Unknown (leaf) + + @endverbatim +*/ +class TINYXML2_LIB XMLNode +{ + friend class XMLDocument; + friend class XMLElement; +public: + + /// Get the XMLDocument that owns this XMLNode. + const XMLDocument* GetDocument() const { + TIXMLASSERT( _document ); + return _document; + } + /// Get the XMLDocument that owns this XMLNode. + XMLDocument* GetDocument() { + TIXMLASSERT( _document ); + return _document; + } + + /// Safely cast to an Element, or null. + virtual XMLElement* ToElement() { + return 0; + } + /// Safely cast to Text, or null. + virtual XMLText* ToText() { + return 0; + } + /// Safely cast to a Comment, or null. + virtual XMLComment* ToComment() { + return 0; + } + /// Safely cast to a Document, or null. + virtual XMLDocument* ToDocument() { + return 0; + } + /// Safely cast to a Declaration, or null. + virtual XMLDeclaration* ToDeclaration() { + return 0; + } + /// Safely cast to an Unknown, or null. + virtual XMLUnknown* ToUnknown() { + return 0; + } + + virtual const XMLElement* ToElement() const { + return 0; + } + virtual const XMLText* ToText() const { + return 0; + } + virtual const XMLComment* ToComment() const { + return 0; + } + virtual const XMLDocument* ToDocument() const { + return 0; + } + virtual const XMLDeclaration* ToDeclaration() const { + return 0; + } + virtual const XMLUnknown* ToUnknown() const { + return 0; + } + + /** The meaning of 'value' changes for the specific type. + @verbatim + Document: empty (NULL is returned, not an empty string) + Element: name of the element + Comment: the comment text + Unknown: the tag contents + Text: the text string + @endverbatim + */ + const char* Value() const; + + /** Set the Value of an XML node. + @sa Value() + */ + void SetValue( const char* val, bool staticMem=false ); + + /// Gets the line number the node is in, if the document was parsed from a file. + int GetLineNum() const { return _parseLineNum; } + + /// Get the parent of this node on the DOM. + const XMLNode* Parent() const { + return _parent; + } + + XMLNode* Parent() { + return _parent; + } + + /// Returns true if this node has no children. + bool NoChildren() const { + return !_firstChild; + } + + /// Get the first child node, or null if none exists. + const XMLNode* FirstChild() const { + return _firstChild; + } + + XMLNode* FirstChild() { + return _firstChild; + } + + /** Get the first child element, or optionally the first child + element with the specified name. + */ + const XMLElement* FirstChildElement( const char* name = 0 ) const; + + XMLElement* FirstChildElement( const char* name = 0 ) { + return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->FirstChildElement( name )); + } + + /// Get the last child node, or null if none exists. + const XMLNode* LastChild() const { + return _lastChild; + } + + XMLNode* LastChild() { + return _lastChild; + } + + /** Get the last child element or optionally the last child + element with the specified name. + */ + const XMLElement* LastChildElement( const char* name = 0 ) const; + + XMLElement* LastChildElement( const char* name = 0 ) { + return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->LastChildElement(name) ); + } + + /// Get the previous (left) sibling node of this node. + const XMLNode* PreviousSibling() const { + return _prev; + } + + XMLNode* PreviousSibling() { + return _prev; + } + + /// Get the previous (left) sibling element of this node, with an optionally supplied name. + const XMLElement* PreviousSiblingElement( const char* name = 0 ) const ; + + XMLElement* PreviousSiblingElement( const char* name = 0 ) { + return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->PreviousSiblingElement( name ) ); + } + + /// Get the next (right) sibling node of this node. + const XMLNode* NextSibling() const { + return _next; + } + + XMLNode* NextSibling() { + return _next; + } + + /// Get the next (right) sibling element of this node, with an optionally supplied name. + const XMLElement* NextSiblingElement( const char* name = 0 ) const; + + XMLElement* NextSiblingElement( const char* name = 0 ) { + return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->NextSiblingElement( name ) ); + } + + /** + Add a child node as the last (right) child. + If the child node is already part of the document, + it is moved from its old location to the new location. + Returns the addThis argument or 0 if the node does not + belong to the same document. + */ + XMLNode* InsertEndChild( XMLNode* addThis ); + + XMLNode* LinkEndChild( XMLNode* addThis ) { + return InsertEndChild( addThis ); + } + /** + Add a child node as the first (left) child. + If the child node is already part of the document, + it is moved from its old location to the new location. + Returns the addThis argument or 0 if the node does not + belong to the same document. + */ + XMLNode* InsertFirstChild( XMLNode* addThis ); + /** + Add a node after the specified child node. + If the child node is already part of the document, + it is moved from its old location to the new location. + Returns the addThis argument or 0 if the afterThis node + is not a child of this node, or if the node does not + belong to the same document. + */ + XMLNode* InsertAfterChild( XMLNode* afterThis, XMLNode* addThis ); + + /** + Delete all the children of this node. + */ + void DeleteChildren(); + + /** + Delete a child of this node. + */ + void DeleteChild( XMLNode* node ); + + /** + Make a copy of this node, but not its children. + You may pass in a Document pointer that will be + the owner of the new Node. If the 'document' is + null, then the node returned will be allocated + from the current Document. (this->GetDocument()) + + Note: if called on a XMLDocument, this will return null. + */ + virtual XMLNode* ShallowClone( XMLDocument* document ) const = 0; + + /** + Make a copy of this node and all its children. + + If the 'target' is null, then the nodes will + be allocated in the current document. If 'target' + is specified, the memory will be allocated is the + specified XMLDocument. + + NOTE: This is probably not the correct tool to + copy a document, since XMLDocuments can have multiple + top level XMLNodes. You probably want to use + XMLDocument::DeepCopy() + */ + XMLNode* DeepClone( XMLDocument* target ) const; + + /** + Test if 2 nodes are the same, but don't test children. + The 2 nodes do not need to be in the same Document. + + Note: if called on a XMLDocument, this will return false. + */ + virtual bool ShallowEqual( const XMLNode* compare ) const = 0; + + /** Accept a hierarchical visit of the nodes in the TinyXML-2 DOM. Every node in the + XML tree will be conditionally visited and the host will be called back + via the XMLVisitor interface. + + This is essentially a SAX interface for TinyXML-2. (Note however it doesn't re-parse + the XML for the callbacks, so the performance of TinyXML-2 is unchanged by using this + interface versus any other.) + + The interface has been based on ideas from: + + - http://www.saxproject.org/ + - http://c2.com/cgi/wiki?HierarchicalVisitorPattern + + Which are both good references for "visiting". + + An example of using Accept(): + @verbatim + XMLPrinter printer; + tinyxmlDoc.Accept( &printer ); + const char* xmlcstr = printer.CStr(); + @endverbatim + */ + virtual bool Accept( XMLVisitor* visitor ) const = 0; + + /** + Set user data into the XMLNode. TinyXML-2 in + no way processes or interprets user data. + It is initially 0. + */ + void SetUserData(void* userData) { _userData = userData; } + + /** + Get user data set into the XMLNode. TinyXML-2 in + no way processes or interprets user data. + It is initially 0. + */ + void* GetUserData() const { return _userData; } + +protected: + explicit XMLNode( XMLDocument* ); + virtual ~XMLNode(); + + virtual char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr); + + XMLDocument* _document; + XMLNode* _parent; + mutable StrPair _value; + int _parseLineNum; + + XMLNode* _firstChild; + XMLNode* _lastChild; + + XMLNode* _prev; + XMLNode* _next; + + void* _userData; + +private: + MemPool* _memPool; + void Unlink( XMLNode* child ); + static void DeleteNode( XMLNode* node ); + void InsertChildPreamble( XMLNode* insertThis ) const; + const XMLElement* ToElementWithName( const char* name ) const; + + XMLNode( const XMLNode& ); // not supported + XMLNode& operator=( const XMLNode& ); // not supported +}; + + +/** XML text. + + Note that a text node can have child element nodes, for example: + @verbatim + <root>This is <b>bold</b></root> + @endverbatim + + A text node can have 2 ways to output the next. "normal" output + and CDATA. It will default to the mode it was parsed from the XML file and + you generally want to leave it alone, but you can change the output mode with + SetCData() and query it with CData(). +*/ +class TINYXML2_LIB XMLText : public XMLNode +{ + friend class XMLDocument; +public: + virtual bool Accept( XMLVisitor* visitor ) const; + + virtual XMLText* ToText() { + return this; + } + virtual const XMLText* ToText() const { + return this; + } + + /// Declare whether this should be CDATA or standard text. + void SetCData( bool isCData ) { + _isCData = isCData; + } + /// Returns true if this is a CDATA text element. + bool CData() const { + return _isCData; + } + + virtual XMLNode* ShallowClone( XMLDocument* document ) const; + virtual bool ShallowEqual( const XMLNode* compare ) const; + +protected: + explicit XMLText( XMLDocument* doc ) : XMLNode( doc ), _isCData( false ) {} + virtual ~XMLText() {} + + char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); + +private: + bool _isCData; + + XMLText( const XMLText& ); // not supported + XMLText& operator=( const XMLText& ); // not supported +}; + + +/** An XML Comment. */ +class TINYXML2_LIB XMLComment : public XMLNode +{ + friend class XMLDocument; +public: + virtual XMLComment* ToComment() { + return this; + } + virtual const XMLComment* ToComment() const { + return this; + } + + virtual bool Accept( XMLVisitor* visitor ) const; + + virtual XMLNode* ShallowClone( XMLDocument* document ) const; + virtual bool ShallowEqual( const XMLNode* compare ) const; + +protected: + explicit XMLComment( XMLDocument* doc ); + virtual ~XMLComment(); + + char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr); + +private: + XMLComment( const XMLComment& ); // not supported + XMLComment& operator=( const XMLComment& ); // not supported +}; + + +/** In correct XML the declaration is the first entry in the file. + @verbatim + <?xml version="1.0" standalone="yes"?> + @endverbatim + + TinyXML-2 will happily read or write files without a declaration, + however. + + The text of the declaration isn't interpreted. It is parsed + and written as a string. +*/ +class TINYXML2_LIB XMLDeclaration : public XMLNode +{ + friend class XMLDocument; +public: + virtual XMLDeclaration* ToDeclaration() { + return this; + } + virtual const XMLDeclaration* ToDeclaration() const { + return this; + } + + virtual bool Accept( XMLVisitor* visitor ) const; + + virtual XMLNode* ShallowClone( XMLDocument* document ) const; + virtual bool ShallowEqual( const XMLNode* compare ) const; + +protected: + explicit XMLDeclaration( XMLDocument* doc ); + virtual ~XMLDeclaration(); + + char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); + +private: + XMLDeclaration( const XMLDeclaration& ); // not supported + XMLDeclaration& operator=( const XMLDeclaration& ); // not supported +}; + + +/** Any tag that TinyXML-2 doesn't recognize is saved as an + unknown. It is a tag of text, but should not be modified. + It will be written back to the XML, unchanged, when the file + is saved. + + DTD tags get thrown into XMLUnknowns. +*/ +class TINYXML2_LIB XMLUnknown : public XMLNode +{ + friend class XMLDocument; +public: + virtual XMLUnknown* ToUnknown() { + return this; + } + virtual const XMLUnknown* ToUnknown() const { + return this; + } + + virtual bool Accept( XMLVisitor* visitor ) const; + + virtual XMLNode* ShallowClone( XMLDocument* document ) const; + virtual bool ShallowEqual( const XMLNode* compare ) const; + +protected: + explicit XMLUnknown( XMLDocument* doc ); + virtual ~XMLUnknown(); + + char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); + +private: + XMLUnknown( const XMLUnknown& ); // not supported + XMLUnknown& operator=( const XMLUnknown& ); // not supported +}; + + + +/** An attribute is a name-value pair. Elements have an arbitrary + number of attributes, each with a unique name. + + @note The attributes are not XMLNodes. You may only query the + Next() attribute in a list. +*/ +class TINYXML2_LIB XMLAttribute +{ + friend class XMLElement; +public: + /// The name of the attribute. + const char* Name() const; + + /// The value of the attribute. + const char* Value() const; + + /// Gets the line number the attribute is in, if the document was parsed from a file. + int GetLineNum() const { return _parseLineNum; } + + /// The next attribute in the list. + const XMLAttribute* Next() const { + return _next; + } + + /** IntValue interprets the attribute as an integer, and returns the value. + If the value isn't an integer, 0 will be returned. There is no error checking; + use QueryIntValue() if you need error checking. + */ + int IntValue() const { + int i = 0; + QueryIntValue(&i); + return i; + } + + int64_t Int64Value() const { + int64_t i = 0; + QueryInt64Value(&i); + return i; + } + + /// Query as an unsigned integer. See IntValue() + unsigned UnsignedValue() const { + unsigned i=0; + QueryUnsignedValue( &i ); + return i; + } + /// Query as a boolean. See IntValue() + bool BoolValue() const { + bool b=false; + QueryBoolValue( &b ); + return b; + } + /// Query as a double. See IntValue() + double DoubleValue() const { + double d=0; + QueryDoubleValue( &d ); + return d; + } + /// Query as a float. See IntValue() + float FloatValue() const { + float f=0; + QueryFloatValue( &f ); + return f; + } + + /** QueryIntValue interprets the attribute as an integer, and returns the value + in the provided parameter. The function will return XML_SUCCESS on success, + and XML_WRONG_ATTRIBUTE_TYPE if the conversion is not successful. + */ + XMLError QueryIntValue( int* value ) const; + /// See QueryIntValue + XMLError QueryUnsignedValue( unsigned int* value ) const; + /// See QueryIntValue + XMLError QueryInt64Value(int64_t* value) const; + /// See QueryIntValue + XMLError QueryBoolValue( bool* value ) const; + /// See QueryIntValue + XMLError QueryDoubleValue( double* value ) const; + /// See QueryIntValue + XMLError QueryFloatValue( float* value ) const; + + /// Set the attribute to a string value. + void SetAttribute( const char* value ); + /// Set the attribute to value. + void SetAttribute( int value ); + /// Set the attribute to value. + void SetAttribute( unsigned value ); + /// Set the attribute to value. + void SetAttribute(int64_t value); + /// Set the attribute to value. + void SetAttribute( bool value ); + /// Set the attribute to value. + void SetAttribute( double value ); + /// Set the attribute to value. + void SetAttribute( float value ); + +private: + enum { BUF_SIZE = 200 }; + + XMLAttribute() : _name(), _value(),_parseLineNum( 0 ), _next( 0 ), _memPool( 0 ) {} + virtual ~XMLAttribute() {} + + XMLAttribute( const XMLAttribute& ); // not supported + void operator=( const XMLAttribute& ); // not supported + void SetName( const char* name ); + + char* ParseDeep( char* p, bool processEntities, int* curLineNumPtr ); + + mutable StrPair _name; + mutable StrPair _value; + int _parseLineNum; + XMLAttribute* _next; + MemPool* _memPool; +}; + + +/** The element is a container class. It has a value, the element name, + and can contain other elements, text, comments, and unknowns. + Elements also contain an arbitrary number of attributes. +*/ +class TINYXML2_LIB XMLElement : public XMLNode +{ + friend class XMLDocument; +public: + /// Get the name of an element (which is the Value() of the node.) + const char* Name() const { + return Value(); + } + /// Set the name of the element. + void SetName( const char* str, bool staticMem=false ) { + SetValue( str, staticMem ); + } + + virtual XMLElement* ToElement() { + return this; + } + virtual const XMLElement* ToElement() const { + return this; + } + virtual bool Accept( XMLVisitor* visitor ) const; + + /** Given an attribute name, Attribute() returns the value + for the attribute of that name, or null if none + exists. For example: + + @verbatim + const char* value = ele->Attribute( "foo" ); + @endverbatim + + The 'value' parameter is normally null. However, if specified, + the attribute will only be returned if the 'name' and 'value' + match. This allow you to write code: + + @verbatim + if ( ele->Attribute( "foo", "bar" ) ) callFooIsBar(); + @endverbatim + + rather than: + @verbatim + if ( ele->Attribute( "foo" ) ) { + if ( strcmp( ele->Attribute( "foo" ), "bar" ) == 0 ) callFooIsBar(); + } + @endverbatim + */ + const char* Attribute( const char* name, const char* value=0 ) const; + + /** Given an attribute name, IntAttribute() returns the value + of the attribute interpreted as an integer. The default + value will be returned if the attribute isn't present, + or if there is an error. (For a method with error + checking, see QueryIntAttribute()). + */ + int IntAttribute(const char* name, int defaultValue = 0) const; + /// See IntAttribute() + unsigned UnsignedAttribute(const char* name, unsigned defaultValue = 0) const; + /// See IntAttribute() + int64_t Int64Attribute(const char* name, int64_t defaultValue = 0) const; + /// See IntAttribute() + bool BoolAttribute(const char* name, bool defaultValue = false) const; + /// See IntAttribute() + double DoubleAttribute(const char* name, double defaultValue = 0) const; + /// See IntAttribute() + float FloatAttribute(const char* name, float defaultValue = 0) const; + + /** Given an attribute name, QueryIntAttribute() returns + XML_SUCCESS, XML_WRONG_ATTRIBUTE_TYPE if the conversion + can't be performed, or XML_NO_ATTRIBUTE if the attribute + doesn't exist. If successful, the result of the conversion + will be written to 'value'. If not successful, nothing will + be written to 'value'. This allows you to provide default + value: + + @verbatim + int value = 10; + QueryIntAttribute( "foo", &value ); // if "foo" isn't found, value will still be 10 + @endverbatim + */ + XMLError QueryIntAttribute( const char* name, int* value ) const { + const XMLAttribute* a = FindAttribute( name ); + if ( !a ) { + return XML_NO_ATTRIBUTE; + } + return a->QueryIntValue( value ); + } + + /// See QueryIntAttribute() + XMLError QueryUnsignedAttribute( const char* name, unsigned int* value ) const { + const XMLAttribute* a = FindAttribute( name ); + if ( !a ) { + return XML_NO_ATTRIBUTE; + } + return a->QueryUnsignedValue( value ); + } + + /// See QueryIntAttribute() + XMLError QueryInt64Attribute(const char* name, int64_t* value) const { + const XMLAttribute* a = FindAttribute(name); + if (!a) { + return XML_NO_ATTRIBUTE; + } + return a->QueryInt64Value(value); + } + + /// See QueryIntAttribute() + XMLError QueryBoolAttribute( const char* name, bool* value ) const { + const XMLAttribute* a = FindAttribute( name ); + if ( !a ) { + return XML_NO_ATTRIBUTE; + } + return a->QueryBoolValue( value ); + } + /// See QueryIntAttribute() + XMLError QueryDoubleAttribute( const char* name, double* value ) const { + const XMLAttribute* a = FindAttribute( name ); + if ( !a ) { + return XML_NO_ATTRIBUTE; + } + return a->QueryDoubleValue( value ); + } + /// See QueryIntAttribute() + XMLError QueryFloatAttribute( const char* name, float* value ) const { + const XMLAttribute* a = FindAttribute( name ); + if ( !a ) { + return XML_NO_ATTRIBUTE; + } + return a->QueryFloatValue( value ); + } + + /// See QueryIntAttribute() + XMLError QueryStringAttribute(const char* name, const char** value) const { + const XMLAttribute* a = FindAttribute(name); + if (!a) { + return XML_NO_ATTRIBUTE; + } + *value = a->Value(); + return XML_SUCCESS; + } + + + + /** Given an attribute name, QueryAttribute() returns + XML_SUCCESS, XML_WRONG_ATTRIBUTE_TYPE if the conversion + can't be performed, or XML_NO_ATTRIBUTE if the attribute + doesn't exist. It is overloaded for the primitive types, + and is a generally more convenient replacement of + QueryIntAttribute() and related functions. + + If successful, the result of the conversion + will be written to 'value'. If not successful, nothing will + be written to 'value'. This allows you to provide default + value: + + @verbatim + int value = 10; + QueryAttribute( "foo", &value ); // if "foo" isn't found, value will still be 10 + @endverbatim + */ + XMLError QueryAttribute( const char* name, int* value ) const { + return QueryIntAttribute( name, value ); + } + + XMLError QueryAttribute( const char* name, unsigned int* value ) const { + return QueryUnsignedAttribute( name, value ); + } + + XMLError QueryAttribute(const char* name, int64_t* value) const { + return QueryInt64Attribute(name, value); + } + + XMLError QueryAttribute( const char* name, bool* value ) const { + return QueryBoolAttribute( name, value ); + } + + XMLError QueryAttribute( const char* name, double* value ) const { + return QueryDoubleAttribute( name, value ); + } + + XMLError QueryAttribute( const char* name, float* value ) const { + return QueryFloatAttribute( name, value ); + } + + /// Sets the named attribute to value. + void SetAttribute( const char* name, const char* value ) { + XMLAttribute* a = FindOrCreateAttribute( name ); + a->SetAttribute( value ); + } + /// Sets the named attribute to value. + void SetAttribute( const char* name, int value ) { + XMLAttribute* a = FindOrCreateAttribute( name ); + a->SetAttribute( value ); + } + /// Sets the named attribute to value. + void SetAttribute( const char* name, unsigned value ) { + XMLAttribute* a = FindOrCreateAttribute( name ); + a->SetAttribute( value ); + } + + /// Sets the named attribute to value. + void SetAttribute(const char* name, int64_t value) { + XMLAttribute* a = FindOrCreateAttribute(name); + a->SetAttribute(value); + } + + /// Sets the named attribute to value. + void SetAttribute( const char* name, bool value ) { + XMLAttribute* a = FindOrCreateAttribute( name ); + a->SetAttribute( value ); + } + /// Sets the named attribute to value. + void SetAttribute( const char* name, double value ) { + XMLAttribute* a = FindOrCreateAttribute( name ); + a->SetAttribute( value ); + } + /// Sets the named attribute to value. + void SetAttribute( const char* name, float value ) { + XMLAttribute* a = FindOrCreateAttribute( name ); + a->SetAttribute( value ); + } + + /** + Delete an attribute. + */ + void DeleteAttribute( const char* name ); + + /// Return the first attribute in the list. + const XMLAttribute* FirstAttribute() const { + return _rootAttribute; + } + /// Query a specific attribute in the list. + const XMLAttribute* FindAttribute( const char* name ) const; + + /** Convenience function for easy access to the text inside an element. Although easy + and concise, GetText() is limited compared to getting the XMLText child + and accessing it directly. + + If the first child of 'this' is a XMLText, the GetText() + returns the character string of the Text node, else null is returned. + + This is a convenient method for getting the text of simple contained text: + @verbatim + <foo>This is text</foo> + const char* str = fooElement->GetText(); + @endverbatim + + 'str' will be a pointer to "This is text". + + Note that this function can be misleading. If the element foo was created from + this XML: + @verbatim + <foo><b>This is text</b></foo> + @endverbatim + + then the value of str would be null. The first child node isn't a text node, it is + another element. From this XML: + @verbatim + <foo>This is <b>text</b></foo> + @endverbatim + GetText() will return "This is ". + */ + const char* GetText() const; + + /** Convenience function for easy access to the text inside an element. Although easy + and concise, SetText() is limited compared to creating an XMLText child + and mutating it directly. + + If the first child of 'this' is a XMLText, SetText() sets its value to + the given string, otherwise it will create a first child that is an XMLText. + + This is a convenient method for setting the text of simple contained text: + @verbatim + <foo>This is text</foo> + fooElement->SetText( "Hullaballoo!" ); + <foo>Hullaballoo!</foo> + @endverbatim + + Note that this function can be misleading. If the element foo was created from + this XML: + @verbatim + <foo><b>This is text</b></foo> + @endverbatim + + then it will not change "This is text", but rather prefix it with a text element: + @verbatim + <foo>Hullaballoo!<b>This is text</b></foo> + @endverbatim + + For this XML: + @verbatim + <foo /> + @endverbatim + SetText() will generate + @verbatim + <foo>Hullaballoo!</foo> + @endverbatim + */ + void SetText( const char* inText ); + /// Convenience method for setting text inside an element. See SetText() for important limitations. + void SetText( int value ); + /// Convenience method for setting text inside an element. See SetText() for important limitations. + void SetText( unsigned value ); + /// Convenience method for setting text inside an element. See SetText() for important limitations. + void SetText(int64_t value); + /// Convenience method for setting text inside an element. See SetText() for important limitations. + void SetText( bool value ); + /// Convenience method for setting text inside an element. See SetText() for important limitations. + void SetText( double value ); + /// Convenience method for setting text inside an element. See SetText() for important limitations. + void SetText( float value ); + + /** + Convenience method to query the value of a child text node. This is probably best + shown by example. Given you have a document is this form: + @verbatim + <point> + <x>1</x> + <y>1.4</y> + </point> + @endverbatim + + The QueryIntText() and similar functions provide a safe and easier way to get to the + "value" of x and y. + + @verbatim + int x = 0; + float y = 0; // types of x and y are contrived for example + const XMLElement* xElement = pointElement->FirstChildElement( "x" ); + const XMLElement* yElement = pointElement->FirstChildElement( "y" ); + xElement->QueryIntText( &x ); + yElement->QueryFloatText( &y ); + @endverbatim + + @returns XML_SUCCESS (0) on success, XML_CAN_NOT_CONVERT_TEXT if the text cannot be converted + to the requested type, and XML_NO_TEXT_NODE if there is no child text to query. + + */ + XMLError QueryIntText( int* ival ) const; + /// See QueryIntText() + XMLError QueryUnsignedText( unsigned* uval ) const; + /// See QueryIntText() + XMLError QueryInt64Text(int64_t* uval) const; + /// See QueryIntText() + XMLError QueryBoolText( bool* bval ) const; + /// See QueryIntText() + XMLError QueryDoubleText( double* dval ) const; + /// See QueryIntText() + XMLError QueryFloatText( float* fval ) const; + + int IntText(int defaultValue = 0) const; + + /// See QueryIntText() + unsigned UnsignedText(unsigned defaultValue = 0) const; + /// See QueryIntText() + int64_t Int64Text(int64_t defaultValue = 0) const; + /// See QueryIntText() + bool BoolText(bool defaultValue = false) const; + /// See QueryIntText() + double DoubleText(double defaultValue = 0) const; + /// See QueryIntText() + float FloatText(float defaultValue = 0) const; + + // internal: + enum ElementClosingType { + OPEN, // <foo> + CLOSED, // <foo/> + CLOSING // </foo> + }; + ElementClosingType ClosingType() const { + return _closingType; + } + virtual XMLNode* ShallowClone( XMLDocument* document ) const; + virtual bool ShallowEqual( const XMLNode* compare ) const; + +protected: + char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); + +private: + XMLElement( XMLDocument* doc ); + virtual ~XMLElement(); + XMLElement( const XMLElement& ); // not supported + void operator=( const XMLElement& ); // not supported + + XMLAttribute* FindOrCreateAttribute( const char* name ); + char* ParseAttributes( char* p, int* curLineNumPtr ); + static void DeleteAttribute( XMLAttribute* attribute ); + XMLAttribute* CreateAttribute(); + + enum { BUF_SIZE = 200 }; + ElementClosingType _closingType; + // The attribute list is ordered; there is no 'lastAttribute' + // because the list needs to be scanned for dupes before adding + // a new attribute. + XMLAttribute* _rootAttribute; +}; + + +enum Whitespace { + PRESERVE_WHITESPACE, + COLLAPSE_WHITESPACE +}; + + +/** A Document binds together all the functionality. + It can be saved, loaded, and printed to the screen. + All Nodes are connected and allocated to a Document. + If the Document is deleted, all its Nodes are also deleted. +*/ +class TINYXML2_LIB XMLDocument : public XMLNode +{ + friend class XMLElement; + // Gives access to SetError and Push/PopDepth, but over-access for everything else. + // Wishing C++ had "internal" scope. + friend class XMLNode; + friend class XMLText; + friend class XMLComment; + friend class XMLDeclaration; + friend class XMLUnknown; +public: + /// constructor + XMLDocument( bool processEntities = true, Whitespace whitespaceMode = PRESERVE_WHITESPACE ); + ~XMLDocument(); + + virtual XMLDocument* ToDocument() { + TIXMLASSERT( this == _document ); + return this; + } + virtual const XMLDocument* ToDocument() const { + TIXMLASSERT( this == _document ); + return this; + } + + /** + Parse an XML file from a character string. + Returns XML_SUCCESS (0) on success, or + an errorID. + + You may optionally pass in the 'nBytes', which is + the number of bytes which will be parsed. If not + specified, TinyXML-2 will assume 'xml' points to a + null terminated string. + */ + XMLError Parse( const char* xml, size_t nBytes=(size_t)(-1) ); + + /** + Load an XML file from disk. + Returns XML_SUCCESS (0) on success, or + an errorID. + */ + XMLError LoadFile( const char* filename ); + + /** + Load an XML file from disk. You are responsible + for providing and closing the FILE*. + + NOTE: The file should be opened as binary ("rb") + not text in order for TinyXML-2 to correctly + do newline normalization. + + Returns XML_SUCCESS (0) on success, or + an errorID. + */ + XMLError LoadFile( FILE* ); + + /** + Save the XML file to disk. + Returns XML_SUCCESS (0) on success, or + an errorID. + */ + XMLError SaveFile( const char* filename, bool compact = false ); + + /** + Save the XML file to disk. You are responsible + for providing and closing the FILE*. + + Returns XML_SUCCESS (0) on success, or + an errorID. + */ + XMLError SaveFile( FILE* fp, bool compact = false ); + + bool ProcessEntities() const { + return _processEntities; + } + Whitespace WhitespaceMode() const { + return _whitespaceMode; + } + + /** + Returns true if this document has a leading Byte Order Mark of UTF8. + */ + bool HasBOM() const { + return _writeBOM; + } + /** Sets whether to write the BOM when writing the file. + */ + void SetBOM( bool useBOM ) { + _writeBOM = useBOM; + } + + /** Return the root element of DOM. Equivalent to FirstChildElement(). + To get the first node, use FirstChild(). + */ + XMLElement* RootElement() { + return FirstChildElement(); + } + const XMLElement* RootElement() const { + return FirstChildElement(); + } + + /** Print the Document. If the Printer is not provided, it will + print to stdout. If you provide Printer, this can print to a file: + @verbatim + XMLPrinter printer( fp ); + doc.Print( &printer ); + @endverbatim + + Or you can use a printer to print to memory: + @verbatim + XMLPrinter printer; + doc.Print( &printer ); + // printer.CStr() has a const char* to the XML + @endverbatim + */ + void Print( XMLPrinter* streamer=0 ) const; + virtual bool Accept( XMLVisitor* visitor ) const; + + /** + Create a new Element associated with + this Document. The memory for the Element + is managed by the Document. + */ + XMLElement* NewElement( const char* name ); + /** + Create a new Comment associated with + this Document. The memory for the Comment + is managed by the Document. + */ + XMLComment* NewComment( const char* comment ); + /** + Create a new Text associated with + this Document. The memory for the Text + is managed by the Document. + */ + XMLText* NewText( const char* text ); + /** + Create a new Declaration associated with + this Document. The memory for the object + is managed by the Document. + + If the 'text' param is null, the standard + declaration is used.: + @verbatim + <?xml version="1.0" encoding="UTF-8"?> + @endverbatim + */ + XMLDeclaration* NewDeclaration( const char* text=0 ); + /** + Create a new Unknown associated with + this Document. The memory for the object + is managed by the Document. + */ + XMLUnknown* NewUnknown( const char* text ); + + /** + Delete a node associated with this document. + It will be unlinked from the DOM. + */ + void DeleteNode( XMLNode* node ); + + void ClearError() { + SetError(XML_SUCCESS, 0, 0); + } + + /// Return true if there was an error parsing the document. + bool Error() const { + return _errorID != XML_SUCCESS; + } + /// Return the errorID. + XMLError ErrorID() const { + return _errorID; + } + const char* ErrorName() const; + static const char* ErrorIDToName(XMLError errorID); + + /** Returns a "long form" error description. A hopefully helpful + diagnostic with location, line number, and/or additional info. + */ + const char* ErrorStr() const; + + /// A (trivial) utility function that prints the ErrorStr() to stdout. + void PrintError() const; + + /// Return the line where the error occurred, or zero if unknown. + int ErrorLineNum() const + { + return _errorLineNum; + } + + /// Clear the document, resetting it to the initial state. + void Clear(); + + /** + Copies this document to a target document. + The target will be completely cleared before the copy. + If you want to copy a sub-tree, see XMLNode::DeepClone(). + + NOTE: that the 'target' must be non-null. + */ + void DeepCopy(XMLDocument* target) const; + + // internal + char* Identify( char* p, XMLNode** node ); + + // internal + void MarkInUse(XMLNode*); + + virtual XMLNode* ShallowClone( XMLDocument* /*document*/ ) const { + return 0; + } + virtual bool ShallowEqual( const XMLNode* /*compare*/ ) const { + return false; + } + +private: + XMLDocument( const XMLDocument& ); // not supported + void operator=( const XMLDocument& ); // not supported + + bool _writeBOM; + bool _processEntities; + XMLError _errorID; + Whitespace _whitespaceMode; + mutable StrPair _errorStr; + int _errorLineNum; + char* _charBuffer; + int _parseCurLineNum; + int _parsingDepth; + // Memory tracking does add some overhead. + // However, the code assumes that you don't + // have a bunch of unlinked nodes around. + // Therefore it takes less memory to track + // in the document vs. a linked list in the XMLNode, + // and the performance is the same. + DynArray<XMLNode*, 10> _unlinked; + + MemPoolT< sizeof(XMLElement) > _elementPool; + MemPoolT< sizeof(XMLAttribute) > _attributePool; + MemPoolT< sizeof(XMLText) > _textPool; + MemPoolT< sizeof(XMLComment) > _commentPool; + + static const char* _errorNames[XML_ERROR_COUNT]; + + void Parse(); + + void SetError( XMLError error, int lineNum, const char* format, ... ); + + // Something of an obvious security hole, once it was discovered. + // Either an ill-formed XML or an excessively deep one can overflow + // the stack. Track stack depth, and error out if needed. + class DepthTracker { + public: + explicit DepthTracker(XMLDocument * document) { + this->_document = document; + document->PushDepth(); + } + ~DepthTracker() { + _document->PopDepth(); + } + private: + XMLDocument * _document; + }; + void PushDepth(); + void PopDepth(); + + template<class NodeType, int PoolElementSize> + NodeType* CreateUnlinkedNode( MemPoolT<PoolElementSize>& pool ); +}; + +template<class NodeType, int PoolElementSize> +inline NodeType* XMLDocument::CreateUnlinkedNode( MemPoolT<PoolElementSize>& pool ) +{ + TIXMLASSERT( sizeof( NodeType ) == PoolElementSize ); + TIXMLASSERT( sizeof( NodeType ) == pool.ItemSize() ); + NodeType* returnNode = new (pool.Alloc()) NodeType( this ); + TIXMLASSERT( returnNode ); + returnNode->_memPool = &pool; + + _unlinked.Push(returnNode); + return returnNode; +} + +/** + A XMLHandle is a class that wraps a node pointer with null checks; this is + an incredibly useful thing. Note that XMLHandle is not part of the TinyXML-2 + DOM structure. It is a separate utility class. + + Take an example: + @verbatim + <Document> + <Element attributeA = "valueA"> + <Child attributeB = "value1" /> + <Child attributeB = "value2" /> + </Element> + </Document> + @endverbatim + + Assuming you want the value of "attributeB" in the 2nd "Child" element, it's very + easy to write a *lot* of code that looks like: + + @verbatim + XMLElement* root = document.FirstChildElement( "Document" ); + if ( root ) + { + XMLElement* element = root->FirstChildElement( "Element" ); + if ( element ) + { + XMLElement* child = element->FirstChildElement( "Child" ); + if ( child ) + { + XMLElement* child2 = child->NextSiblingElement( "Child" ); + if ( child2 ) + { + // Finally do something useful. + @endverbatim + + And that doesn't even cover "else" cases. XMLHandle addresses the verbosity + of such code. A XMLHandle checks for null pointers so it is perfectly safe + and correct to use: + + @verbatim + XMLHandle docHandle( &document ); + XMLElement* child2 = docHandle.FirstChildElement( "Document" ).FirstChildElement( "Element" ).FirstChildElement().NextSiblingElement(); + if ( child2 ) + { + // do something useful + @endverbatim + + Which is MUCH more concise and useful. + + It is also safe to copy handles - internally they are nothing more than node pointers. + @verbatim + XMLHandle handleCopy = handle; + @endverbatim + + See also XMLConstHandle, which is the same as XMLHandle, but operates on const objects. +*/ +class TINYXML2_LIB XMLHandle +{ +public: + /// Create a handle from any node (at any depth of the tree.) This can be a null pointer. + explicit XMLHandle( XMLNode* node ) : _node( node ) { + } + /// Create a handle from a node. + explicit XMLHandle( XMLNode& node ) : _node( &node ) { + } + /// Copy constructor + XMLHandle( const XMLHandle& ref ) : _node( ref._node ) { + } + /// Assignment + XMLHandle& operator=( const XMLHandle& ref ) { + _node = ref._node; + return *this; + } + + /// Get the first child of this handle. + XMLHandle FirstChild() { + return XMLHandle( _node ? _node->FirstChild() : 0 ); + } + /// Get the first child element of this handle. + XMLHandle FirstChildElement( const char* name = 0 ) { + return XMLHandle( _node ? _node->FirstChildElement( name ) : 0 ); + } + /// Get the last child of this handle. + XMLHandle LastChild() { + return XMLHandle( _node ? _node->LastChild() : 0 ); + } + /// Get the last child element of this handle. + XMLHandle LastChildElement( const char* name = 0 ) { + return XMLHandle( _node ? _node->LastChildElement( name ) : 0 ); + } + /// Get the previous sibling of this handle. + XMLHandle PreviousSibling() { + return XMLHandle( _node ? _node->PreviousSibling() : 0 ); + } + /// Get the previous sibling element of this handle. + XMLHandle PreviousSiblingElement( const char* name = 0 ) { + return XMLHandle( _node ? _node->PreviousSiblingElement( name ) : 0 ); + } + /// Get the next sibling of this handle. + XMLHandle NextSibling() { + return XMLHandle( _node ? _node->NextSibling() : 0 ); + } + /// Get the next sibling element of this handle. + XMLHandle NextSiblingElement( const char* name = 0 ) { + return XMLHandle( _node ? _node->NextSiblingElement( name ) : 0 ); + } + + /// Safe cast to XMLNode. This can return null. + XMLNode* ToNode() { + return _node; + } + /// Safe cast to XMLElement. This can return null. + XMLElement* ToElement() { + return ( _node ? _node->ToElement() : 0 ); + } + /// Safe cast to XMLText. This can return null. + XMLText* ToText() { + return ( _node ? _node->ToText() : 0 ); + } + /// Safe cast to XMLUnknown. This can return null. + XMLUnknown* ToUnknown() { + return ( _node ? _node->ToUnknown() : 0 ); + } + /// Safe cast to XMLDeclaration. This can return null. + XMLDeclaration* ToDeclaration() { + return ( _node ? _node->ToDeclaration() : 0 ); + } + +private: + XMLNode* _node; +}; + + +/** + A variant of the XMLHandle class for working with const XMLNodes and Documents. It is the + same in all regards, except for the 'const' qualifiers. See XMLHandle for API. +*/ +class TINYXML2_LIB XMLConstHandle +{ +public: + explicit XMLConstHandle( const XMLNode* node ) : _node( node ) { + } + explicit XMLConstHandle( const XMLNode& node ) : _node( &node ) { + } + XMLConstHandle( const XMLConstHandle& ref ) : _node( ref._node ) { + } + + XMLConstHandle& operator=( const XMLConstHandle& ref ) { + _node = ref._node; + return *this; + } + + const XMLConstHandle FirstChild() const { + return XMLConstHandle( _node ? _node->FirstChild() : 0 ); + } + const XMLConstHandle FirstChildElement( const char* name = 0 ) const { + return XMLConstHandle( _node ? _node->FirstChildElement( name ) : 0 ); + } + const XMLConstHandle LastChild() const { + return XMLConstHandle( _node ? _node->LastChild() : 0 ); + } + const XMLConstHandle LastChildElement( const char* name = 0 ) const { + return XMLConstHandle( _node ? _node->LastChildElement( name ) : 0 ); + } + const XMLConstHandle PreviousSibling() const { + return XMLConstHandle( _node ? _node->PreviousSibling() : 0 ); + } + const XMLConstHandle PreviousSiblingElement( const char* name = 0 ) const { + return XMLConstHandle( _node ? _node->PreviousSiblingElement( name ) : 0 ); + } + const XMLConstHandle NextSibling() const { + return XMLConstHandle( _node ? _node->NextSibling() : 0 ); + } + const XMLConstHandle NextSiblingElement( const char* name = 0 ) const { + return XMLConstHandle( _node ? _node->NextSiblingElement( name ) : 0 ); + } + + + const XMLNode* ToNode() const { + return _node; + } + const XMLElement* ToElement() const { + return ( _node ? _node->ToElement() : 0 ); + } + const XMLText* ToText() const { + return ( _node ? _node->ToText() : 0 ); + } + const XMLUnknown* ToUnknown() const { + return ( _node ? _node->ToUnknown() : 0 ); + } + const XMLDeclaration* ToDeclaration() const { + return ( _node ? _node->ToDeclaration() : 0 ); + } + +private: + const XMLNode* _node; +}; + + +/** + Printing functionality. The XMLPrinter gives you more + options than the XMLDocument::Print() method. + + It can: + -# Print to memory. + -# Print to a file you provide. + -# Print XML without a XMLDocument. + + Print to Memory + + @verbatim + XMLPrinter printer; + doc.Print( &printer ); + SomeFunction( printer.CStr() ); + @endverbatim + + Print to a File + + You provide the file pointer. + @verbatim + XMLPrinter printer( fp ); + doc.Print( &printer ); + @endverbatim + + Print without a XMLDocument + + When loading, an XML parser is very useful. However, sometimes + when saving, it just gets in the way. The code is often set up + for streaming, and constructing the DOM is just overhead. + + The Printer supports the streaming case. The following code + prints out a trivially simple XML file without ever creating + an XML document. + + @verbatim + XMLPrinter printer( fp ); + printer.OpenElement( "foo" ); + printer.PushAttribute( "foo", "bar" ); + printer.CloseElement(); + @endverbatim +*/ +class TINYXML2_LIB XMLPrinter : public XMLVisitor +{ +public: + /** Construct the printer. If the FILE* is specified, + this will print to the FILE. Else it will print + to memory, and the result is available in CStr(). + If 'compact' is set to true, then output is created + with only required whitespace and newlines. + */ + XMLPrinter( FILE* file=0, bool compact = false, int depth = 0 ); + virtual ~XMLPrinter() {} + + /** If streaming, write the BOM and declaration. */ + void PushHeader( bool writeBOM, bool writeDeclaration ); + /** If streaming, start writing an element. + The element must be closed with CloseElement() + */ + void OpenElement( const char* name, bool compactMode=false ); + /// If streaming, add an attribute to an open element. + void PushAttribute( const char* name, const char* value ); + void PushAttribute( const char* name, int value ); + void PushAttribute( const char* name, unsigned value ); + void PushAttribute(const char* name, int64_t value); + void PushAttribute( const char* name, bool value ); + void PushAttribute( const char* name, double value ); + /// If streaming, close the Element. + virtual void CloseElement( bool compactMode=false ); + + /// Add a text node. + void PushText( const char* text, bool cdata=false ); + /// Add a text node from an integer. + void PushText( int value ); + /// Add a text node from an unsigned. + void PushText( unsigned value ); + /// Add a text node from an unsigned. + void PushText(int64_t value); + /// Add a text node from a bool. + void PushText( bool value ); + /// Add a text node from a float. + void PushText( float value ); + /// Add a text node from a double. + void PushText( double value ); + + /// Add a comment + void PushComment( const char* comment ); + + void PushDeclaration( const char* value ); + void PushUnknown( const char* value ); + + virtual bool VisitEnter( const XMLDocument& /*doc*/ ); + virtual bool VisitExit( const XMLDocument& /*doc*/ ) { + return true; + } + + virtual bool VisitEnter( const XMLElement& element, const XMLAttribute* attribute ); + virtual bool VisitExit( const XMLElement& element ); + + virtual bool Visit( const XMLText& text ); + virtual bool Visit( const XMLComment& comment ); + virtual bool Visit( const XMLDeclaration& declaration ); + virtual bool Visit( const XMLUnknown& unknown ); + + /** + If in print to memory mode, return a pointer to + the XML file in memory. + */ + const char* CStr() const { + return _buffer.Mem(); + } + /** + If in print to memory mode, return the size + of the XML file in memory. (Note the size returned + includes the terminating null.) + */ + int CStrSize() const { + return _buffer.Size(); + } + /** + If in print to memory mode, reset the buffer to the + beginning. + */ + void ClearBuffer() { + _buffer.Clear(); + _buffer.Push(0); + _firstElement = true; + } + +protected: + virtual bool CompactMode( const XMLElement& ) { return _compactMode; } + + /** Prints out the space before an element. You may override to change + the space and tabs used. A PrintSpace() override should call Print(). + */ + virtual void PrintSpace( int depth ); + void Print( const char* format, ... ); + void Write( const char* data, size_t size ); + inline void Write( const char* data ) { Write( data, strlen( data ) ); } + void Putc( char ch ); + + void SealElementIfJustOpened(); + bool _elementJustOpened; + DynArray< const char*, 10 > _stack; + +private: + void PrintString( const char*, bool restrictedEntitySet ); // prints out, after detecting entities. + + bool _firstElement; + FILE* _fp; + int _depth; + int _textDepth; + bool _processEntities; + bool _compactMode; + + enum { + ENTITY_RANGE = 64, + BUF_SIZE = 200 + }; + bool _entityFlag[ENTITY_RANGE]; + bool _restrictedEntityFlag[ENTITY_RANGE]; + + DynArray< char, 20 > _buffer; + + // Prohibit cloning, intentionally not implemented + XMLPrinter( const XMLPrinter& ); + XMLPrinter& operator=( const XMLPrinter& ); +}; + + +} // tinyxml2 + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif + +#endif // TINYXML2_INCLUDED diff --git a/source/Asura.Editor/scripts/scene_view.lua b/source/Asura.Editor/scripts/scene_view.lua index db4790f..b6097f3 100644 --- a/source/Asura.Editor/scripts/scene_view.lua +++ b/source/Asura.Editor/scripts/scene_view.lua @@ -1 +1,4 @@ -- 场景窗口 +local scene = AsuraEditor.Window.New("Window/Scene View") + + diff --git a/source/libs/asura-lib-core/graphics/binding/_gif.cpp b/source/Asura.Editor/system/file_watcher.cpp index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/graphics/binding/_gif.cpp +++ b/source/Asura.Editor/system/file_watcher.cpp diff --git a/source/libs/asura-lib-core/threading/binding/_coroutine.cpp b/source/Asura.Editor/system/file_watcher.h index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/threading/binding/_coroutine.cpp +++ b/source/Asura.Editor/system/file_watcher.h diff --git a/source/Asura.Editor/widgets/button.h b/source/Asura.Editor/widgets/button.h index 8edc919..305cd35 100644 --- a/source/Asura.Editor/widgets/button.h +++ b/source/Asura.Editor/widgets/button.h @@ -54,6 +54,9 @@ namespace AsuraEditor private: + LUAX_DECL_ENUM(ButtonStatus); + LUAX_DECL_ENUM(ButtonMessage); + LUAX_DECL_METHOD(_Connect); LUAX_DECL_METHOD(_Disconnect); LUAX_DECL_METHOD(_SetImage); diff --git a/source/libs/asura-lib-core/threading/binding/_thread.cpp b/source/Preprocessor/main.cpp index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/threading/binding/_thread.cpp +++ b/source/Preprocessor/main.cpp diff --git a/source/libs/asura-lib-core/application.h b/source/libs/asura-lib-core/application.h index b61154d..9606819 100644 --- a/source/libs/asura-lib-core/application.h +++ b/source/libs/asura-lib-core/application.h @@ -65,7 +65,9 @@ namespace AsuraEngine private: /// - /// ̵߳lua stateӦѭС + /// ̵߳lua state handleӦѭСһ˵ֻҪ߳һlua_State̲߳Ҫ̼߳ + /// lua̫ʹˡC++дȻעһصһ̴߳lua_Stateעắִк + /// ̵߳lua_Stateֻ֤һnativeʵ֮һlua_State /// lua_State* mMainLuaState; diff --git a/source/libs/asura-lib-core/client/client.h b/source/libs/asura-lib-core/client/client.h deleted file mode 100644 index 8df30fe..0000000 --- a/source/libs/asura-lib-core/client/client.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef __ASURA_ENGINE_HOST_H__ -#define __ASURA_ENGINE_HOST_H__ - -#include <asura-lib-utils/type.h> - -/// -/// ʹйصʵ֣ǵϷĿƽ̨ʹüֱʵ֡༭벻ڿƽ̨ڿ⣬Ŀǰʹwin32APIʵϢѭ -/// -namespace AsuraEngine -{ - namespace Client - { - - /// - /// ࡣ - /// - ASURA_ABSTRACT class Client - { - - }; - - } -} - -#endif
\ No newline at end of file diff --git a/source/libs/asura-lib-core/client/sdl/sdl_application.h b/source/libs/asura-lib-core/client/sdl/sdl_application.h deleted file mode 100644 index f6f23a8..0000000 --- a/source/libs/asura-lib-core/client/sdl/sdl_application.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef __ASURA_SDL_APPLICATION_H__ -#define __ASURA_SDL_APPLICATION_H__ - -#include "sdl_config.h" - -namespace AsuraEngine -{ - namespace SDL - { - - class SDLApplication : public Application - { - - }; - -/* - -Application* editor = nullpt; -#ifdef ASURA_SDL - editor = SDLApplication(); -#endif - -*/ - - } -} - -#endif
\ No newline at end of file diff --git a/source/libs/asura-lib-core/client/sdl/sdl_window.h b/source/libs/asura-lib-core/client/sdl/sdl_window.h deleted file mode 100644 index 040c23e..0000000 --- a/source/libs/asura-lib-core/client/sdl/sdl_window.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __ASURA_SDL_WINDOW_H__ -#define __ASURA_SDL_WINDOW_H__ - -#include "../../core_config.h" -#if ASURA_CORE_SDL - -#include <asura-lib-utils/scripting/portable.hpp> -#include "../../graphics/window.h" - -namespace AsuraEngine -{ - namespace SDL - { - - class SDLWindow ASURA_FINAL - : public Graphics::Window - , public Scripting::Portable<SDLWindow> - { - public: - - - }; - - } -} - -#endif // ASURA_CORE_SDL - -#endif // __ASURA_SDL_WINDOW_H__
\ No newline at end of file diff --git a/source/libs/asura-lib-core/graphics/binding/_canvas.cpp b/source/libs/asura-lib-core/graphics/binding/_canvas.cpp index e69de29..7927995 100644 --- a/source/libs/asura-lib-core/graphics/binding/_canvas.cpp +++ b/source/libs/asura-lib-core/graphics/binding/_canvas.cpp @@ -0,0 +1,46 @@ +#include "../canvas.h" + +using namespace std; + +namespace AsuraEngine +{ + namespace Graphics + { + + LUAX_REGISTRY(Canvas) + { + LUAX_REGISTER_METHODS(state, + { "SetSize", _SetSize }, + { "Bind", _Bind }, + { "Unbind", _Unbind } + ); + } + + LUAX_POSTPROCESS(Canvas) + { + + } + + // canvas:SetSize() + LUAX_IMPL_METHOD(Canvas, _SetSize) + { + LUAX_PREPARE(L, Canvas); + + } + + // canvas:Bind() + LUAX_IMPL_METHOD(Canvas, _Bind) + { + LUAX_PREPARE(L, Canvas); + + } + + // canvas:Unbind() + LUAX_IMPL_METHOD(Canvas, _Unbind) + { + LUAX_PREPARE(L, Canvas); + + } + + } +} diff --git a/source/libs/asura-lib-core/graphics/binding/_color.cpp b/source/libs/asura-lib-core/graphics/binding/_color.cpp index e69de29..11e80a1 100644 --- a/source/libs/asura-lib-core/graphics/binding/_color.cpp +++ b/source/libs/asura-lib-core/graphics/binding/_color.cpp @@ -0,0 +1,54 @@ +#include "../color.h" + +using namespace std; + +namespace AsuraEngine +{ + namespace Graphics + { + + LUAX_REGISTRY(Color) + { + LUAX_REGISTER_METHODS(state, + { "ToColor32", _ToColor32 }, + { "SetColor", _SetColor }, + { "GetColor", _GetColor }, + { "Multiply", _Multiply } + ); + } + + LUAX_POSTPROCESS(Color) + { + + } + + // color:ToColor32() + LUAX_IMPL_METHOD(Color, _ToColor32) + { + LUAX_PREPARE(L, Color); + + } + + // color:SetColor() + LUAX_IMPL_METHOD(Color, _SetColor) + { + LUAX_PREPARE(L, Color); + + } + + // color:GetColor() + LUAX_IMPL_METHOD(Color, _GetColor) + { + LUAX_PREPARE(L, Color); + + } + + // color:Multiply() + LUAX_IMPL_METHOD(Color, _Multiply) + { + LUAX_PREPARE(L, Color); + + } + + } +} diff --git a/source/libs/asura-lib-core/graphics/binding/_color32.cpp b/source/libs/asura-lib-core/graphics/binding/_color32.cpp new file mode 100644 index 0000000..7095866 --- /dev/null +++ b/source/libs/asura-lib-core/graphics/binding/_color32.cpp @@ -0,0 +1,86 @@ +#include "../color32.h" + +using namespace std; + +namespace AsuraEngine +{ + namespace Graphics + { + + LUAX_REGISTRY(Color32) + { + LUAX_REGISTER_METHODS(state, + { "ToColor", _ToColor }, + { "GetRed", _GetRed }, + { "GetGreen", _GetGreen }, + { "GetBlue", _GetBlue }, + { "GetAlpha", _GetAlpha }, + { "Multiply", _Multiply }, + { "Index", _Index }, + { "NewIndex", _NewIndex } + ); + } + + LUAX_POSTPROCESS(Color32) + { + + } + + // color32:ToColor() + LUAX_IMPL_METHOD(Color32, _ToColor) + { + LUAX_PREPARE(L, Color32); + + } + + // color32:GetRed() + LUAX_IMPL_METHOD(Color32, _GetRed) + { + LUAX_PREPARE(L, Color32); + + } + + // color32:GetGreen() + LUAX_IMPL_METHOD(Color32, _GetGreen) + { + LUAX_PREPARE(L, Color32); + + } + + // color32:GetBlue() + LUAX_IMPL_METHOD(Color32, _GetBlue) + { + LUAX_PREPARE(L, Color32); + + } + + // color32:GetAlpha() + LUAX_IMPL_METHOD(Color32, _GetAlpha) + { + LUAX_PREPARE(L, Color32); + + } + + // color32:Multiply() + LUAX_IMPL_METHOD(Color32, _Multiply) + { + LUAX_PREPARE(L, Color32); + + } + + // color32:Index() + LUAX_IMPL_METHOD(Color32, _Index) + { + LUAX_PREPARE(L, Color32); + + } + + // color32:NewIndex() + LUAX_IMPL_METHOD(Color32, _NewIndex) + { + LUAX_PREPARE(L, Color32); + + } + + } +} diff --git a/source/libs/asura-lib-core/graphics/binding/_image.cpp b/source/libs/asura-lib-core/graphics/binding/_image.cpp index e69de29..7c1034c 100644 --- a/source/libs/asura-lib-core/graphics/binding/_image.cpp +++ b/source/libs/asura-lib-core/graphics/binding/_image.cpp @@ -0,0 +1,54 @@ +#include "../image.h" + +using namespace std; + +namespace AsuraEngine +{ + namespace Graphics + { + + LUAX_REGISTRY(Image) + { + LUAX_REGISTER_METHODS(state, + { "Load", _Load }, + { "GetWidth", _GetWidth }, + { "GetHeight", _GetHeight }, + { "GetSize", _GetSize } + ); + } + + LUAX_POSTPROCESS(Image) + { + + } + + // image:Load() + LUAX_IMPL_METHOD(Image, _Load) + { + LUAX_PREPARE(L, Image); + + } + + // image:GetWidth() + LUAX_IMPL_METHOD(Image, _GetWidth) + { + LUAX_PREPARE(L, Image); + + } + + // image:GetHeight() + LUAX_IMPL_METHOD(Image, _GetHeight) + { + LUAX_PREPARE(L, Image); + + } + + // image:GetSize() + LUAX_IMPL_METHOD(Image, _GetSize) + { + LUAX_PREPARE(L, Image); + + } + + } +} diff --git a/source/libs/asura-lib-core/graphics/binding/_image_data.cpp b/source/libs/asura-lib-core/graphics/binding/_image_data.cpp index 72e33da..3ff38f9 100644 --- a/source/libs/asura-lib-core/graphics/binding/_image_data.cpp +++ b/source/libs/asura-lib-core/graphics/binding/_image_data.cpp @@ -1,62 +1,70 @@ #include "../image_data.h" -using namespace Luax; +using namespace std; -namespace AsuraEngine +namespace AsuraEngine { - namespace Graphics + namespace Graphics { - + LUAX_REGISTRY(ImageData) { - + LUAX_REGISTER_METHODS(state, + { "New", _New }, + { "GetPixel", _GetPixel }, + { "GetSize", _GetSize }, + { "GetWidth", _GetWidth }, + { "GetHeight", _GetHeight }, + { "GetPixelFormat", _GetPixelFormat } + ); } LUAX_POSTPROCESS(ImageData) { - LUAX_REGISTER_ENUM(state, "EBlendMode", - { "Additive", 1 } - ); - LUAX_REGISTER_ENUM(state, "EPixelFormat", - { "RGBA32", 1 } - ); + } - // imagedata = ImageData.New(databuffer) + // ImageData.New() LUAX_IMPL_METHOD(ImageData, _New) { LUAX_STATE(L); - Filesystem::DataBuffer* db = state.CheckUserdata<Filesystem::DataBuffer>(1); - ImageData* image = new ImageData(*db); - image->PushLuaxUserdata(state); - return 1; } + // imagedata:GetPixel() LUAX_IMPL_METHOD(ImageData, _GetPixel) { + LUAX_PREPARE(L, ImageData); } + // imagedata:GetSize() LUAX_IMPL_METHOD(ImageData, _GetSize) { + LUAX_PREPARE(L, ImageData); } + // imagedata:GetWidth() LUAX_IMPL_METHOD(ImageData, _GetWidth) { + LUAX_PREPARE(L, ImageData); } + // imagedata:GetHeight() LUAX_IMPL_METHOD(ImageData, _GetHeight) { + LUAX_PREPARE(L, ImageData); } + // imagedata:GetPixelFormat() LUAX_IMPL_METHOD(ImageData, _GetPixelFormat) { + LUAX_PREPARE(L, ImageData); } } -}
\ No newline at end of file +} diff --git a/source/libs/asura-lib-core/graphics/binding/_mesh2d.cpp b/source/libs/asura-lib-core/graphics/binding/_mesh2d.cpp index e69de29..07e9f12 100644 --- a/source/libs/asura-lib-core/graphics/binding/_mesh2d.cpp +++ b/source/libs/asura-lib-core/graphics/binding/_mesh2d.cpp @@ -0,0 +1,21 @@ +#include "../mesh2d.h" + +using namespace std; + +namespace AsuraEngine +{ + namespace Graphics + { + + LUAX_REGISTRY(Mesh2D) + { + + } + + LUAX_POSTPROCESS(Mesh2D) + { + + } + + } +} diff --git a/source/libs/asura-lib-core/graphics/binding/_mesh2d_data.cpp b/source/libs/asura-lib-core/graphics/binding/_mesh2d_data.cpp deleted file mode 100644 index 6e15052..0000000 --- a/source/libs/asura-lib-core/graphics/binding/_mesh2d_data.cpp +++ /dev/null @@ -1,9 +0,0 @@ -namespace AsuraEngine -{ - namespace Graphics - { - - - - } -}
\ No newline at end of file diff --git a/source/libs/asura-lib-core/graphics/binding/_shader.cpp b/source/libs/asura-lib-core/graphics/binding/_shader.cpp index 2f2f507..a06e54b 100644 --- a/source/libs/asura-lib-core/graphics/binding/_shader.cpp +++ b/source/libs/asura-lib-core/graphics/binding/_shader.cpp @@ -1,114 +1,126 @@ #include "../shader.h" -using namespace Luax; +using namespace std; -namespace AsuraEngine +namespace AsuraEngine { - namespace Graphics + namespace Graphics { - - void Shader::RegisterLuaxClass(LuaxState& state) + + LUAX_REGISTRY(Shader) { + LUAX_REGISTER_METHODS(state, + { "New", _New }, + { "Use", _Use }, + { "Unuse", _Unuse }, + { "Load", _Load }, + { "HasUniform", _HasUniform }, + { "GetUniformLocation", _GetUniformLocation }, + { "SetBuiltInUniforms", _SetBuiltInUniforms }, + { "SetUniformFloat", _SetUniformFloat }, + { "SetUniformTexture", _SetUniformTexture }, + { "SetUniformVector2", _SetUniformVector2 }, + { "SetUniformVector3", _SetUniformVector3 }, + { "SetUniformVector4", _SetUniformVector4 }, + { "SetUniformColor", _SetUniformColor } + ); + } - LuaxEnum EBuiltIn[] = { - {0, 0} - }; - - state.RegisterEnum("EBuiltIn", EBuiltIn); + LUAX_POSTPROCESS(Shader) + { } - void Shader::RegisterLuaxPostprocess(LuaxState& state) + // Shader.New() + LUAX_IMPL_METHOD(Shader, _New) { + LUAX_STATE(L); } - /// - /// shaderΪ - /// - int Shader::l_Use(lua_State* L) + // shader:Use() + LUAX_IMPL_METHOD(Shader, _Use) { - LUAX_STATE(L); + LUAX_PREPARE(L, Shader); } - /// - /// shaderΪǻ - /// - int Shader::l_Unuse(lua_State* L) + // shader:Unuse() + LUAX_IMPL_METHOD(Shader, _Unuse) { - LUAX_STATE(L); + LUAX_PREPARE(L, Shader); } - /// - /// ɫйshaderɹtrueʧܷfalse - /// - int Shader::l_Load(lua_State* L) + // shader:Load() + LUAX_IMPL_METHOD(Shader, _Load) { - LUAX_STATE(L); + LUAX_PREPARE(L, Shader); } - /// - /// жshaderǷuniformзtrue,false - /// - int Shader::l_HasUniform(lua_State* L) + // shader:HasUniform() + LUAX_IMPL_METHOD(Shader, _HasUniform) { - LUAX_STATE(L); + LUAX_PREPARE(L, Shader); } - /// - /// uniformslocationûuniformnilضӦloc - /// - int Shader::l_GetUniformLocation(lua_State* L) + // shader:GetUniformLocation() + LUAX_IMPL_METHOD(Shader, _GetUniformLocation) { - LUAX_STATE(L); + LUAX_PREPARE(L, Shader); } - int Shader::l_SetBuiltInUniforms(lua_State* L) + // shader:SetBuiltInUniforms() + LUAX_IMPL_METHOD(Shader, _SetBuiltInUniforms) { - LUAX_STATE(L); - + LUAX_PREPARE(L, Shader); + } - int Shader::l_SetUniformFloat(lua_State* L) + // shader:SetUniformFloat() + LUAX_IMPL_METHOD(Shader, _SetUniformFloat) { - LUAX_STATE(L); + LUAX_PREPARE(L, Shader); } - int Shader::l_SetUniformTexture(lua_State* L) + // shader:SetUniformTexture() + LUAX_IMPL_METHOD(Shader, _SetUniformTexture) { - LUAX_STATE(L); + LUAX_PREPARE(L, Shader); } - int Shader::l_SetUniformVector2(lua_State* L) + // shader:SetUniformVector2() + LUAX_IMPL_METHOD(Shader, _SetUniformVector2) { - LUAX_STATE(L); + LUAX_PREPARE(L, Shader); } - int Shader::l_SetUniformVector3(lua_State* L) + // shader:SetUniformVector3() + LUAX_IMPL_METHOD(Shader, _SetUniformVector3) { - LUAX_STATE(L); + LUAX_PREPARE(L, Shader); } - int Shader::l_SetUniformVector4(lua_State* L) + // shader:SetUniformVector4() + LUAX_IMPL_METHOD(Shader, _SetUniformVector4) { - LUAX_STATE(L); + LUAX_PREPARE(L, Shader); } - int Shader::l_SetUniformColor(lua_State* L) + // shader:SetUniformColor() + LUAX_IMPL_METHOD(Shader, _SetUniformColor) { - LUAX_STATE(L); + LUAX_PREPARE(L, Shader); } } -}
\ No newline at end of file +} diff --git a/source/libs/asura-lib-core/graphics/binding/_sprite_batch.cpp b/source/libs/asura-lib-core/graphics/binding/_sprite_batch.cpp index e69de29..8556c02 100644 --- a/source/libs/asura-lib-core/graphics/binding/_sprite_batch.cpp +++ b/source/libs/asura-lib-core/graphics/binding/_sprite_batch.cpp @@ -0,0 +1,21 @@ +#include "../sprite_batch.h" + +using namespace std; + +namespace AsuraEngine +{ + namespace Graphics + { + + LUAX_REGISTRY(SpriteBatch) + { + + } + + LUAX_POSTPROCESS(SpriteBatch) + { + + } + + } +} diff --git a/source/libs/asura-lib-core/graphics/binding/_window.cpp b/source/libs/asura-lib-core/graphics/binding/_window.cpp deleted file mode 100644 index 3befc8c..0000000 --- a/source/libs/asura-lib-core/graphics/binding/_window.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "../Window.h" - -namespace AsuraEngine -{ - namespace Graphics - { - - - - } -} diff --git a/source/libs/asura-lib-core/graphics/canvas.h b/source/libs/asura-lib-core/graphics/canvas.h index 6b8b630..5b188ca 100644 --- a/source/libs/asura-lib-core/graphics/canvas.h +++ b/source/libs/asura-lib-core/graphics/canvas.h @@ -64,9 +64,9 @@ namespace AsuraEngine LUAX_DECL_FACTORY(SimCanvas); - LUAX_DECL_METHOD(l_SetSize); - LUAX_DECL_METHOD(l_Bind); - LUAX_DECL_METHOD(l_Unbind); + LUAX_DECL_METHOD(_SetSize); + LUAX_DECL_METHOD(_Bind); + LUAX_DECL_METHOD(_Unbind); //---------------------------------------------------------------------------------------------------------- diff --git a/source/libs/asura-lib-core/graphics/color.cpp b/source/libs/asura-lib-core/graphics/color.cpp index 106493d..4d3691e 100644 --- a/source/libs/asura-lib-core/graphics/color.cpp +++ b/source/libs/asura-lib-core/graphics/color.cpp @@ -1,61 +1,11 @@ -#include "Color.h" +#include "color.h" +#include "color32.h" namespace AsuraEngine { namespace Graphics { - Color32::Color32() - { - r = g = b = a = 0; - } - - Color32::Color32(const Color32& c) - { - r = c.r; - g = c.g; - b = c.b; - a = c.a; - } - - Color32::Color32(const Color& c) - { - r = 255.f * c.r; - g = 255.f * c.g; - b = 255.f * c.b; - a = 255.f * c.a; - } - - Color32::Color32(byte r, byte g, byte b, byte a) - { - this->r = r; - this->g = g; - this->b = b; - this->a = a; - } - - int Color32::l_GetRed(lua_State* L) - { - - } - - int Color32::l_GetGreen(lua_State* L) - { - - } - - int Color32::l_GetBlue(lua_State* L) - { - - } - - int Color32::l_GetAlpha(lua_State* L) - { - - } - - //------------------------------------------------------------------------------------------------------------ - Color::Color() { r = g = b = a = 0; @@ -93,40 +43,5 @@ namespace AsuraEngine a *= c.a; } - int Color::l_GetRed(lua_State* L) - { - - } - - int Color::l_GetGreen(lua_State* L) - { - - } - - int Color::l_GetBlue(lua_State* L) - { - - } - - int Color::l_GetAlpha(lua_State* L) - { - - } - - int Color::l_Add(lua_State* L) - { - - } - - int Color::l_Minus(lua_State* L) - { - - } - - int Color::l_Multiply(lua_State* L) - { - - } - } }
\ No newline at end of file diff --git a/source/libs/asura-lib-core/graphics/color.h b/source/libs/asura-lib-core/graphics/color.h index 74cf8f3..607314b 100644 --- a/source/libs/asura-lib-core/graphics/color.h +++ b/source/libs/asura-lib-core/graphics/color.h @@ -10,44 +10,7 @@ namespace AsuraEngine namespace Graphics { - class Color; - - /// - /// 32bitsɫ - /// - class Color32 ASURA_FINAL - : public Scripting::Portable<Color32> - { - public: - - Color32(); - - ~Color32(); - - Color32(const Color32& c); - - Color32(const Color& c); - - Color32(byte r, byte g, byte b, byte a); - - byte r, g, b, a; - - //---------------------------------------------------------------------------------------------------------- - - LUAX_DECL_FACTORY(Color32); - - LUAX_DECL_METHOD(l_ToColor); - LUAX_DECL_METHOD(l_GetRed); - LUAX_DECL_METHOD(l_GetGreen); - LUAX_DECL_METHOD(l_GetBlue); - LUAX_DECL_METHOD(l_GetAlpha); - LUAX_DECL_METHOD(l_Multiply); - LUAX_DECL_METHOD(l_Index); //r,g,b,a - LUAX_DECL_METHOD(l_NewIndex); //r,g,b,a - - //---------------------------------------------------------------------------------------------------------- - - }; + class Color32; /// /// 淶ɫ @@ -77,16 +40,12 @@ namespace AsuraEngine float r, g, b, a; - //---------------------------------------------------------------------------------------------------------- - LUAX_DECL_FACTORY(Color); - LUAX_DECL_METHOD(l_ToColor32); - LUAX_DECL_METHOD(l_SetColor); - LUAX_DECL_METHOD(l_GetColor); - LUAX_DECL_METHOD(l_Multiply); // ɫ˷ - - //---------------------------------------------------------------------------------------------------------- + LUAX_DECL_METHOD(_ToColor32); + LUAX_DECL_METHOD(_SetColor); + LUAX_DECL_METHOD(_GetColor); + LUAX_DECL_METHOD(_Multiply); // ɫ˷ }; diff --git a/source/libs/asura-lib-core/graphics/color32.cpp b/source/libs/asura-lib-core/graphics/color32.cpp new file mode 100644 index 0000000..0ebc77c --- /dev/null +++ b/source/libs/asura-lib-core/graphics/color32.cpp @@ -0,0 +1,39 @@ +#include "color.h" +#include "color32.h" + +namespace AsuraEngine +{ + namespace Graphics + { + + Color32::Color32() + { + r = g = b = a = 0; + } + + Color32::Color32(const Color32& c) + { + r = c.r; + g = c.g; + b = c.b; + a = c.a; + } + + Color32::Color32(const Color& c) + { + r = 255.f * c.r; + g = 255.f * c.g; + b = 255.f * c.b; + a = 255.f * c.a; + } + + Color32::Color32(byte r, byte g, byte b, byte a) + { + this->r = r; + this->g = g; + this->b = b; + this->a = a; + } + + } +}
\ No newline at end of file diff --git a/source/libs/asura-lib-core/graphics/color32.h b/source/libs/asura-lib-core/graphics/color32.h new file mode 100644 index 0000000..c64a9b9 --- /dev/null +++ b/source/libs/asura-lib-core/graphics/color32.h @@ -0,0 +1,51 @@ +#ifndef __ASURA_ENGINE_COLOR32_H__ +#define __ASURA_ENGINE_COLOR32_H__ + +#include <asura-lib-utils/scripting/portable.hpp> + +#include "../core_config.h" + +namespace AsuraEngine +{ + namespace Graphics + { + + class Color; + + /// + /// 32bitsɫ + /// + class Color32 ASURA_FINAL + : public Scripting::Portable<Color32> + { + public: + + LUAX_DECL_FACTORY(Color32); + + Color32(); + + ~Color32(); + + Color32(const Color32& c); + + Color32(const Color& c); + + Color32(byte r, byte g, byte b, byte a); + + byte r, g, b, a; + + LUAX_DECL_METHOD(_ToColor); + LUAX_DECL_METHOD(_GetRed); + LUAX_DECL_METHOD(_GetGreen); + LUAX_DECL_METHOD(_GetBlue); + LUAX_DECL_METHOD(_GetAlpha); + LUAX_DECL_METHOD(_Multiply); + LUAX_DECL_METHOD(_Index); //r,g,b,a + LUAX_DECL_METHOD(_NewIndex); //r,g,b,a + + }; + + } +} + +#endif
\ No newline at end of file diff --git a/source/libs/asura-lib-core/graphics/image.h b/source/libs/asura-lib-core/graphics/image.h index d8577ad..0e4ea0a 100644 --- a/source/libs/asura-lib-core/graphics/image.h +++ b/source/libs/asura-lib-core/graphics/image.h @@ -1,11 +1,12 @@ #ifndef __ASURA_ENGINE_IMAGE_H__ #define __ASURA_ENGINE_IMAGE_H__ -#include "../math/vector2.hpp" -#include "../scripting/portable.hpp" -#include "../fileSystem/reloadable.h" -#include "../stringmap.hpp" -#include "../manager.hpp" +#include <asura-lib-utils/math/rect.hpp> +#include <asura-lib-utils/math/vector2.hpp> +#include <asura-lib-utils/scripting/portable.hpp> +#include <asura-lib-utils/io/reloadable.h> +#include <asura-lib-utils/stringmap.hpp> +#include <asura-lib-utils/manager.hpp> #include "texture.h" #include "color.h" @@ -26,7 +27,7 @@ namespace AsuraEngine class Image ASURA_FINAL : public Drawable , public Scripting::Portable<Image> - , public Filesystem::Reloadable + , public AEIO::Reloadable { public: @@ -63,10 +64,10 @@ namespace AsuraEngine LUAX_DECL_FACTORY(SimImage); - LUAX_DECL_METHOD(l_Load); - LUAX_DECL_METHOD(l_GetWidth); - LUAX_DECL_METHOD(l_GetHeight); - LUAX_DECL_METHOD(l_GetSize); + LUAX_DECL_METHOD(_Load); + LUAX_DECL_METHOD(_GetWidth); + LUAX_DECL_METHOD(_GetHeight); + LUAX_DECL_METHOD(_GetSize); }; diff --git a/source/libs/asura-lib-core/threading/coroutine.cpp b/source/libs/asura-lib-core/graphics/image_decode_task.cpp index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/threading/coroutine.cpp +++ b/source/libs/asura-lib-core/graphics/image_decode_task.cpp diff --git a/source/libs/asura-lib-core/graphics/image_decode_task.h b/source/libs/asura-lib-core/graphics/image_decode_task.h new file mode 100644 index 0000000..a721b3e --- /dev/null +++ b/source/libs/asura-lib-core/graphics/image_decode_task.h @@ -0,0 +1,25 @@ +#ifndef __ASURA_IMAGE_DECODE_TASK_H__ +#define __ASURA_IMAGE_DECODE_TASK_H__ + +#include <asura-lib-utils/threading/thread_task.h> +#include <asura-lib-utils/scripting/portable.hpp> + +namespace AsuraEngine +{ + namespace Graphics + { + + class ImageDecodeTask + : public AEScripting::Portable<ImageDecodeTask> + , public AEThreading::ThreadTask + { + public: + + LUAX_DECL_FACTORY(ImageDecodeTask); + + }; + + } +} + +#endif
\ No newline at end of file diff --git a/source/libs/asura-lib-core/graphics/image_decoder.h b/source/libs/asura-lib-core/graphics/image_decoder.h index 921d129..6f2049a 100644 --- a/source/libs/asura-lib-core/graphics/image_decoder.h +++ b/source/libs/asura-lib-core/graphics/image_decoder.h @@ -1,7 +1,7 @@ #ifndef __ASURA_ENGINE_IMAGE_DECODER_H__ #define __ASURA_ENGINE_IMAGE_DECODER_H__ -#include <asura-lib-utils/filesystem/data_buffer.h> +#include <asura-lib-utils/io/data_buffer.h> #include "image_data.h" @@ -20,12 +20,12 @@ namespace AsuraEngine /// /// жڴǷñdecoderѹ /// - virtual bool CanDecode(const Filesystem::DataBuffer& buffer) = 0; + virtual bool CanDecode(const AEIO::DataBuffer& buffer) = 0; /// /// һڴ棬һѹImage dataѹʧܷnullptr /// - virtual void Decode(const Filesystem::DataBuffer& buffer, ImageData& data) = 0; + virtual void Decode(const AEIO::DataBuffer& buffer, ImageData& data) = 0; }; diff --git a/source/libs/asura-lib-core/graphics/mesh2d.h b/source/libs/asura-lib-core/graphics/mesh2d.h index 2c58f00..48b461d 100644 --- a/source/libs/asura-lib-core/graphics/mesh2d.h +++ b/source/libs/asura-lib-core/graphics/mesh2d.h @@ -1,9 +1,7 @@ #ifndef __ASURA_ENGINE_MESH2D_H__ #define __ASURA_ENGINE_MESH2D_H__ -#include "Scripting/Luax.hpp" - -#include "scripting/portable.hpp" +#include <asura-lib-utils/scripting/portable.hpp> namespace AsuraEngine { diff --git a/source/libs/asura-lib-core/graphics/png_decoder.h b/source/libs/asura-lib-core/graphics/png_decoder.h index bb82032..bc871fa 100644 --- a/source/libs/asura-lib-core/graphics/png_decoder.h +++ b/source/libs/asura-lib-core/graphics/png_decoder.h @@ -15,9 +15,9 @@ namespace AsuraEngine { public: - bool CanDecode(const Filesystem::DataBuffer& buffer) override; + bool CanDecode(const AEIO::DataBuffer& buffer) override; - void Decode(const Filesystem::DataBuffer& buffer, ImageData& data) override; + void Decode(const AEIO::DataBuffer& buffer, ImageData& data) override; }; diff --git a/source/libs/asura-lib-core/graphics/render_state.h b/source/libs/asura-lib-core/graphics/render_state.h index a80efd3..4d1831c 100644 --- a/source/libs/asura-lib-core/graphics/render_state.h +++ b/source/libs/asura-lib-core/graphics/render_state.h @@ -1,9 +1,8 @@ #ifndef __ASURA_ENGINE_RENDER_STATE_H__ #define __ASURA_ENGINE_RENDER_STATE_H__ -#include "Math/Vector2.hpp" -#include "Math/Rect.hpp" -#include "Math/Transform.h" +#include <asura-lib-utils/math/vector2.hpp> +#include <asura-lib-utils/math/transform.h> #include "Shader.h" #include "blend_mode.h" diff --git a/source/libs/asura-lib-core/graphics/render_target.h b/source/libs/asura-lib-core/graphics/render_target.h index d6de164..afa5c6a 100644 --- a/source/libs/asura-lib-core/graphics/render_target.h +++ b/source/libs/asura-lib-core/graphics/render_target.h @@ -1,10 +1,12 @@ #ifndef __ASURA_ENGINE_RENDERTARGET_H__ #define __ASURA_ENGINE_RENDERTARGET_H__ -#include "Math/Rect.hpp" -#include "Texture.h" -#include "Scripting/Portable.h" -#include "Color.h" +#include <asura-lib-utils/math/vector2.hpp> +#include <asura-lib-utils/math/rect.hpp> +#include <asura-lib-utils/scripting/portable.hpp> + +#include "texture.h" +#include "color.h" namespace AsuraEngine { diff --git a/source/libs/asura-lib-core/graphics/shader.h b/source/libs/asura-lib-core/graphics/shader.h index 65f214e..575a37e 100644 --- a/source/libs/asura-lib-core/graphics/shader.h +++ b/source/libs/asura-lib-core/graphics/shader.h @@ -4,18 +4,18 @@ #include <map> #include <string> -#include "FileSystem/Reloadable.h" -#include "Scripting/Luax.hpp" -#include "Math/Vector2.hpp" -#include "Math/Vector3.hpp" -#include "Math/Vector4.h" -#include "Math/Matrix44.h" -#include "StringMap.hpp" -#include "scripting/portable.hpp" -#include "Color.h" -#include "Manager.hpp" -#include "Texture.h" -#include "GL.h" +#include <asura-lib-utils/scripting/portable.hpp> +#include <asura-lib-utils/io/reloadable.h> +#include <asura-lib-utils/math/vector2.hpp> +#include <asura-lib-utils/math/vector3.hpp> +#include <asura-lib-utils/math/vector4.h> +#include <asura-lib-utils/math/matrix44.h> +#include <asura-lib-utils/stringmap.hpp> +#include <asura-lib-utils/manager.hpp> + +#include "color.h" +#include "texture.h" +#include "gl.h" namespace AsuraEngine { @@ -28,7 +28,7 @@ namespace AsuraEngine /// class Shader ASURA_FINAL : public Scripting::Portable<Shader> - , public Filesystem::Reloadable + , public AEIO::Reloadable { public: @@ -100,18 +100,19 @@ namespace AsuraEngine LUAX_DECL_FACTORY(SimShader); - LUAX_DECL_METHOD(l_Use); - LUAX_DECL_METHOD(l_Unuse); - LUAX_DECL_METHOD(l_Load); - LUAX_DECL_METHOD(l_HasUniform); - LUAX_DECL_METHOD(l_GetUniformLocation); - LUAX_DECL_METHOD(l_SetBuiltInUniforms); - LUAX_DECL_METHOD(l_SetUniformFloat); - LUAX_DECL_METHOD(l_SetUniformTexture); - LUAX_DECL_METHOD(l_SetUniformVector2); - LUAX_DECL_METHOD(l_SetUniformVector3); - LUAX_DECL_METHOD(l_SetUniformVector4); - LUAX_DECL_METHOD(l_SetUniformColor); + LUAX_DECL_METHOD(_New); + LUAX_DECL_METHOD(_Use); + LUAX_DECL_METHOD(_Unuse); + LUAX_DECL_METHOD(_Load); + LUAX_DECL_METHOD(_HasUniform); + LUAX_DECL_METHOD(_GetUniformLocation); + LUAX_DECL_METHOD(_SetBuiltInUniforms); + LUAX_DECL_METHOD(_SetUniformFloat); + LUAX_DECL_METHOD(_SetUniformTexture); + LUAX_DECL_METHOD(_SetUniformVector2); + LUAX_DECL_METHOD(_SetUniformVector3); + LUAX_DECL_METHOD(_SetUniformVector4); + LUAX_DECL_METHOD(_SetUniformColor); private: diff --git a/source/libs/asura-lib-core/graphics/sprite_batch.h b/source/libs/asura-lib-core/graphics/sprite_batch.h index 7909519..d8d9ca6 100644 --- a/source/libs/asura-lib-core/graphics/sprite_batch.h +++ b/source/libs/asura-lib-core/graphics/sprite_batch.h @@ -1,7 +1,7 @@ #ifndef __ASURA_ENGINE_SPRITE_BATCH_H__ #define __ASURA_ENGINE_SPRITE_BATCH_H__ -#include "Scripting/Portable.h" +#include <asura-lib-utils/scripting/portable.hpp> namespace AsuraEngine { diff --git a/source/libs/asura-lib-core/graphics/stb_decoder.h b/source/libs/asura-lib-core/graphics/stb_decoder.h index 57b247c..85bad21 100644 --- a/source/libs/asura-lib-core/graphics/stb_decoder.h +++ b/source/libs/asura-lib-core/graphics/stb_decoder.h @@ -16,9 +16,9 @@ namespace AsuraEngine { public: - bool CanDecode(const Filesystem::DataBuffer& buffer) override; + bool CanDecode(const AEIO::DataBuffer& buffer) override; - void Decode(const Filesystem::DataBuffer& buffer, ImageData& data) override; + void Decode(const AEIO::DataBuffer& buffer, ImageData& data) override; }; diff --git a/source/libs/asura-lib-core/graphics/texture.h b/source/libs/asura-lib-core/graphics/texture.h index 81aa469..c412b2e 100644 --- a/source/libs/asura-lib-core/graphics/texture.h +++ b/source/libs/asura-lib-core/graphics/texture.h @@ -1,12 +1,14 @@ #ifndef __ASURA_ENGINE_TEXTURE_H__ #define __ASURA_ENGINE_TEXTURE_H__ -#include "Config.h" -#include "Math/Rect.hpp" -#include "Math/Vector2.hpp" -#include "Scripting/Luax.hpp" -#include "RenderState.h" -#include "GL.h" +#include <asura-lib-utils/math/rect.hpp> +#include <asura-lib-utils/math/vector2.hpp> +#include <asura-lib-utils/scripting/portable.hpp> + +#include "../core_config.h" + +#include "render_state.h" +#include "gl.h" namespace AsuraEngine { diff --git a/source/libs/asura-lib-core/graphics/window.h b/source/libs/asura-lib-core/graphics/window.h index cb036f1..0bfd6a1 100644 --- a/source/libs/asura-lib-core/graphics/window.h +++ b/source/libs/asura-lib-core/graphics/window.h @@ -1,8 +1,9 @@ #ifndef __ASURA_ENGINE_WINDOW_H__ #define __ASURA_ENGINE_WINDOW_H__ -#include "../scripting/portable.hpp" -#include "../math/vector2.hpp" +#include <asura-lib-utils/scripting/portable.hpp> +#include <asura-lib-utils/math/vector2.hpp> + #include "render_state.h" #include "render_target.h" @@ -16,52 +17,64 @@ namespace AsuraEngine WINDOW_STYLE_FULLSCREEN = 1 << 1, }; + class WindowImpl; + /// /// ڣֶ֧രڡڱ༭Ҫ֧֣runnerֻҪһڡͬĿͻʵִ˽ӿڲֶעᵽlua /// - ASURA_ABSTRACT class Window + class Window : public RenderTarget + , public AEScripting::Portable<Window> { public: + LUAX_DECL_SINGLETON(Window); + Window(WindowStyle style); ~Window(); - virtual void SetSize(uint width, uint height) = 0; + void SetSize(uint width, uint height); - virtual void SetPosition(int x, int y) = 0; + void SetPosition(int x, int y); - virtual void SetTitle(const std::string& title) = 0; + void SetTitle(const std::string& title); - virtual void SetWindowStyle(WindowStyle style) = 0; + void SetWindowStyle(WindowStyle style); - virtual void Show() = 0; + void Show(); - virtual void Hide() = 0; + void Hide(); /// /// ǿ˫ĴڣҪչʾǰ̨ /// - virtual void SwapRenderBuffer() = 0; + void SwapRenderBuffer(); - virtual void Clear(const Color& col = Color::Black) = 0; + void Clear(const Color& col = Color::Black); - virtual void Clear(const Math::Recti& quad, const Color& col = Color::Black) = 0; + void Clear(const Math::Recti& quad, const Color& col = Color::Black); - virtual void Draw(const Drawable* texture, const RenderState& state) = 0; + void Draw(const Drawable* texture, const RenderState& state); - virtual void Draw(const Drawable* texture, const Math::Recti& quad, const RenderState& state) = 0; + void Draw(const Drawable* texture, const Math::Recti& quad, const RenderState& state); protected: - Math::Vector2i mPosition; - Math::Vector2i mSize; + WindowImpl* mImpl; }; using RenderWindow = Window; + ASURA_ABSTRACT class WindowImpl + { + public: + + + + }; + } } diff --git a/source/libs/asura-lib-core/threading/thread.cpp b/source/libs/asura-lib-core/graphics/window_impl_sdl.cpp index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/threading/thread.cpp +++ b/source/libs/asura-lib-core/graphics/window_impl_sdl.cpp diff --git a/source/libs/asura-lib-core/threading/thread.h b/source/libs/asura-lib-core/graphics/window_impl_sdl.h index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/threading/thread.h +++ b/source/libs/asura-lib-core/graphics/window_impl_sdl.h diff --git a/source/libs/asura-lib-core/input/cursor.h b/source/libs/asura-lib-core/input/cursor.h index a8e53a6..553fda4 100644 --- a/source/libs/asura-lib-core/input/cursor.h +++ b/source/libs/asura-lib-core/input/cursor.h @@ -1,4 +1,3 @@ - #ifndef __ASURA_ENGINE_CURSOR_H__ #define __ASURA_ENGINE_CURSOR_H__ @@ -15,12 +14,17 @@ namespace AsuraEngine namespace Input { - class Cursor ASURA_FINAL : public AEScripting::Portable<Cursor> + class CursorImpl; + + // ָö +#include "Cursor.defs" + + class Cursor + : public AEScripting::Portable<Cursor> { public: - // ָö - #include "Cursor.defs" + LUAX_DECL_FACTORY(Cursor); Cursor(Graphics::ImageData& imageData, int hotx, int hoty); Cursor(SystemCursor cursortype); @@ -31,18 +35,20 @@ namespace AsuraEngine CursorType GetType() const; SystemCursor GetSystemType() const; - LUAX_DECL_FACTORY(Cursor); - private: - SDL_Cursor* mCursorHandle; - - CursorType mType; + CursorType mType; SystemCursor mSystemType; + CursorImpl* mImpl; + + }; + + ASURA_ABSTRACT class CursorImpl + { }; } } -#endif +#endif
\ No newline at end of file diff --git a/source/libs/asura-lib-core/input/cursor_impl_sdl.cpp b/source/libs/asura-lib-core/input/cursor_impl_sdl.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/libs/asura-lib-core/input/cursor_impl_sdl.cpp diff --git a/source/libs/asura-lib-core/input/cursor_impl_sdl.h b/source/libs/asura-lib-core/input/cursor_impl_sdl.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/libs/asura-lib-core/input/cursor_impl_sdl.h diff --git a/source/libs/asura-lib-utils/io/binding/_file.cpp b/source/libs/asura-lib-utils/io/binding/_file.cpp index 0baffd5..0670379 100644 --- a/source/libs/asura-lib-utils/io/binding/_file.cpp +++ b/source/libs/asura-lib-utils/io/binding/_file.cpp @@ -32,8 +32,8 @@ namespace AsuraEngine { LUAX_REGISTER_ENUM(state, "EFileMode", { "CLOSED", FILE_MODE_CLOSED }, - { "READ", FILE_MODE_READ }, - { "WRITE", FILE_MODE_WRITE }, + { "READ", FILE_MODE_READ }, + { "WRITE", FILE_MODE_WRITE }, { "APPEND", FILE_MODE_APPEND } ); @@ -130,7 +130,7 @@ namespace AsuraEngine return 1; } - // isWrite = file:Write(data buffer) + // isWrite = file:Write(data buffer[, size]) LUAX_IMPL_METHOD(File, _Write) { LUAX_PREPARE(L, File); diff --git a/source/libs/asura-lib-utils/io/file.h b/source/libs/asura-lib-utils/io/file.h index b09eaaa..4a6d38b 100644 --- a/source/libs/asura-lib-utils/io/file.h +++ b/source/libs/asura-lib-utils/io/file.h @@ -108,6 +108,9 @@ namespace AsuraEngine BufferMode mBufferMode; ///< д뻺ģʽ size_t mBufferSize; ///< д뻺С + LUAX_DECL_ENUM(FileMode); + LUAX_DECL_ENUM(BufferMode); + LUAX_DECL_METHOD(_New); LUAX_DECL_METHOD(_Open); LUAX_DECL_METHOD(_Close); diff --git a/source/libs/asura-lib-utils/io/file_data.h b/source/libs/asura-lib-utils/io/file_data.h index 106e068..9aa0e3b 100644 --- a/source/libs/asura-lib-utils/io/file_data.h +++ b/source/libs/asura-lib-utils/io/file_data.h @@ -56,10 +56,10 @@ namespace AsuraEngine std::string mExtension; ///< չ std::string mName; ///< ͺļ + LUAX_DECL_METHOD(_GetDataBuffer); LUAX_DECL_METHOD(_GetFileName); LUAX_DECL_METHOD(_GetExtension); LUAX_DECL_METHOD(_GetName); - LUAX_DECL_METHOD(_GetDataBuffer); }; diff --git a/source/libs/asura-lib-utils/io/io_task.cpp b/source/libs/asura-lib-utils/io/io_task.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/libs/asura-lib-utils/io/io_task.cpp diff --git a/source/libs/asura-lib-utils/io/io_task.h b/source/libs/asura-lib-utils/io/io_task.h new file mode 100644 index 0000000..b91a88c --- /dev/null +++ b/source/libs/asura-lib-utils/io/io_task.h @@ -0,0 +1,39 @@ +#ifndef __ASURA_IO_TASK_H__ +#define __ASURA_IO_TASK_H__ + +#include <string> + +#include "../scripting/portable.hpp" +#include "../threading/thread_task.h" + +#include "data_buffer.h" + +namespace AsuraEngine +{ + namespace IO + { + + /// + /// ȡļ + /// + class IOTask + : public AEScripting::Portable<IOTask> + , public AEThreading::ThreadTask + { + public: + + LUAX_DECL_FACTORY(IOTask); + + bool Execute() override ; + + private: + + std::string mPath; + DataBuffer* mDst; + + }; + + } +} + +#endif
\ No newline at end of file diff --git a/source/libs/asura-lib-utils/io/reloadable.h b/source/libs/asura-lib-utils/io/reloadable.h index cf30296..22a721c 100644 --- a/source/libs/asura-lib-utils/io/reloadable.h +++ b/source/libs/asura-lib-utils/io/reloadable.h @@ -24,4 +24,6 @@ namespace AsuraEngine } } +namespace AEIO = AsuraEngine::IO; + #endif
\ No newline at end of file diff --git a/source/libs/asura-lib-utils/threading/coroutine.cpp b/source/libs/asura-lib-utils/threading/coroutine.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/coroutine.cpp diff --git a/source/libs/asura-lib-core/threading/coroutine.h b/source/libs/asura-lib-utils/threading/coroutine.h index f511e48..1ac6b21 100644 --- a/source/libs/asura-lib-core/threading/coroutine.h +++ b/source/libs/asura-lib-utils/threading/coroutine.h @@ -8,6 +8,9 @@ namespace AsuraEngine namespace Threading { + /// + /// luaЭ̣һЩ + /// class Coroutine ASURA_FINAL : public AEScripting::Portable<Coroutine> { @@ -17,7 +20,8 @@ namespace AsuraEngine private: - + LUAX_DECL_METHOD(_New); + LUAX_DECL_METHOD(_Run); }; diff --git a/source/libs/asura-lib-utils/threading/mutex.cpp b/source/libs/asura-lib-utils/threading/mutex.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/mutex.cpp diff --git a/source/libs/asura-lib-utils/threading/mutex.h b/source/libs/asura-lib-utils/threading/mutex.h new file mode 100644 index 0000000..893c6e5 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/mutex.h @@ -0,0 +1,21 @@ +#ifndef __ASURA_MUTEX_H__ +#define __ASURA_MUTEX_H__ + +namespace AsuraEngine +{ + namespace Threading + { + + class Mutex + { + public: + + void Lock(); + void Unlock(); + + }; + + } +} + +#endif
\ No newline at end of file diff --git a/source/libs/asura-lib-utils/threading/thread.cpp b/source/libs/asura-lib-utils/threading/thread.cpp new file mode 100644 index 0000000..c77f3ab --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread.cpp @@ -0,0 +1,14 @@ +#include "thread.h" + +namespace AsuraEngine +{ + namespace Threading + { + + bool Thread::Enqueue(ThreadTask* task) + { + + } + + } +}
\ No newline at end of file diff --git a/source/libs/asura-lib-utils/threading/thread.h b/source/libs/asura-lib-utils/threading/thread.h new file mode 100644 index 0000000..0058144 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread.h @@ -0,0 +1,60 @@ +#ifndef __ASURA_THREAD_H__ +#define __ASURA_THREAD_H__ + +#include <queue> +#include <asura-lib-utils/scripting/portable.hpp> + +#include "thread_task.h" + +namespace AsuraEngine +{ + namespace Threading + { + + class ThreadImpl; + + /// + /// ߳壬ÿ߳άһtask queue + /// + class Thread ASURA_FINAL + : public AEScripting::Portable<Thread> + { + public: + + LUAX_DECL_FACTORY(Thread); + + bool Enqueue(ThreadTask* task); + + void Run(); + + private: + + /// + /// С + /// + std::queue<ThreadTask*> mTaskQueue; + + ThreadImpl* mImpl; + + LUAX_DECL_METHOD(_Enqueue); + LUAX_DECL_METHOD(_Run); + + }; + + /// + /// ̵߳ľʵ֣ûģһֲԣ + /// 1: win32 + /// 2: posix + /// 3: SDL + /// 4: std::thread + /// + ASURA_ABSTRACT class ThreadImpl + { + public: + + }; + + } +} + +#endif
\ No newline at end of file diff --git a/source/libs/asura-lib-utils/threading/thread_impl_posix.cpp b/source/libs/asura-lib-utils/threading/thread_impl_posix.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread_impl_posix.cpp diff --git a/source/libs/asura-lib-utils/threading/thread_impl_posix.h b/source/libs/asura-lib-utils/threading/thread_impl_posix.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread_impl_posix.h diff --git a/source/libs/asura-lib-utils/threading/thread_impl_sdl.cpp b/source/libs/asura-lib-utils/threading/thread_impl_sdl.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread_impl_sdl.cpp diff --git a/source/libs/asura-lib-utils/threading/thread_impl_sdl.h b/source/libs/asura-lib-utils/threading/thread_impl_sdl.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread_impl_sdl.h diff --git a/source/libs/asura-lib-utils/threading/thread_impl_std.cpp b/source/libs/asura-lib-utils/threading/thread_impl_std.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread_impl_std.cpp diff --git a/source/libs/asura-lib-utils/threading/thread_impl_std.h b/source/libs/asura-lib-utils/threading/thread_impl_std.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread_impl_std.h diff --git a/source/libs/asura-lib-utils/threading/thread_impl_win32.cpp b/source/libs/asura-lib-utils/threading/thread_impl_win32.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread_impl_win32.cpp diff --git a/source/libs/asura-lib-utils/threading/thread_impl_win32.h b/source/libs/asura-lib-utils/threading/thread_impl_win32.h new file mode 100644 index 0000000..3dd2a8e --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread_impl_win32.h @@ -0,0 +1,35 @@ +#ifndef __ASURA_THREAD_WIN32_H__ +#define __ASURA_THREAD_WIN32_H__ + +#include "../utils_config.h" + +#if ASURA_THREAD_WIN32 + +#include <windows.h> +#include "thread.h" + +namespace AsuraEngine +{ + namespace Threading + { + + /// + /// Threadwin32ʵ֡ + /// + class ThreadImplWin32 : public ThreadImpl + { + public: + + + private: + + HANDLE mHandle; + + }; + + } +} + +#endif // #if ASURA_THREAD_WIN32 + +#endif
\ No newline at end of file diff --git a/source/libs/asura-lib-utils/threading/thread_task.cpp b/source/libs/asura-lib-utils/threading/thread_task.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread_task.cpp diff --git a/source/libs/asura-lib-utils/threading/thread_task.h b/source/libs/asura-lib-utils/threading/thread_task.h new file mode 100644 index 0000000..35e159c --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread_task.h @@ -0,0 +1,27 @@ +#ifndef __ASURA_THRAD_TASK_H__ +#define __ASURA_THRAD_TASK_H__ + +#include <asura-lib-utils/type.h> + +namespace AsuraEngine +{ + namespace Threading + { + + /// + /// ϣһ̴̳߳TaskдExecute + /// + ASURA_ABSTRACT class ThreadTask + { + public: + + virtual bool Execute() = 0; + + }; + + } +} + +namespace AEThreading = AsuraEngine::Threading; + +#endif
\ No newline at end of file diff --git a/source/libs/asura-lib-utils/utils_config.h b/source/libs/asura-lib-utils/utils_config.h index e69de29..836eb07 100644 --- a/source/libs/asura-lib-utils/utils_config.h +++ b/source/libs/asura-lib-utils/utils_config.h @@ -0,0 +1,6 @@ +#ifndef __ASURA_UTILS_CONFIG_H__ +#define __ASURA_UTILS_CONFIG_H__ + +#define ASURA_THREAD_WIN32 1 + +#endif
\ No newline at end of file diff --git a/source/libs/asura-lib-utils/utils_module.cpp b/source/libs/asura-lib-utils/utils_module.cpp index f335ec5..a0539ed 100644 --- a/source/libs/asura-lib-utils/utils_module.cpp +++ b/source/libs/asura-lib-utils/utils_module.cpp @@ -1,6 +1,7 @@ #include "utils_module.h" using namespace AsuraEngine::IO; +using namespace AsuraEngine::Threading; namespace AsuraEngine { @@ -12,6 +13,8 @@ namespace AsuraEngine LUAX_REGISTER_FACTORY(state, DataBuffer); LUAX_REGISTER_FACTORY(state, FileData); LUAX_REGISTER_FACTORY(state, File); + // Threading + LUAX_REGISTER_FACTORY(state, Thread); } void UtilsModule::Finalize(Luax::LuaxState& state) diff --git a/source/libs/asura-lib-utils/utils_module.h b/source/libs/asura-lib-utils/utils_module.h index bf80d27..ae875b9 100644 --- a/source/libs/asura-lib-utils/utils_module.h +++ b/source/libs/asura-lib-utils/utils_module.h @@ -6,6 +6,8 @@ #include "io/file_data.h" #include "io/file.h" +#include "threading/thread.h" + #include "module.h" namespace AsuraEngine diff --git a/source/tests/02-luax/main.cpp b/source/tests/02-luax/main.cpp index ebb9df8..d5fe3bf 100644 --- a/source/tests/02-luax/main.cpp +++ b/source/tests/02-luax/main.cpp @@ -302,6 +302,4 @@ int main() state.DoString(script); runtime.Close(L); - - getchar(); }
\ No newline at end of file diff --git a/source/tests/02-luax/script.lua b/source/tests/02-luax/script.lua index 57c9664..7e553d2 100644 --- a/source/tests/02-luax/script.lua +++ b/source/tests/02-luax/script.lua @@ -66,7 +66,7 @@ function main() ------------------- plain class test local Foo = Asura.Class("Foo") - Foo.Ctor = function(self, age, name, boy) + Foo.__init = function(self, age, name, boy) self.age = age self.name = name self.boy = boy @@ -87,11 +87,11 @@ function main() print(Coo.GetClassName()) local coo = Coo.New(20, "Wang", kid) print(coo:GetAge()) - Coo.Ctor = function(self, age, name, boy) + Coo.__init = function(self, age, name, boy) self.age = age - 1 self.name = boy:GetName() self.boy = boy - self.__base.Ctor(self, age, "Wangba", boy) + self.__base.__init(self, age, "Wangba", boy) end Coo.GetName = function(self) local name = self.__base.GetName(self) @@ -117,9 +117,9 @@ function main() -- Boy2.Speak = function(self) -- return self.__base.GetAge(self) -- end - -- Boy2.Ctor = function(self, age, name) - -- print("ctor " .. age) - -- print("ctor " .. name) + -- Boy2.__init = function(self, age, name) + -- print("__init " .. age) + -- print("__init " .. name) -- end -- local boy22 = Boy2.New(12, "Liu") -- print(boy22) @@ -128,6 +128,8 @@ function main() ------------------------gc test local boy = Asura.SimBoy.New(11, "chaichai") boy = nil + + io.read() end function err(msg) print(msg) diff --git a/source/tests/05-physfs/ok.txt b/source/tests/05-physfs/ok.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/tests/05-physfs/ok.txt diff --git a/source/tests/06-coroutine/main.cpp b/source/tests/06-coroutine/main.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/tests/06-coroutine/main.cpp diff --git a/source/tools/bindingGen/main.cs b/source/tools/bindingGen/main.cs new file mode 100644 index 0000000..cf78f89 --- /dev/null +++ b/source/tools/bindingGen/main.cs @@ -0,0 +1,234 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Text.RegularExpressions; +using System.IO; + +namespace bindingGen +{ + /// <summary> + /// 输入目录，在目录下生成./binding目录，存放导出的binding代码 + /// </summary> + class Program + { + // {0} 文件名 + // {1} 第一个名称空间 + // {2} 第二个名称空间 + // {3} 内容 + static string output = @"#include ""../{0}.h"" + +using namespace std; + +namespace {1} +{{ + namespace {2} + {{ + {3} + }} +}} +"; + + // {0} 类名 + // {1} 内容 + static string registry = @" + LUAX_REGISTRY({0}) + {{ +{1} + }} +"; + + // {0} 类名 + // {1} 内容 + static string postprocess = @" + LUAX_POSTPROCESS({0}) + {{ +{1} + }} +"; + + // {0} 类名 + // {1} 去掉_的函数名 + // {2} 小写的类名 + static string method = @" + // {2}:{1}() + LUAX_IMPL_METHOD({0}, _{1}) + {{ + LUAX_PREPARE(L, {0}); + + }} +"; + // {0} 类名 + // {1} 去掉_的函数名 + static string method_new = @" + // {0}.{1}() + LUAX_IMPL_METHOD({0}, _{1}) + {{ + LUAX_STATE(L); + + }} +"; + + static string make_register_methods(MatchCollection methods) + { + if (methods.Count == 0) + return ""; + string register_methods = ""; + register_methods += "\t\t\tLUAX_REGISTER_METHODS(state,\n"; + int maxlen = 0; + foreach(var m in methods) + { + string method = m.ToString(); + if (method.Count() > maxlen) + maxlen = method.Count(); + } + for(int i = 0; i < methods.Count; ++i) + { + Match m = methods[i]; + string method = m.ToString(); + register_methods += "\t\t\t\t"; + register_methods += "{ "; + register_methods += ('"' + method.Substring(1, method.Count() - 1) + "\",").PadRight(maxlen + 3, ' '); + register_methods += method.PadRight(maxlen + 1, ' '); + register_methods += "}"; + if (i != methods.Count - 1) + register_methods += ','; + register_methods += '\n'; + } + register_methods += "\t\t\t);"; + return register_methods; + } + + static string make_impl_methods(MatchCollection mc, string cname) + { + if (mc.Count == 0) + return ""; + + string methods = ""; + + foreach(var m in mc) + { + string name = m.ToString(); + if(name != "_New") + { + methods += String.Format(method, cname, name.Substring(1, name.Count() - 1), cname.ToLower()); + } + else + { + methods += String.Format(method_new, cname, name.Substring(1, name.Count() - 1)); + } + } + + return methods; + } + + 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 enums = ""; + + foreach(var m in mc) + { + string name = m.ToString(); + enums += "\t\t\tLUAX_REGISTER_ENUM(state, "; + enums += "\"E" + name + "\",\n"; + 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 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); + 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) + { + enums += "\t\t\t\t{ "; + enums += ('"' + keys[i] + "\",").PadRight(maxKey + 4); + enums += enames[i].PadRight(maxEname + 1); + enums += "}"; + if (i != values.Count - 1) + enums += ","; + enums += "\n"; + } + enums += "\t\t\t);\n"; + } + return enums; + } + + /// <summary> + /// 用法： + /// bindingGen <目录> + /// </summary> + /// <param name="args"></param> + static void Main(string[] args) + { + if (args.Length < 1) + return; + + string dir = args[0]; + + Console.WriteLine("源目录: " + dir); + + if (!Directory.Exists(dir)) + return; + + string reg_class = @"(?<=Portable\<)[0-9a-zA-Z]+(?=\>)"; + string reg_methods = @"(?<=LUAX_DECL_METHOD\()[0-9a-zA-Z_]+(?=\))"; + string reg_enums = @"(?<=LUAX_DECL_ENUM\()[0-9a-zA-Z_]+(?=\))"; + string reg_namespace = @"(?<=namespace\s)[0-9a-zA-Z]+(?=[\s\n]*)"; + + if(!Directory.Exists(dir + "/binding")) + { + Directory.CreateDirectory(dir + "/binding"); + } + + string[] files = Directory.GetFiles(dir); + for(int i = 0; i < files.Count(); ++i) + { + string file = files[i]; + if (!File.Exists(file)) + continue; + file = file.Replace('\\', '/'); + string name = file.Substring(file.LastIndexOf('/') + 1, file.LastIndexOf('.') - file.LastIndexOf('/') - 1); + string bindingFile = dir + "/binding/_" + name + ".cpp"; + if (File.Exists(bindingFile)) + continue; + string code = File.ReadAllText(file); + // + Match m = Regex.Match(code, reg_class); + if (!m.Success) + continue; + string className = m.ToString(); + MatchCollection mc = Regex.Matches(code, reg_namespace); + // 应该两个名称空间 + if(mc.Count != 2) + { + Console.WriteLine("Error: 源文件没有两个名称空间 " + file); + continue; + } + string namespace1 = mc[0].ToString(); + string namespace2 = mc[1].ToString(); + // 名称空间内的内容 + string content = ""; + mc = Regex.Matches(code, reg_methods); + content += String.Format(registry, className, make_register_methods(mc)); + mc = Regex.Matches(code, reg_enums); + content += String.Format(postprocess, className, make_register_enum(mc, code)); + mc = Regex.Matches(code, reg_methods); + content += make_impl_methods(mc, className); + string binding = String.Format(output, name, namespace1, namespace2, content); + Console.WriteLine("输出: "+bindingFile); + File.WriteAllText(bindingFile, binding); + } + + } + } +} diff --git a/source/tools/cembed/main.cpp b/source/tools/cembed/main.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/source/tools/cembed/main.cpp |