Shifted ECS_Base out of Engine Folder

This commit is contained in:
Xiao Qi 2022-09-13 13:49:24 +08:00
parent cc2adcb2ab
commit 5f56344a74
25 changed files with 87 additions and 99 deletions

View File

@ -102,19 +102,19 @@
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\Engine\ECS_Base\Components\SHComponent.h" /> <ClInclude Include="src\ECS_Base\Components\SHComponent.h" />
<ClInclude Include="src\Engine\ECS_Base\Components\SHComponentGroup.h" /> <ClInclude Include="src\ECS_Base\Components\SHComponentGroup.h" />
<ClInclude Include="src\Engine\ECS_Base\Entity\SHEntity.h" /> <ClInclude Include="src\ECS_Base\Entity\SHEntity.h" />
<ClInclude Include="src\Engine\ECS_Base\General\SHFamily.h" /> <ClInclude Include="src\ECS_Base\General\SHFamily.h" />
<ClInclude Include="src\Engine\ECS_Base\General\SHHandleGenerator.h" /> <ClInclude Include="src\ECS_Base\General\SHHandleGenerator.h" />
<ClInclude Include="src\Engine\ECS_Base\General\SHSparseBase.h" /> <ClInclude Include="src\ECS_Base\General\SHSparseBase.h" />
<ClInclude Include="src\Engine\ECS_Base\General\SHSparseSet.h" /> <ClInclude Include="src\ECS_Base\General\SHSparseSet.h" />
<ClInclude Include="src\Engine\ECS_Base\General\SHSparseSetContainer.h" /> <ClInclude Include="src\ECS_Base\General\SHSparseSetContainer.h" />
<ClInclude Include="src\Engine\ECS_Base\SHECSMacros.h" /> <ClInclude Include="src\ECS_Base\SHECSMacros.h" />
<ClInclude Include="src\Engine\ECS_Base\System\SHComponentManager.h" /> <ClInclude Include="src\ECS_Base\System\SHComponentManager.h" />
<ClInclude Include="src\Engine\ECS_Base\System\SHEntityManager.h" /> <ClInclude Include="src\ECS_Base\System\SHEntityManager.h" />
<ClInclude Include="src\Engine\ECS_Base\System\SHSystem.h" /> <ClInclude Include="src\ECS_Base\System\SHSystem.h" />
<ClInclude Include="src\Engine\ECS_Base\System\SHSystemManager.h" /> <ClInclude Include="src\ECS_Base\System\SHSystemManager.h" />
<ClInclude Include="src\Engine\SHEngine.h" /> <ClInclude Include="src\Engine\SHEngine.h" />
<ClInclude Include="src\Filesystem\SHFileSystem.h" /> <ClInclude Include="src\Filesystem\SHFileSystem.h" />
<ClInclude Include="src\Graphics\Buffers\SHVkBuffer.h" /> <ClInclude Include="src\Graphics\Buffers\SHVkBuffer.h" />
@ -183,9 +183,9 @@
<ClInclude Include="src\Resource\Handle.h" /> <ClInclude Include="src\Resource\Handle.h" />
<ClInclude Include="src\Resource\ResourceLibrary.h" /> <ClInclude Include="src\Resource\ResourceLibrary.h" />
<ClInclude Include="src\Resource\SparseSet.h" /> <ClInclude Include="src\Resource\SparseSet.h" />
<ClInclude Include="src\Scene\SHSceneGraph.h" />
<ClInclude Include="src\SHpch.h" /> <ClInclude Include="src\SHpch.h" />
<ClInclude Include="src\Scene\SHScene.h" /> <ClInclude Include="src\Scene\SHScene.h" />
<ClInclude Include="src\Scene\SHSceneGraph.h" />
<ClInclude Include="src\Scene\SHSceneManager.h" /> <ClInclude Include="src\Scene\SHSceneManager.h" />
<ClInclude Include="src\Tools\SHException.h" /> <ClInclude Include="src\Tools\SHException.h" />
<ClInclude Include="src\Tools\SHExceptionHandler.h" /> <ClInclude Include="src\Tools\SHExceptionHandler.h" />
@ -193,12 +193,12 @@
<ClInclude Include="src\Tools\SHUtilities.h" /> <ClInclude Include="src\Tools\SHUtilities.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\Engine\ECS_Base\Components\SHComponent.cpp" /> <ClCompile Include="src\ECS_Base\Components\SHComponent.cpp" />
<ClCompile Include="src\Engine\ECS_Base\Components\SHComponentGroup.cpp" /> <ClCompile Include="src\ECS_Base\Components\SHComponentGroup.cpp" />
<ClCompile Include="src\Engine\ECS_Base\Entity\SHEntity.cpp" /> <ClCompile Include="src\ECS_Base\Entity\SHEntity.cpp" />
<ClCompile Include="src\Engine\ECS_Base\System\SHComponentManager.cpp" /> <ClCompile Include="src\ECS_Base\System\SHComponentManager.cpp" />
<ClCompile Include="src\Engine\ECS_Base\System\SHEntityManager.cpp" /> <ClCompile Include="src\ECS_Base\System\SHEntityManager.cpp" />
<ClCompile Include="src\Engine\ECS_Base\System\SHSystemManager.cpp" /> <ClCompile Include="src\ECS_Base\System\SHSystemManager.cpp" />
<ClCompile Include="src\Engine\SHEngine.cpp" /> <ClCompile Include="src\Engine\SHEngine.cpp" />
<ClCompile Include="src\Filesystem\SHFileSystem.cpp" /> <ClCompile Include="src\Filesystem\SHFileSystem.cpp" />
<ClCompile Include="src\Graphics\Buffers\SHVkBuffer.cpp" /> <ClCompile Include="src\Graphics\Buffers\SHVkBuffer.cpp" />
@ -253,11 +253,11 @@
<ClCompile Include="src\Math\Vector\SHVec2.cpp" /> <ClCompile Include="src\Math\Vector\SHVec2.cpp" />
<ClCompile Include="src\Math\Vector\SHVec3.cpp" /> <ClCompile Include="src\Math\Vector\SHVec3.cpp" />
<ClCompile Include="src\Math\Vector\SHVec4.cpp" /> <ClCompile Include="src\Math\Vector\SHVec4.cpp" />
<ClCompile Include="src\Scene\SHSceneGraph.cpp" />
<ClCompile Include="src\Resource\ResourceLibrary.cpp" /> <ClCompile Include="src\Resource\ResourceLibrary.cpp" />
<ClCompile Include="src\SHpch.cpp"> <ClCompile Include="src\SHpch.cpp">
<PrecompiledHeader>Create</PrecompiledHeader> <PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile> </ClCompile>
<ClCompile Include="src\Scene\SHSceneGraph.cpp" />
<ClCompile Include="src\Scene\SHSceneManager.cpp" /> <ClCompile Include="src\Scene\SHSceneManager.cpp" />
<ClCompile Include="src\Tools\SHException.cpp" /> <ClCompile Include="src\Tools\SHException.cpp" />
<ClCompile Include="src\Tools\SHExceptionHandler.cpp" /> <ClCompile Include="src\Tools\SHExceptionHandler.cpp" />

