Merge pull request #68 from SHADE-DP/SP3-5-ECS

Sp3 5 ecs
Fixed SHFamilyID for SHSystem and SHComponent. It is still bugged for SHScene. For now we cant change SHScene.

Added ComponentAdded and ComponentRemoved events. (untested).

SHADE_Application/src/Application/SBApplication.cpp

@@ -32,6 +32,8 @@
 
 #include "Assets/SHAssetManager.h"
 
+#include "Tools/SHLogger.h"
+
 using namespace SHADE;
 
 namespace Sandbox
@@ -85,6 +87,11 @@ namespace Sandbox
     SHADE::SHAssetManager::LoadDataTemp("../../Assets/RaccoonBag_Color_Ver4.dds");
     SHADE::SHAssetManager::LoadDataTemp("../../Assets/RaccoonPreTexturedVer1_Base9.dds");
     SHADE::SHAssetManager::LoadDataTemp("../../Assets/TD_Checker_Base_Color.dds");
+
+
+    auto id = SHFamilyID<SHSystem>::GetID<SHGraphicsSystem>();
+    auto id2 = SHFamilyID<SHSystem>::GetID<SHGraphicsSystem>();
+    auto id3 = SHFamilyID<SHSystem>::GetID<SHGraphicsSystem>();
     //TODO: REMOVE AFTER PRESENTATION
     
     //SHADE::SHSystemManager::RegisterRoutine<SHADE::SHAudioSystem, SHADE::SHAudioSystem::AudioRoutine>();
@@ -100,7 +107,9 @@ namespace Sandbox
 	#else
 	#endif
 
+
     SHSceneManager::InitSceneManager<SBTestScene>("TestScene");
+    
     SHFrameRateController::UpdateFRC();
   }
 

SHADE_Engine/src/ECS_Base/Components/SHComponent.h

@@ -14,6 +14,7 @@
 #include "SHpch.h"
 #include "../SHECSMacros.h"
 #include "SH_API.h"
+#include "ECS_Base/General/SHFamily.h"
 
 namespace SHADE
 {
@@ -117,4 +118,7 @@ namespace SHADE
 
 
 	};
+
+
+	template class SH_API SHFamilyID<SHComponent>;
 }

SHADE_Engine/src/ECS_Base/Events/SHComponentAddedEvent.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include "ECS_Base/Components/SHComponent.h"
+
+namespace SHADE
+{
+	struct SHComponentAddedEvent
+	{
+		EntityID eid;
+		ComponentTypeID addedComponentType;
+	};
+}

SHADE_Engine/src/ECS_Base/Events/SHComponentRemovedEvent.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include "ECS_Base/Components/SHComponent.h"
+
+namespace SHADE
+{
+	struct SHComponentRemovedEvent
+	{
+		EntityID eid;
+		ComponentTypeID removedComponentType;
+	};
+}

SHADE_Engine/src/ECS_Base/General/SHFamily.cpp

@@ -0,0 +1,14 @@
+#pragma once
+#include "SHFamily.h"
+#include "SHpch.h"
+
+namespace SHADE
+{
+	//initialize currentID as 0
+
+
+
+
+
+
+}

SHADE_Engine/src/ECS_Base/General/SHFamily.h

@@ -14,16 +14,17 @@
 #pragma once
 
 #include "../SHECSMacros.h"
