Merge pull request #362 from TheMadDodger/physics-module-base

Add physics module base and inherit it in Jolt module
TheMadDodger · Jun 24, 2024 · 630f20f · 630f20f
2 parents 36c9b25 + d55d2db
commit 630f20f
Show file tree

Hide file tree

Showing 18 changed files with 140 additions and 15 deletions.
diff --git a/GloryEngine/Editor/Extensions/JoltEditorExtension/CharacterControllerEditor.h b/GloryEngine/Editor/Extensions/JoltEditorExtension/CharacterControllerEditor.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "EntityComponentEditor.h"
 #include <Gizmos.h>
-#include <JoltComponents.h>
+#include <PhysicsComponents.h>
 
 namespace Glory::Editor
 {

diff --git a/GloryEngine/Editor/Extensions/JoltEditorExtension/JoltEditorExtension.cpp b/GloryEngine/Editor/Extensions/JoltEditorExtension/JoltEditorExtension.cpp
@@ -11,7 +11,7 @@
 #include <JoltPhysicsModule.h>
 #include <GLORY_YAML.h>
 #include <CreateEntityObjectsCallbacks.h>
-#include <JoltComponents.h>
+#include <PhysicsComponents.h>
 
 #include <PhysicsBodyEditor.h>
 #include <CharacterControllerEditor.h>

diff --git a/GloryEngine/Editor/Extensions/JoltEditorExtension/PhysicsBodyEditor.h b/GloryEngine/Editor/Extensions/JoltEditorExtension/PhysicsBodyEditor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <EntityComponentEditor.h>
-#include <JoltComponents.h>
+#include <PhysicsComponents.h>
 #include <Gizmos.h>
 
 namespace Glory::Editor

diff --git a/GloryEngine/Editor/Extensions/JoltEditorExtension/premake5.lua b/GloryEngine/Editor/Extensions/JoltEditorExtension/premake5.lua
@@ -21,6 +21,7 @@ project "JoltEditorExtension"
 	includedirs
 	{
 		"%{DepsIncludeDir}",
+		"%{BaseIncludeDir.physics}",
 
 		"%{IncludeDir.glm}",
 

diff --git a/...Engine/Modules/GloryJoltPhysics/Physics.h → ...Modules/Base/GloryPhysicsModule/Physics.h b/...Engine/Modules/GloryJoltPhysics/Physics.h → ...Modules/Base/GloryPhysicsModule/Physics.h
diff --git a/...Modules/GloryJoltPhysics/JoltComponents.h → ...se/GloryPhysicsModule/PhysicsComponents.h b/...Modules/GloryJoltPhysics/JoltComponents.h → ...se/GloryPhysicsModule/PhysicsComponents.h
diff --git a/GloryEngine/Modules/Base/GloryPhysicsModule/PhysicsModule.cpp b/GloryEngine/Modules/Base/GloryPhysicsModule/PhysicsModule.cpp
@@ -0,0 +1,28 @@
+#include "PhysicsModule.h"
+#include "PhysicsComponents.h"
+
+#include <GloryECS/EntityRegistry.h>
+#include <GloryECS/EntityView.h>
+
+#include <Engine.h>
+#include <SceneManager.h>
+
+namespace Glory
+{
+    PhysicsModule::PhysicsModule() {}
+    PhysicsModule::~PhysicsModule() {}
+
+    const std::type_info& PhysicsModule::GetBaseModuleType()
+    {
+        return typeid(PhysicsModule);
+    }
+
+    void PhysicsModule::Initialize()
+    {
+        Reflect::SetReflectInstance(&m_pEngine->Reflection());
+        Reflect::RegisterEnum<BodyType>();
+
+        m_pEngine->GetSceneManager()->RegisterComponent<PhysicsBody>();
+        m_pEngine->GetSceneManager()->RegisterComponent<CharacterController>();
+    }
+}
diff --git a/GloryEngine/Modules/Base/GloryPhysicsModule/PhysicsModule.h b/GloryEngine/Modules/Base/GloryPhysicsModule/PhysicsModule.h
@@ -0,0 +1,24 @@
+#pragma once
+#include <Module.h>
+
+#include <functional>
+
+namespace Glory
+{
+	/** @brief Base class for audio backend and mixing modules */
+    class PhysicsModule : public Module
+    {
+	public:
+		/** @brief Constructor */
+		PhysicsModule();
+		/** @brief Destructor */
+		virtual ~PhysicsModule();
+
+		/** @brief PhysicsModule type */
+		const std::type_info& GetBaseModuleType() override;
+
+	protected:
+		virtual void Initialize() override;
+		virtual void Cleanup() = 0;
+    };
+}
diff --git a/GloryEngine/Modules/Base/GloryPhysicsModule/premake5.lua b/GloryEngine/Modules/Base/GloryPhysicsModule/premake5.lua
@@ -0,0 +1,67 @@
+project "GloryPhysicsModule"
+	kind "StaticLib"
+	language "C++"
+	cppdialect "C++17"
+	staticruntime "Off"
+
+	targetdir ("%{moduleBaseOutDir}")
+	objdir ("%{outputDir}")
+
+	files
+	{
+		"**.h",
+		"**.cpp",
+		"premake5.lua",
+	}
+
+	vpaths
+	{
+
+	}
+
+	includedirs
+	{
+		"%{DepsIncludeDir}",
+
+		"%{IncludeDir.glm}",
+		"%{GloryIncludeDir.core}",
+		"%{IncludeDir.Reflect}",
+		"%{IncludeDir.Version}",
+		"%{IncludeDir.Utils}",
+		"%{IncludeDir.ECS}",
+
+		"%{IncludeDir.yaml_cpp}",
+
+		"%{DepIncludesDir}",
+	}
+
+	defines
+	{
+		"GLORY_EXPORTS"
+	}
+
+	filter "system:windows"
+		systemversion "10.0.19041.0"
+		toolset "v143"
+
+		defines
+		{
+			"_LIB"
+		}
+
+	filter "platforms:Win32"
+		architecture "x86"
+		defines "WIN32"
+
+	filter "platforms:x64"
+		architecture "x64"
+
+	filter "configurations:Debug"
+		runtime "Debug"
+		defines "_DEBUG"
+		symbols "On"
+
+	filter "configurations:Release"
+		runtime "Release"
+		defines "NDEBUG"
+		optimize "On"
diff --git a/GloryEngine/Modules/GloryJoltPhysics/CharacterControllerSystem.cpp b/GloryEngine/Modules/GloryJoltPhysics/CharacterControllerSystem.cpp
@@ -1,6 +1,5 @@
 #include "CharacterControllerSystem.h"
 #include "JoltPhysicsModule.h"
-#include "JoltComponents.h"
 #include "JoltCharacterManager.h"
 #include "JoltShapeManager.h"
 #include "JoltPhysicsModule.h"
@@ -9,6 +8,7 @@
 #include <Engine.h>
 #include <GScene.h>
 #include <SceneManager.h>
+#include <PhysicsComponents.h>
 
 #include <Components.h>
 #include <Engine.h>

diff --git a/GloryEngine/Modules/GloryJoltPhysics/JoltCharacterManager.h b/GloryEngine/Modules/GloryJoltPhysics/JoltCharacterManager.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Physics.h"
+#include <Physics.h>
 
 #include <map>
 #include <cstdint>

diff --git a/GloryEngine/Modules/GloryJoltPhysics/JoltPhysicsModule.cpp b/GloryEngine/Modules/GloryJoltPhysics/JoltPhysicsModule.cpp
@@ -1,7 +1,6 @@
 #include "JoltPhysicsModule.h"
 #include "Helpers.h"
 
-#include "JoltComponents.h"
 #include "PhysicsSystem.h"
 #include "CharacterControllerSystem.h"
 
@@ -37,6 +36,7 @@
 #include <Engine.h>
 #include <SceneManager.h>
 #include <BinaryStream.h>
+#include <PhysicsComponents.h>
 
 
 using namespace JPH;
@@ -605,6 +605,8 @@ namespace Glory
 
 	void JoltPhysicsModule::Initialize()
 	{
+		PhysicsModule::Initialize();
+
 		m_ObjectVSBroadPhase.m_pLayers = &m_pEngine->GetLayerManager();
 
 		Reflect::SetReflectInstance(&m_pEngine->Reflection());
@@ -658,12 +660,8 @@ namespace Glory
 		// Instead insert all new objects in batches instead of 1 at a time to keep the broad phase efficient.
 		//m_pJPHPhysicsSystem->OptimizeBroadPhase();
 
-		Reflect::RegisterEnum<BodyType>();
-
 		SceneManager* pScenes = m_pEngine->GetSceneManager();
 		Glory::Utils::ECS::ComponentTypes* pComponentTypes = pScenes->ComponentTypesInstance();
-		pScenes->RegisterComponent<PhysicsBody>();
-		pScenes->RegisterComponent<CharacterController>();
 
 		/* Physics Bodies */
 		pComponentTypes->RegisterInvokaction<PhysicsBody>(Glory::Utils::ECS::InvocationType::Start, PhysicsSystem::OnStart);

diff --git a/GloryEngine/Modules/GloryJoltPhysics/JoltPhysicsModule.h b/GloryEngine/Modules/GloryJoltPhysics/JoltPhysicsModule.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Physics.h"
+#include <Physics.h>
 
-#include <Module.h>
+#include <PhysicsModule.h>
 #include <glm/fwd.hpp>
 
 namespace JPH
@@ -39,7 +39,7 @@ namespace Glory
 	class JoltCharacterManager;
 	class JoltShapeManager;
 
-    class JoltPhysicsModule : public Module
+    class JoltPhysicsModule : public PhysicsModule
     {
 	public:
 		GLORY_API JoltPhysicsModule();

diff --git a/GloryEngine/Modules/GloryJoltPhysics/PhysicsSystem.cpp b/GloryEngine/Modules/GloryJoltPhysics/PhysicsSystem.cpp
@@ -1,7 +1,7 @@
 #include "JoltPhysicsModule.h"
 #include "JoltPhysicsModule.h"
-#include "JoltComponents.h"
 
+#include <PhysicsComponents.h>
 #include <PhysicsSystem.h>
 #include <Engine.h>
 #include <GScene.h>

diff --git a/GloryEngine/Modules/GloryJoltPhysics/premake5.lua b/GloryEngine/Modules/GloryJoltPhysics/premake5.lua
@@ -29,6 +29,7 @@ project "GloryJoltPhysics"
 	{
 		"%{DepsIncludeDir}",
 		"%{IncludeDir.glm}",
+		"%{BaseIncludeDir.physics}",
 
 		"%{GloryIncludeDir.core}",
 
@@ -54,11 +55,14 @@ project "GloryJoltPhysics"
 		"%{LibDirs.glory}",
 
 		"%{LibDirs.yaml_cpp}",
+
+		"{moduleBaseOutDir}",
 	}
 
 	links
 	{
 		"GloryCore",
+		"GloryPhysicsModule",
 		"GloryReflect",
 		"GloryECS",
 

diff --git a/GloryEngine/Scripting/Mono/GloryJoltMonoExtender/PhysicsComponentsCSAPI.cpp b/GloryEngine/Scripting/Mono/GloryJoltMonoExtender/PhysicsComponentsCSAPI.cpp
@@ -1,9 +1,9 @@
 #include "PhysicsComponentsCSAPI.h"
 #include "JoltPhysicsModule.h"
-#include "JoltComponents.h"
 #include "JoltCharacterManager.h"
 #include "JoltShapeManager.h"
 
+#include <PhysicsComponents.h>
 #include <EntityCSAPI.h>
 #include <cstdint>
 #include <UUID.h>

diff --git a/GloryEngine/Scripting/Mono/GloryJoltMonoExtender/premake5.lua b/GloryEngine/Scripting/Mono/GloryJoltMonoExtender/premake5.lua
@@ -23,6 +23,7 @@ project "GloryJoltMonoExtender"
 	includedirs
 	{
 		"%{DepsIncludeDir}",
+		"%{BaseIncludeDir.physics}",
 
 		"%{IncludeDir.glm}",
 		"%{IncludeDir.yaml_cpp}",

diff --git a/GloryEngine/premake5.lua b/GloryEngine/premake5.lua
@@ -62,6 +62,7 @@ GloryIncludeDir["threads"]				= "%{engineDir}/Threads"
 
 BaseIncludeDir = {}
 BaseIncludeDir["audio"]					= "%{modulesDir}/Base/GloryAudioModule"
+BaseIncludeDir["physics"]				= "%{modulesDir}/Base/GloryPhysicsModule"
 
 SubmodoleDirs = {}
 SubmodoleDirs["ImGui"]					= "%{rootDir}/submodules/ImGui"
@@ -138,6 +139,7 @@ group ""
 
 group "Modules/Base"
 	include "Modules/Base/GloryAudioModule"
+	include "Modules/Base/GloryPhysicsModule"
 group ""
 
 group "Editor"