View File

@ -1,24 +1,24 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="ECS_Base">
<UniqueIdentifier>{1AB26817-067F-C322-2F98-B1CA1BC4F8B0}</UniqueIdentifier>
</Filter>
<Filter Include="ECS_Base\Components">
<UniqueIdentifier>{EFD23933-5B34-1741-E4A1-5DF350024E00}</UniqueIdentifier>
</Filter>
<Filter Include="ECS_Base\Entity">
<UniqueIdentifier>{261D0942-92A8-7606-9BB9-F9FA07C4D206}</UniqueIdentifier>
</Filter>
<Filter Include="ECS_Base\General">
<UniqueIdentifier>{07FEB307-F3F6-D259-1C29-B8DE0881B265}</UniqueIdentifier>
</Filter>
<Filter Include="ECS_Base\System">
<UniqueIdentifier>{EE037863-5A8F-E527-63A0-681CCFAA4128}</UniqueIdentifier>
</Filter>
<Filter Include="Engine"> <Filter Include="Engine">
<UniqueIdentifier>{DBC7D3B0-C769-FE86-B024-12DB9C6585D7}</UniqueIdentifier> <UniqueIdentifier>{DBC7D3B0-C769-FE86-B024-12DB9C6585D7}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Engine\ECS_Base">
<UniqueIdentifier>{7FF59BF8-EB80-09BD-F491-8CB1609C65BD}</UniqueIdentifier>
</Filter>
<Filter Include="Engine\ECS_Base\Components">
<UniqueIdentifier>{340D0110-201D-ADE0-89D6-11FF75059C79}</UniqueIdentifier>
</Filter>
<Filter Include="Engine\ECS_Base\Entity">
<UniqueIdentifier>{EBFC8BDC-D7F6-B42E-C063-4B3FACFC1A9B}</UniqueIdentifier>
</Filter>
<Filter Include="Engine\ECS_Base\General">
<UniqueIdentifier>{6CD692F2-D80D-DB89-E117-3FAD4DCE0183}</UniqueIdentifier>
</Filter>
<Filter Include="Engine\ECS_Base\System">
<UniqueIdentifier>{B3E3FAFD-9FDD-2350-884A-BA6074E389BC}</UniqueIdentifier>
</Filter>
<Filter Include="Filesystem"> <Filter Include="Filesystem">
<UniqueIdentifier>{8A8E2B37-7646-6D84-DF4D-46E0CB240875}</UniqueIdentifier> <UniqueIdentifier>{8A8E2B37-7646-6D84-DF4D-46E0CB240875}</UniqueIdentifier>
</Filter> </Filter>
@ -117,44 +117,44 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\Engine\ECS_Base\Components\SHComponent.h"> <ClInclude Include="src\ECS_Base\Components\SHComponent.h">
<Filter>Engine\ECS_Base\Components</Filter> <Filter>ECS_Base\Components</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Engine\ECS_Base\Components\SHComponentGroup.h"> <ClInclude Include="src\ECS_Base\Components\SHComponentGroup.h">
<Filter>Engine\ECS_Base\Components</Filter> <Filter>ECS_Base\Components</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Engine\ECS_Base\Entity\SHEntity.h"> <ClInclude Include="src\ECS_Base\Entity\SHEntity.h">
<Filter>Engine\ECS_Base\Entity</Filter> <Filter>ECS_Base\Entity</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Engine\ECS_Base\General\SHFamily.h"> <ClInclude Include="src\ECS_Base\General\SHFamily.h">
<Filter>Engine\ECS_Base\General</Filter> <Filter>ECS_Base\General</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Engine\ECS_Base\General\SHHandleGenerator.h"> <ClInclude Include="src\ECS_Base\General\SHHandleGenerator.h">
<Filter>Engine\ECS_Base\General</Filter> <Filter>ECS_Base\General</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Engine\ECS_Base\General\SHSparseBase.h"> <ClInclude Include="src\ECS_Base\General\SHSparseBase.h">
<Filter>Engine\ECS_Base\General</Filter> <Filter>ECS_Base\General</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Engine\ECS_Base\General\SHSparseSet.h"> <ClInclude Include="src\ECS_Base\General\SHSparseSet.h">
<Filter>Engine\ECS_Base\General</Filter> <Filter>ECS_Base\General</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Engine\ECS_Base\General\SHSparseSetContainer.h"> <ClInclude Include="src\ECS_Base\General\SHSparseSetContainer.h">
<Filter>Engine\ECS_Base\General</Filter> <Filter>ECS_Base\General</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Engine\ECS_Base\SHECSMacros.h"> <ClInclude Include="src\ECS_Base\SHECSMacros.h">
<Filter>Engine\ECS_Base</Filter> <Filter>ECS_Base</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Engine\ECS_Base\System\SHComponentManager.h"> <ClInclude Include="src\ECS_Base\System\SHComponentManager.h">
<Filter>Engine\ECS_Base\System</Filter> <Filter>ECS_Base\System</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Engine\ECS_Base\System\SHEntityManager.h"> <ClInclude Include="src\ECS_Base\System\SHEntityManager.h">
<Filter>Engine\ECS_Base\System</Filter> <Filter>ECS_Base\System</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Engine\ECS_Base\System\SHSystem.h"> <ClInclude Include="src\ECS_Base\System\SHSystem.h">
<Filter>Engine\ECS_Base\System</Filter> <Filter>ECS_Base\System</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Engine\ECS_Base\System\SHSystemManager.h"> <ClInclude Include="src\ECS_Base\System\SHSystemManager.h">
<Filter>Engine\ECS_Base\System</Filter> <Filter>ECS_Base\System</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Engine\SHEngine.h"> <ClInclude Include="src\Engine\SHEngine.h">
<Filter>Engine</Filter> <Filter>Engine</Filter>
@ -364,6 +364,9 @@
<ClInclude Include="src\Scene\SHScene.h"> <ClInclude Include="src\Scene\SHScene.h">
<Filter>Scene</Filter> <Filter>Scene</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Scene\SHSceneGraph.h">
<Filter>Scene</Filter>
</ClInclude>
<ClInclude Include="src\Scene\SHSceneManager.h"> <ClInclude Include="src\Scene\SHSceneManager.h">
<Filter>Scene</Filter> <Filter>Scene</Filter>
</ClInclude> </ClInclude>
@ -376,39 +379,28 @@
<ClInclude Include="src\Tools\SHLogger.h"> <ClInclude Include="src\Tools\SHLogger.h">
<Filter>Tools</Filter> <Filter>Tools</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\Tools\SHUtilities.h" />
<ClInclude Include="src\Tools\SHUtilities.hpp" />
<ClInclude Include="src\Math\SHMath.h" />
<ClInclude Include="src\Math\SHMathHelpers.h" />
<ClInclude Include="src\Math\SHMathHelpers.hpp" />
<ClInclude Include="src\Math\SHMatrix.h" />
<ClInclude Include="src\Math\SHQuaternion.h" />
<ClInclude Include="src\Math\Vector\SHVec2.h" />
<ClInclude Include="src\Math\Vector\SHVec3.h" />
<ClInclude Include="src\Math\Vector\SHVec4.h" />
<ClInclude Include="src\Scene\SHSceneGraph.h" />
<ClInclude Include="src\Tools\SHUtilities.h"> <ClInclude Include="src\Tools\SHUtilities.h">
<Filter>Tools</Filter> <Filter>Tools</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\Engine\ECS_Base\Components\SHComponent.cpp"> <ClCompile Include="src\ECS_Base\Components\SHComponent.cpp">
<Filter>Engine\ECS_Base\Components</Filter> <Filter>ECS_Base\Components</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Engine\ECS_Base\Components\SHComponentGroup.cpp"> <ClCompile Include="src\ECS_Base\Components\SHComponentGroup.cpp">
<Filter>Engine\ECS_Base\Components</Filter> <Filter>ECS_Base\Components</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Engine\ECS_Base\Entity\SHEntity.cpp"> <ClCompile Include="src\ECS_Base\Entity\SHEntity.cpp">
<Filter>Engine\ECS_Base\Entity</Filter> <Filter>ECS_Base\Entity</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Engine\ECS_Base\System\SHComponentManager.cpp"> <ClCompile Include="src\ECS_Base\System\SHComponentManager.cpp">
<Filter>Engine\ECS_Base\System</Filter> <Filter>ECS_Base\System</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Engine\ECS_Base\System\SHEntityManager.cpp"> <ClCompile Include="src\ECS_Base\System\SHEntityManager.cpp">
<Filter>Engine\ECS_Base\System</Filter> <Filter>ECS_Base\System</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Engine\ECS_Base\System\SHSystemManager.cpp"> <ClCompile Include="src\ECS_Base\System\SHSystemManager.cpp">
<Filter>Engine\ECS_Base\System</Filter> <Filter>ECS_Base\System</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Engine\SHEngine.cpp"> <ClCompile Include="src\Engine\SHEngine.cpp">
<Filter>Engine</Filter> <Filter>Engine</Filter>
@ -576,6 +568,9 @@
<Filter>Resource</Filter> <Filter>Resource</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\SHpch.cpp" /> <ClCompile Include="src\SHpch.cpp" />
<ClCompile Include="src\Scene\SHSceneGraph.cpp">
<Filter>Scene</Filter>
</ClCompile>
<ClCompile Include="src\Scene\SHSceneManager.cpp"> <ClCompile Include="src\Scene\SHSceneManager.cpp">
<Filter>Scene</Filter> <Filter>Scene</Filter>
</ClCompile> </ClCompile>
@ -588,12 +583,5 @@
<ClCompile Include="src\Tools\SHLogger.cpp"> <ClCompile Include="src\Tools\SHLogger.cpp">
<Filter>Tools</Filter> <Filter>Tools</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Math\SHMathHelpers.cpp" />
<ClCompile Include="src\Math\SHMatrix.cpp" />
<ClCompile Include="src\Math\SHQuaternion.cpp" />
<ClCompile Include="src\Math\Vector\SHVec2.cpp" />
<ClCompile Include="src\Math\Vector\SHVec3.cpp" />
<ClCompile Include="src\Math\Vector\SHVec4.cpp" />
<ClCompile Include="src\Scene\SHSceneGraph.cpp" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -14,7 +14,7 @@
#include "SHSceneGraph.h" #include "SHSceneGraph.h"
// Project Headers // Project Headers
#include "Engine/ECS_Base/System/SHEntityManager.h" #include "ECS_Base/System/SHEntityManager.h"
#include "Tools/SHLogger.h" #include "Tools/SHLogger.h"
#include "Tools/SHException.h" #include "Tools/SHException.h"

