Added groups

denis-beqiraj · denis-beqiraj · commit eff36b0ee79d · 2025-02-04T16:07:08.000+01:00
diff --git a/Engine/Shaders/HelperHeaderPipeline/light_func.glsl b/Engine/Shaders/HelperHeaderPipeline/light_func.glsl
@@ -18,6 +18,13 @@ struct OmniData {
     float radius;
 };
 
+struct AreaData
+{
+    vec4 position;
+    vec4 diffuse;
+    vec4 padding;
+};
+
 
 layout(std430, binding = 2) buffer Directional
 {
@@ -32,6 +39,12 @@ layout(std430, binding = 3) buffer Omni
     OmniData omniData[];
 };
 
+layout(std430, binding = 18) buffer Area
+{
+    ivec4 lenArea;
+    AreaData areaData[];
+};
+
 struct Cluster
 {
     vec4 minPoint;
diff --git a/Engine/Shaders/PbrHeaderPipeline/pbr_calculation.glsl b/Engine/Shaders/PbrHeaderPipeline/pbr_calculation.glsl
@@ -45,6 +45,11 @@ vec3 pbrCalculation(vec3 FragPos, vec3 N, vec3 albedo, vec4 aoSpecular,float rou
         }
     }
 
+
+    for (int i = 0; i < lenArea.r; i++) {
+
+    }
+
     // Locating which cluster this fragment is part of
     uint zTile = uint((log(abs(vec3(view * vec4(FragPos, 1.0)).z) / zNear) * gridSize.z) / log(zFar / zNear));
     vec2 tileSize = screenDimensions.xy / gridSize.xy;
diff --git a/Engine/include/GlobalData/Defines.h b/Engine/include/GlobalData/Defines.h
@@ -4,6 +4,7 @@
 
 constexpr int MAX_DIR_LIGHTS = 1024;
 constexpr int MAX_OMNI_LIGHTS = 1024;
+constexpr int MAX_AREA_LIGHTS = 1024;
 constexpr int MAX_CLUSTER_SIZE = 100;
 constexpr int MAX_BONE_INFLUENCE = 4;
 constexpr int MAX_BONES = 128;
diff --git a/Engine/include/Handlers/LightHandler.h b/Engine/include/Handlers/LightHandler.h
@@ -22,15 +22,25 @@ namespace Prisma
 			std::vector<LightType::LightOmni> lights;
 		};
 
+		struct SSBODataArea
+		{
+			glm::ivec4 size;
+			std::vector<LightType::LightArea> lights;
+		};
+
 		std::shared_ptr<SSBODataDirectional> m_dataDirectional;
 		std::shared_ptr<SSBODataOmni> m_dataOmni;
+		std::shared_ptr<SSBODataArea> m_dataArea;
 
 		std::shared_ptr<SSBO> m_omniLights;
 		std::shared_ptr<SSBO> m_dirLights;
 		std::shared_ptr<SSBO> m_dirCSM;
+		std::shared_ptr<SSBO> m_areaLights;
 
 		void updateDirectional();
 
+		void updateArea();
+
 		void updateOmni();
 
 		void updateCSM();
@@ -50,6 +60,8 @@ namespace Prisma
 		std::shared_ptr<SSBO> ssboDirectional() const;
 		std::shared_ptr<SSBODataOmni> dataOmni() const;
 		std::shared_ptr<SSBO> ssboOmni() const;
+		std::shared_ptr<SSBODataArea> dataArea() const;
+		std::shared_ptr<SSBO> ssboArea() const;
 
 		std::shared_ptr<ClusterCalculation> m_clusterCalculation;
 
diff --git a/Engine/include/SceneData/SceneData.h b/Engine/include/SceneData/SceneData.h
@@ -18,6 +18,7 @@ namespace Prisma
 	{
 		struct LightDir;
 		struct LightOmni;
+		struct LightArea;
 	}
 
 	struct SceneHandler
@@ -49,6 +50,7 @@ namespace Prisma
 		std::vector<std::shared_ptr<AnimatedMesh>> animateMeshes;
 		std::vector<std::shared_ptr<Light<LightType::LightDir>>> dirLights;
 		std::vector<std::shared_ptr<Light<LightType::LightOmni>>> omniLights;
+		std::vector<std::shared_ptr<Light<LightType::LightArea>>> areaLights;
 		std::vector<std::shared_ptr<Sprite>> sprites;
 		std::string name;
 	};
diff --git a/Engine/include/SceneObjects/Light.h b/Engine/include/SceneObjects/Light.h
@@ -32,6 +32,14 @@ namespace Prisma
 			float padding = 0;
 			float radius = 1;
 		};