+#include "SH_API.h"
 
 
 namespace SHADE
 {
+
 	template<typename BaseClass>
-	class SHFamilyID
+	class SH_API SHFamilyID
 	{
 	private:
-		//this is used to keep track of the new current ID to be assign to a new Derived class type.
+		
-		static ComponentTypeID currentID;
 
 		/*!*************************************************************************
 		 * \brief Construct a new SHFamilyID object
@@ -46,6 +47,9 @@ namespace SHADE
 		}
 	public:
 
+		//this is used to keep track of the new current ID to be assign to a new Derived class type.
+		static inline ComponentTypeID currentID = 0;
+
 		/*!*************************************************************************
 		 * \brief
 		 * Checks if this identifier is cuurrently in use / valid.
@@ -59,7 +63,6 @@ namespace SHADE
 		{
 			return(id < currentID);
 		}
-
 		/*!*************************************************************************
 		 * \brief
 		 * Get the ID of a derived class type.
@@ -68,16 +71,27 @@ namespace SHADE
 		 * @tparam DerivedClass
 		 * The derived class type that we are trying to get the ID of.
 		***************************************************************************/
+#ifdef SH_API_EXPORT
 		template<typename DerivedClass>
-		static ENABLE_IF_DERIVED(ComponentTypeID, BaseClass, DerivedClass) GetID() noexcept
+		static SH_API ENABLE_IF_DERIVED(ComponentTypeID, BaseClass, DerivedClass) GetID() noexcept
 		{
 			//The first time a new derived class type call this get id, it will initialize id using the currentID from familyID class.
-			static ComponentTypeID id = currentID++;
+			static ComponentTypeID id = SHFamilyID<BaseClass>::currentID++;
 			return id;
+			//return 0;
 		}
+#else
+		template<typename DerivedClass>
+		static SH_API ENABLE_IF_DERIVED(ComponentTypeID, BaseClass, DerivedClass) GetID() noexcept;
+#endif // SH_API_EXPORT
+
+
+
+
+		
 	};
-	//initialize currentID as 0
+
-	template<typename BaseClass>
+
-	ComponentTypeID SHFamilyID<BaseClass>::currentID = 0;
+
 
 }

SHADE_Engine/src/ECS_Base/Managers/SHComponentManager.h

@@ -17,6 +17,8 @@
 #include "../General/SHSparseSetContainer.h"
 #include "../Components/SHComponent.h"
 #include "../Components/SHComponentGroup.h"
+#include "../Events/SHComponentAddedEvent.h"
+#include "../Events/SHComponentRemovedEvent.h"
 //#include "Scene/SHSceneNode.h"
 #include "SH_API.h"
 
@@ -216,6 +218,11 @@ namespace SHADE
 				comp->OnCreate();
 			}
 
