rename singular path name to plural

YukinoHayakawa · Sep 3, 2021 · 9a34cf7 · 9a34cf7
1 parent 4f960ee
commit 9a34cf7
Show file tree

Hide file tree

Showing 18 changed files with 270 additions and 264 deletions.
diff --git a/DemoEcsFireworks/DemoEcsFireworks.vcxproj b/DemoEcsFireworks/DemoEcsFireworks.vcxproj
@@ -1,103 +1,103 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <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>16.0</VCProjectVersion>
-    <ProjectGuid>{e5156a69-e62c-48b3-bcaf-28c58a8f4d0a}</ProjectGuid>
-    <RootNamespace>DemoEcsFireworks</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <IncludePath>$(Dir_IncludePath);$(IncludePath)</IncludePath>
-    <LibraryPath>$(Dir_LibraryPath);$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <Manifest />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="Service_graphics_gdi.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Service_content_update_flag.hpp" />
-    <ClInclude Include="Service_graphics_gdi.hpp" />
-    <ClInclude Include="Service_master_clock.hpp" />
-    <ClInclude Include="Service_stat.hpp" />
-    <ClInclude Include="System_background_render.hpp" />
-    <ClInclude Include="System_draw_stat.hpp" />
-    <ClInclude Include="System_fireworks_explode.hpp" />
-    <ClInclude Include="System_fireworks_spawn.hpp" />
-    <ClInclude Include="System_gdi_present.hpp" />
-    <ClInclude Include="System_physics.hpp" />
-    <ClInclude Include="System_remove_out_of_bound.hpp" />
-    <ClInclude Include="System_spark_fade.hpp" />
-    <ClInclude Include="System_sprite_render.hpp" />
-    <ClInclude Include="System_star_render.hpp" />
-    <ClInclude Include="System_update_flag.hpp" />
-    <ClInclude Include="Type.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Library\Usagi\Usagi.vcxproj">
-      <Project>{f9061c06-bce6-416b-9aeb-31351810b7ba}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Module\Usagi\Module\Common\Executive\Executive.vcxproj">
-      <Project>{345cdbb7-1ec3-4e1c-ad4f-856a774430f5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Module\Usagi\Module\Common\Math\Math.vcxproj">
-      <Project>{d4e79012-d153-40c0-b62d-fc9b31495442}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Module\Usagi\Module\Common\Time\Time.vcxproj">
-      <Project>{61c2c8d3-d6d1-4bea-b122-43142579ba35}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Module\Usagi\Module\Platform\Win10\Win10.vcxproj">
-      <Project>{ba6b6731-dfa8-4da0-b121-d3d8d584b001}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <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>16.0</VCProjectVersion>
+    <ProjectGuid>{e5156a69-e62c-48b3-bcaf-28c58a8f4d0a}</ProjectGuid>
+    <RootNamespace>DemoEcsFireworks</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <IncludePath>$(Dir_IncludePath);$(IncludePath)</IncludePath>
+    <LibraryPath>$(Dir_LibraryPath);$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <Manifest />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="Service_graphics_gdi.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Service_content_update_flag.hpp" />
+    <ClInclude Include="Service_graphics_gdi.hpp" />
+    <ClInclude Include="Service_master_clock.hpp" />
+    <ClInclude Include="Service_stat.hpp" />
+    <ClInclude Include="System_background_render.hpp" />
+    <ClInclude Include="System_draw_stat.hpp" />
+    <ClInclude Include="System_fireworks_explode.hpp" />
+    <ClInclude Include="System_fireworks_spawn.hpp" />
+    <ClInclude Include="System_gdi_present.hpp" />
+    <ClInclude Include="System_physics.hpp" />
+    <ClInclude Include="System_remove_out_of_bound.hpp" />
+    <ClInclude Include="System_spark_fade.hpp" />
+    <ClInclude Include="System_sprite_render.hpp" />
+    <ClInclude Include="System_star_render.hpp" />
+    <ClInclude Include="System_update_flag.hpp" />
+    <ClInclude Include="Type.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Library\Usagi\Usagi.vcxproj">
+      <Project>{f9061c06-bce6-416b-9aeb-31351810b7ba}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Modules\Usagi\Modules\Common\Executive\Executive.vcxproj">
+      <Project>{345cdbb7-1ec3-4e1c-ad4f-856a774430f5}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Modules\Usagi\Modules\Common\Math\Math.vcxproj">
+      <Project>{d4e79012-d153-40c0-b62d-fc9b31495442}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Modules\Usagi\Modules\Common\Time\Time.vcxproj">
+      <Project>{61c2c8d3-d6d1-4bea-b122-43142579ba35}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Modules\Usagi\Modules\Platforms\Win10\Win10.vcxproj">
+      <Project>{ba6b6731-dfa8-4da0-b121-d3d8d584b001}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/DemoEcsFireworks/Service_graphics_gdi.hpp b/DemoEcsFireworks/Service_graphics_gdi.hpp
@@ -3,7 +3,7 @@
 #include <memory>
 #include <algorithm>
 
-#include <Usagi/Module/Platform/WinCommon/Win32.hpp>
+#include <Usagi/Modules/Platforms/WinCommon/Win32.hpp>
 
 namespace usagi
 {

diff --git a/DemoEcsFireworks/Service_master_clock.hpp b/DemoEcsFireworks/Service_master_clock.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Usagi/Module/Common/Time/Clock.hpp>
+#include <Usagi/Modules/Common/Time/Clock.hpp>
 
 namespace usagi
 {

diff --git a/DemoEcsFireworks/System_fireworks_explode.hpp b/DemoEcsFireworks/System_fireworks_explode.hpp
@@ -3,7 +3,7 @@
 #include <random>
 #include <execution>
 
-#include <Usagi/Module/Common/Math/Constant.hpp>
+#include <Usagi/Modules/Common/Math/Constant.hpp>
 
 #include "Type.hpp"
 

diff --git a/DemoEcsFireworks/System_fireworks_spawn.hpp b/DemoEcsFireworks/System_fireworks_spawn.hpp
@@ -3,7 +3,7 @@
 #include <random>
 
 #include <Usagi/Runtime/Service.hpp>
-#include <Usagi/Module/Common/Time/Clock.hpp>
+#include <Usagi/Modules/Common/Time/Clock.hpp>
 
 #include "Type.hpp"
 #include "Service_master_clock.hpp"

diff --git a/DemoEcsFireworks/System_spark_fade.hpp b/DemoEcsFireworks/System_spark_fade.hpp
@@ -2,7 +2,7 @@
 
 #include <execution>
 
-#include <Usagi/Module/Common/Math/Bezier.hpp>
+#include <Usagi/Modules/Common/Math/Bezier.hpp>
 
 #include "Type.hpp"
 

diff --git a/DemoEcsFireworks/System_sprite_render.hpp b/DemoEcsFireworks/System_sprite_render.hpp
@@ -26,8 +26,8 @@ struct System_sprite_render
         (void)cdc;
         Bitmap &bitmap = USAGI_SERVICE(rt, Service_graphics_gdi).bitmap;
 
-        std::atomic<std::size_t> count = 0;
-        std::for_each(std::execution::par, db.begin(), db.end(), [&](auto &&p) {
+        auto draw = [&](auto &&p) {
+            std::uint64_t count = 0;
             for(auto &&e : db.page_view(p, ReadAccess()))
             {
                 auto &pos = USAGI_COMPONENT(e, ComponentPosition);
@@ -46,10 +46,16 @@ struct System_sprite_render
                     sprite.size,
                     rgb
                 );
-                ++count; // VERY EXPENSIVE
+                ++count;
             }
-        });
+            return count;
+        };
 
-        return count.load();
+        const std::uint64_t count = std::transform_reduce(
+            std::execution::par, db.begin(), db.end(), 0ull,
+            std::plus<std::uint64_t>(), draw
+        );
+
+        return count;
     }
 };
diff --git a/DemoEcsFireworks/Type.hpp b/DemoEcsFireworks/Type.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Usagi/Module/Common/Math/Matrix.hpp>
+#include <Usagi/Modules/Common/Math/Matrix.hpp>
 #include <Usagi/Entity/Archetype.hpp>
 #include <Usagi/Entity/EntityDatabase.hpp>
 

diff --git a/DemoEcsFireworks/main.cpp b/DemoEcsFireworks/main.cpp
@@ -16,8 +16,8 @@
 // #define Service_graphics_gdi___          Service_graphics_gdi
 // #define Service_stat___                  Service_stat
 // #define Service_content_update_flag___   Service_content_update_flag
-#include <Usagi/Module/Common/Executive/SystemTaskList.hpp>
-#include <Usagi/Module/Common/Executive/AppHost.hpp>
+#include <Usagi/Modules/Common/Executive/SystemTaskList.hpp>
+#include <Usagi/Modules/Common/Executive/AppHost.hpp>
 
 #include "System_fireworks_spawn.hpp"
 #include "System_fireworks_explode.hpp"