+
+		struct LightArea
+		{
+			glm::vec4 position = glm::vec4(0, 0, 0, 1);
+			glm::vec4 diffuse = glm::vec4(1, 1, 1, 0);
+			uint64_t shadowMap = 0;
+			glm::vec2 padding;
+		};
 	};
 
 	template <typename T>
diff --git a/Engine/src/Handlers/LightHandler.cpp b/Engine/src/Handlers/LightHandler.cpp
@@ -16,6 +16,9 @@ Prisma::LightHandler::LightHandler()
 	m_dirCSM = std::make_shared<SSBO>(9);
 	m_dirCSM->resize(16 * sizeof(float) + sizeof(glm::vec4));
 
+	m_areaLights = std::make_shared<SSBO>(18);
+	m_areaLights->resize(MAX_AREA_LIGHTS * sizeof(LightType::LightArea) + sizeof(glm::vec4));
+
 	glm::vec3 size = ClusterCalculation::grids();
 
 	m_clusterCalculation = std::make_shared<ClusterCalculation>(size.x * size.y * size.z);
@@ -69,6 +72,41 @@ void Prisma::LightHandler::updateDirectional()
 	                        m_dataDirectional->lights.data());
 }
 
+void Prisma::LightHandler::updateArea()
+{
+	const auto& scene = Prisma::GlobalData::getInstance().currentGlobalScene();
+
+	m_dataArea = std::make_shared<SSBODataArea>();
+	int numVisible = 0;
+	for (int i = 0; i < scene->areaLights.size(); i++)
+	{
+		const auto& light = scene->areaLights[i];
+		if (light->visible())
+		{
+			m_dataArea->lights.push_back(light->type());
+			glm::mat4 areaMatrix;
+			if (light->parent())
+			{
+				areaMatrix = light->parent()->finalMatrix();
+			}
+			else
+			{
+				areaMatrix = light->matrix();
+			}
+			m_dataArea->lights[i].position = areaMatrix * m_dataArea->lights[i].position;
+			numVisible++;
+		}
+	}
+
+	glm::ivec4 areaLength;
+	areaLength.r = numVisible;
+	m_areaLights->modifyData(0, sizeof(glm::vec4),
+		value_ptr(areaLength));
+
+	m_areaLights->modifyData(sizeof(glm::vec4), numVisible * sizeof(LightType::LightArea),
+		m_dataArea->lights.data());
+}
+
 void Prisma::LightHandler::updateOmni()
 {
 	const auto& scene = Prisma::GlobalData::getInstance().currentGlobalScene();
@@ -147,10 +185,11 @@ void Prisma::LightHandler::update()
 	if (m_init || CacheScene::getInstance().updateData() || CacheScene::getInstance().updateSizes() ||
 		CacheScene::getInstance().updateLights() || CacheScene::getInstance().updateStatus())
 	{
-		if (scene->dirLights.size() < MAX_DIR_LIGHTS && scene->omniLights.size() < MAX_OMNI_LIGHTS)
+		if (scene->dirLights.size() < MAX_DIR_LIGHTS && scene->omniLights.size() < MAX_OMNI_LIGHTS && scene->areaLights.size() < MAX_AREA_LIGHTS)
 		{
 			updateDirectional();
 			updateOmni();
+			updateArea();
 		}
 		else
 		{
@@ -188,3 +227,13 @@ std::shared_ptr<Prisma::SSBO> Prisma::LightHandler::ssboOmni() const
 {
 	return m_omniLights;
 }
+
+std::shared_ptr<Prisma::LightHandler::SSBODataArea> Prisma::LightHandler::dataArea() const
+{
+	return m_dataArea;
+}
+
+std::shared_ptr<Prisma::SSBO> Prisma::LightHandler::ssboArea() const
+{
+	return m_areaLights;
+}
diff --git a/Engine/src/SceneObjects/Node.cpp b/Engine/src/SceneObjects/Node.cpp
@@ -85,6 +85,11 @@ void Prisma::Node::removeChild(uint64_t uuid, bool removeRecursive)
 			Prisma::VectorHelper::getInstance().remove<Sprite>(
 				Prisma::GlobalData::getInstance().currentGlobalScene()->sprites, uuid);
 		}
+		else if (std::dynamic_pointer_cast<Light<LightType::LightArea>>(m_children[index]))
+		{
+			Prisma::VectorHelper::getInstance().remove<Light<LightType::LightArea>>(
+				Prisma::GlobalData::getInstance().currentGlobalScene()->areaLights, uuid);
+		}
 
 		auto components = m_children[index]->components();
 		for (const auto& component : components)
@@ -240,6 +245,17 @@ void Prisma::Node::dispatch(std::shared_ptr<Node> child)
 		}
 	}
 