View File

@ -13,7 +13,7 @@
#include <vector> #include <vector>
// Project Headers // Project Headers
#include "Engine/ECS_Base/Entity/SHEntity.h" #include "ECS_Base/Entity/SHEntity.h"
namespace SHADE namespace SHADE
{ {

View File

@ -10,11 +10,11 @@
*********************************************************************/ *********************************************************************/
#include "SHpch.h" #include "SHpch.h"
#include "SHSceneManager.h" #include "SHSceneManager.h"
#include "Engine/ECS_Base/System/SHComponentManager.h" #include "ECS_Base/System/SHComponentManager.h"
//#include "Input/SHInputManager.h" //#include "Input/SHInputManager.h"
//#include "Engine/Rendering/Window/SHRenderingWindow.h" //#include "Rendering/Window/SHRenderingWindow.h"
#include "Engine/ECS_Base/System/SHEntityManager.h" #include "ECS_Base/System/SHEntityManager.h"
#include "Engine/ECS_Base/System/SHSystemManager.h" #include "ECS_Base/System/SHSystemManager.h"
//#include "FRC/SHFrameRateController.h" //#include "FRC/SHFrameRateController.h"
//#include "ECS_Base/System/SHApplication.h" //#include "ECS_Base/System/SHApplication.h"

View File

@ -13,7 +13,7 @@
#define SH_SCENE_MANAGER_H #define SH_SCENE_MANAGER_H
#include "Engine/ECS_Base/General/SHFamily.h" #include "ECS_Base/General/SHFamily.h"
#include "SHScene.h" #include "SHScene.h"
#include <functional> #include <functional>