Added groups

deni2312 · Feb 6, 2025 · 0170d21 · 0170d21
1 parent 97fa17c
commit 0170d21
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/Engine/Shaders/HelperHeaderPipeline/light_func.glsl b/Engine/Shaders/HelperHeaderPipeline/light_func.glsl
@@ -23,7 +23,8 @@ struct AreaData
     vec4 position[4];
     vec4 diffuse;
     sampler2D depthMap;
-    vec2 padding;
+    int doubleSide;
+    float padding;
 };
 
 

diff --git a/Engine/Shaders/PbrHeaderPipeline/pbr_calculation.glsl b/Engine/Shaders/PbrHeaderPipeline/pbr_calculation.glsl
@@ -72,8 +72,9 @@ vec3 pbrCalculation(vec3 FragPos, vec3 N, vec3 albedo, vec4 aoSpecular,float rou
         position[3]=vec3(areaData[i].position[3]);
 
         vec3 mSpecular = ToLinear(vec3(areaData[i].diffuse)); // mDiffuse
-		vec3 diffuse = LTC_Evaluate(N, V, FragPos, mat3(1), position, true);
-		vec3 specular = LTC_Evaluate(N, V, FragPos, Minv, position, true);
+        bool doubleSide=areaData[i].doubleSide>0;
+		vec3 diffuse = LTC_Evaluate(N, V, FragPos, mat3(1), position, doubleSide);
+		vec3 specular = LTC_Evaluate(N, V, FragPos, Minv, position, doubleSide);
 
 		// GGX BRDF shadowing and Fresnel
 		// t2.x: shadowedF90 (F90 normally it should be 1.0)

diff --git a/Engine/include/SceneObjects/Light.h b/Engine/include/SceneObjects/Light.h
@@ -43,7 +43,8 @@ namespace Prisma
 			};
 			glm::vec4 diffuse = glm::vec4(1, 1, 1, 0);
 			uint64_t shadowMap = 0;
-			glm::vec2 padding;
+			int doubleSide = 1;
+			float padding;
 		};
 	};
 

diff --git a/Engine/src/Handlers/LightHandler.cpp b/Engine/src/Handlers/LightHandler.cpp
@@ -93,10 +93,9 @@ void Prisma::LightHandler::updateArea()
 			{
 				areaMatrix = light->matrix();
 			}
-			m_dataArea->lights[i].position[0] = areaMatrix * m_dataArea->lights[i].position[0];
-			m_dataArea->lights[i].position[1] = areaMatrix * m_dataArea->lights[i].position[1];
-			m_dataArea->lights[i].position[2] = areaMatrix * m_dataArea->lights[i].position[2];
-			m_dataArea->lights[i].position[3] = areaMatrix * m_dataArea->lights[i].position[3];
+			for (int j = 0; j < 4; j++) {
+				m_dataArea->lights[i].position[j] = areaMatrix * m_dataArea->lights[i].position[j];
+			}
 
 			numVisible++;
 		}

diff --git a/GUI/src/LightInfo.cpp b/GUI/src/LightInfo.cpp
@@ -126,12 +126,16 @@ void Prisma::LightInfo::showSelectedArea(Light<LightType::LightArea>* lightData,
 	nextRight(meshData.initOffset);
 	ImGui::Begin(lightData->name().c_str(), nullptr,
 		ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse);
-
 	if (ImGui::InputFloat3("Diffuse ", value_ptr(type.diffuse)))
 	{
 		lightData->type(type);
 	}
-
+	bool doubleSide = type.doubleSide;
+	if (ImGui::Checkbox("Double side", &doubleSide)) 
+	{
+		type.doubleSide = doubleSide;
+		lightData->type(type);
+	}
 
 	ImGui::End();
 }