+	if (std::dynamic_pointer_cast<Light<LightType::LightArea>>(child))
+	{
+		if (nodeHelper.findUUID<Light<LightType::LightArea>>(
+			Prisma::GlobalData::getInstance().currentGlobalScene()->areaLights, child->uuid()) < 0)
+		{
+			Prisma::GlobalData::getInstance().currentGlobalScene()->areaLights.push_back(
+				std::dynamic_pointer_cast<Light<LightType::LightArea>>(child));
+			CacheScene::getInstance().updateLights(true);
+		}
+	}
+
 	if (Prisma::GlobalData::getInstance().currentGlobalScene()->animateMeshes.size() < MAX_ANIMATION_MESHES)
 	{
 		if (std::dynamic_pointer_cast<AnimatedMesh>(child))
diff --git a/GUI/include/NodeCreator.h b/GUI/include/NodeCreator.h
@@ -18,6 +18,8 @@ namespace Prisma
 
 		static std::shared_ptr<Prisma::Node> createDirectional();
 
+		static std::shared_ptr<Prisma::Node> createArea();
+
 	private:
 		static std::shared_ptr<Node> createMesh(std::shared_ptr<Prisma::Mesh::VerticesData> verticesData,
 		                                        const std::string& name);
diff --git a/GUI/src/AddingMenu.cpp b/GUI/src/AddingMenu.cpp
@@ -26,6 +26,10 @@ void Prisma::ImGuiAddingMenu::addMenu(Prisma::ImGuiCamera& camera) const
 		{
 			Prisma::NodeCreator::createDirectional();
 		}
+		if (ImGui::MenuItem("Add Area"))
+		{
+			Prisma::NodeCreator::createArea();
+		}
 		ImGui::EndPopup();
 	}
 }
diff --git a/GUI/src/NodeCreator.cpp b/GUI/src/NodeCreator.cpp
@@ -199,6 +199,17 @@ std::shared_ptr<Prisma::Node> Prisma::NodeCreator::createDirectional()
 	return light;
 }
 
+std::shared_ptr<Prisma::Node> Prisma::NodeCreator::createArea()
+{
+	auto parent = std::make_shared<Prisma::Node>();
+	parent->name("ParentArea_" + std::to_string(parent->uuid()));
+	auto light = std::make_shared<Light<LightType::LightArea>>();
+	light->name("Area" + std::to_string(light->uuid()));
+	parent->addChild(light);
+	Prisma::GlobalData::getInstance().currentGlobalScene()->root->addChild(parent);
+	return light;
+}
+
 std::shared_ptr<Prisma::Node> Prisma::NodeCreator::createMesh(std::shared_ptr<Prisma::Mesh::VerticesData> verticesData,
                                                               const std::string& name)
 {

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,11 @@ vec3 pbrCalculation(vec3 FragPos, vec3 N, vec3 albedo, vec4 aoSpecular,float rou`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
	`48`	`+`
	`49`	`+ for (int i = 0; i < lenArea.r; i++) {`
	`50`	`+`
	`51`	`+ }`
	`52`	`+`
`48`	`53`	`// Locating which cluster this fragment is part of`
`49`	`54`	`uint zTile = uint((log(abs(vec3(view * vec4(FragPos, 1.0)).z) / zNear) * gridSize.z) / log(zFar / zNear));`
`50`	`55`	`vec2 tileSize = screenDimensions.xy / gridSize.xy;`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ namespace Prisma`
`18`	`18`	`{`
`19`	`19`	`struct LightDir;`
`20`	`20`	`struct LightOmni;`
	`21`	`+ struct LightArea;`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`struct SceneHandler`
`@@ -49,6 +50,7 @@ namespace Prisma`
`49`	`50`	`std::vector<std::shared_ptr<AnimatedMesh>> animateMeshes;`
`50`	`51`	`std::vector<std::shared_ptr<Light<LightType::LightDir>>> dirLights;`
`51`	`52`	`std::vector<std::shared_ptr<Light<LightType::LightOmni>>> omniLights;`
	`53`	`+ std::vector<std::shared_ptr<Light<LightType::LightArea>>> areaLights;`
`52`	`54`	`std::vector<std::shared_ptr<Sprite>> sprites;`
`53`	`55`	`std::string name;`
`54`	`56`	`};`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,10 @@ void Prisma::ImGuiAddingMenu::addMenu(Prisma::ImGuiCamera& camera) const`
`26`	`26`	`{`
`27`	`27`	`Prisma::NodeCreator::createDirectional();`
`28`	`28`	`}`
	`29`	`+ if (ImGui::MenuItem("Add Area"))`
	`30`	`+ {`
	`31`	`+ Prisma::NodeCreator::createArea();`
	`32`	`+ }`
`29`	`33`	`ImGui::EndPopup();`
`30`	`34`	`}`
`31`	`35`	`}`