+			SHComponentAddedEvent eventData;
+			eventData.eid = entityID;
+			eventData.addedComponentType = ComponentFamily::GetID<T>();
+
+			SHEventManager::BroadcastEvent<SHComponentAddedEvent>(eventData, SH_COMPONENT_ADDED_EVENT);
 		}
 
 		/**************************************************************************
@@ -247,6 +254,13 @@ namespace SHADE
 			{
 				comp->OnCreate();
 			}
+
+			SHComponentAddedEvent eventData;
+			eventData.eid = entityID;
+			eventData.addedComponentType = componentTypeID;
+
+			SHEventManager::BroadcastEvent<SHComponentAddedEvent>(eventData, SH_COMPONENT_ADDED_EVENT);
+
 		}
 
 
@@ -313,6 +327,12 @@ namespace SHADE
 
 			
 			componentSet.GetSparseSet<T>()->Remove(EntityHandleGenerator::GetIndex(entityID));
+
+			SHComponentRemovedEvent eventData;
+			eventData.eid = entityID;
+			eventData.addedComponentType = ComponentFamily::GetID<T>();
+
+			SHEventManager::BroadcastEvent<SHComponentRemovedEvent>(eventData, SH_COMPONENT_REMOVED_EVENT);
 		}
 
 		/*!*************************************************************************
@@ -464,11 +484,6 @@ namespace SHADE
 			return componentGroups[index];
 		}
 
-		static void AddScriptComponent(EntityID eid, std::string const& scriptClassName) noexcept;
-
-		static void RemoveScriptComponent(EntityID eid, std::string const& scriptClassName) noexcept;
-
-
 	};// end SHComponentManager
 
 

SHADE_Engine/src/ECS_Base/Managers/SHSystemManager.h

@@ -68,6 +68,9 @@ namespace SHADE
 				id = ((SystemID)version << sizeof(SystemVersionID) * CHAR_BIT) + typeID;
 			}
 			systemContainer.emplace(id, std::make_unique<T>());
+
+			auto size = systemContainer.size();
+
 			systemContainer[id].get()->systemID = id;
 
 			return id;

SHADE_Engine/src/ECS_Base/SHECSMacros.h

@@ -26,4 +26,6 @@ const EntityIndex MAX_EID = 51000;
 #define ENABLE_IF_UINT(_TYPE, _RETURN)\
 	typename std::enable_if<(std::is_integral<_TYPE>::value && !std::is_signed<_TYPE>::value),_RETURN>::type
 
+
+
 #endif

SHADE_Engine/src/ECS_Base/System/SHSystem.h

@@ -12,6 +12,7 @@
 
 #include "../SHECSMacros.h"
 #include "SH_API.h"
+#include "ECS_Base/General/SHFamily.h"
 
 namespace SHADE
 {
@@ -69,5 +70,9 @@ namespace SHADE
 	};
 
 
+	template class SH_API SHFamilyID<SHSystem>;
+	
+	
+
 
 }

SHADE_Engine/src/Editor/SHEditor.cpp

@@ -23,6 +23,8 @@
 #include "SHEditor.hpp"
 #include "SHEditorWidgets.hpp"
 
+#include "Math/Transform/SHTransformSystem.h"
+
 //#==============================================================#
 //||                   Editor Window Includes                   ||
 //#==============================================================#
@@ -87,6 +89,11 @@ namespace SHADE
     io.ConfigFlags |= ImGuiConfigFlags_DockingEnable; //Enable docking
 
     InitFonts();
+
+
+    auto id = SHFamilyID<SHSystem>::GetID<SHGraphicsSystem>();
+    auto id2 = SHFamilyID<SHSystem>::GetID<SHTransformSystem>();
+    auto id3 = SHFamilyID<SHSystem>::GetID<SHGraphicsSystem>();
     InitBackend(sdlWindow);
 
     SetStyle(Style::SHADE);
@@ -104,7 +111,6 @@ namespace SHADE
   {
     (void)dt;
     NewFrame();
-
     for (const auto& window : editorWindows | std::views::values)
     {
       if(window->isOpen)

SHADE_Engine/src/Events/SHEventDefines.h

@@ -8,3 +8,5 @@ typedef uint32_t SHEventHandle;
 constexpr SHEventIdentifier SH_EXAMPLE_EVENT{0};
 constexpr SHEventIdentifier SH_ENTITY_DESTROYED_EVENT{ 1 };
 constexpr SHEventIdentifier SH_ENTITY_CREATION_EVENT{ 2 };
+constexpr SHEventIdentifier	SH_COMPONENT_ADDED_EVENT{ 3 };
+constexpr SHEventIdentifier SH_COMPONENT_REMOVED_EVENT{ 4 };

SHADE_Engine/src/Scene/SHScene.h

@@ -13,6 +13,7 @@
 
 #include <string>
 #include "SHSceneGraph.h"
+#include "ECS_Base/General/SHFamily.h"
 
 namespace SHADE
 {
@@ -42,6 +43,7 @@ namespace SHADE
 		virtual void Unload() = 0;
 	};
 
+	template class SH_API SHFamilyID<SHScene>;
 
 }
 

SHADE_Engine/src/Scene/SHSceneManager.h

@@ -84,7 +84,8 @@ namespace SHADE
 		{
 			//prevSceneCreate = newScene;
 			newScene = [sceneName]() { currentScene = new T(); currentScene->sceneName = sceneName; };
-			nextSceneID = SHFamilyID<SHScene>::template GetID<T>();
+			//nextSceneID = SHFamilyID<SHScene>::GetID<T>();
+			nextSceneID = 0;
 			
 			sceneChanged = true;
 		}
@@ -101,13 +102,13 @@ namespace SHADE
 		static std::enable_if_t<std::is_base_of_v<SHScene, T>, void> ChangeScene(std::string const& sceneName) noexcept
 		{
 			//check if this new Scene is current Scene (Use RestartScene instead)
-			if (currentSceneID == SHFamilyID<SHScene>::template GetID<T>())
+			if (currentSceneID == SHFamilyID<SHScene>::GetID<T>())
 			{
 				return;
 			}
 			//prevSceneCreate = newScene;
 			newScene = [sceneName]() { currentScene = new T(); currentScene->sceneName; };
-			nextSceneID = SHFamilyID<SHScene>::template GetID<T>();
+			nextSceneID = SHFamilyID<SHScene>::GetID<T>();
 			sceneChanged = true;
 		}