Added groups

deni2312 · Feb 6, 2025 · 76db498 · 76db498
1 parent a4efc82
commit 76db498
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 76 deletions.
diff --git a/Engine/Shaders/DeferredForwardPipeline/fragment.glsl b/Engine/Shaders/DeferredForwardPipeline/fragment.glsl
@@ -24,23 +24,26 @@ void main()
 {
     currentMaterial = materialData[drawId];
 
-    vec4 diffuseTexture = texture(currentMaterial.diffuse, TexCoords)+currentMaterial.materialColor;
-
-    vec3 albedo = diffuseTexture.rgb;
-    if (diffuseTexture.a < 0.1) {
-        discard;
+    if(statusCopy[drawId].plainColor>1){
+        FragColor=currentMaterial.materialColor;
+    }else{
+
+        vec4 diffuseTexture = texture(currentMaterial.diffuse, TexCoords)+currentMaterial.materialColor;
+
+        vec3 albedo = diffuseTexture.rgb;
+        if (diffuseTexture.a < 0.1) {
+            discard;
+        }
+        vec4 roughnessMetalnessTexture = texture(currentMaterial.roughness_metalness, TexCoords);
+        float metallic = roughnessMetalnessTexture.b;
+        float roughness = roughnessMetalnessTexture.g;
+        float specularMap = texture(currentMaterial.specularMap, TexCoords).r;
+        float ao = texture(currentMaterial.ambient_occlusion, TexCoords).r;
+
+        vec4 aoSpecular = vec4(specularMap, ao, 0, 0);
+
+        vec3 N = getNormalFromMap();
+        vec3 pbrColor = pbrCalculation(FragPos, N, albedo, aoSpecular, roughness, metallic);
+        FragColor = vec4(pbrColor, diffuseTexture.a);
     }
-    vec4 roughnessMetalnessTexture = texture(currentMaterial.roughness_metalness, TexCoords);
-    float metallic = roughnessMetalnessTexture.b;
-    float roughness = roughnessMetalnessTexture.g;
-    float specularMap = texture(currentMaterial.specularMap, TexCoords).r;
-    float ao = texture(currentMaterial.ambient_occlusion, TexCoords).r;
-
-    vec4 aoSpecular = vec4(specularMap, ao, 0, 0);
-
-    vec3 N = getNormalFromMap();
-
-    vec3 pbrColor = pbrCalculation(FragPos, N, albedo, aoSpecular, roughness, metallic);
-
-    FragColor = vec4(pbrColor, diffuseTexture.a);
 }
diff --git a/Engine/Shaders/DeferredPipeline/fragment.glsl b/Engine/Shaders/DeferredPipeline/fragment.glsl
@@ -53,6 +53,17 @@ vec3 getNormalFromMap()
     return normalize(TBN * tangentNormal);
 }
 
+struct StatusData{
+    uint status;
+    int plainColor;
+    vec2 padding;
+};
+
+layout(std430, binding = 25) buffer StatusCopy {
+    StatusData statusCopy[];
+};
+
+
 void main()
 {
 #if defined(ANIMATE)
@@ -67,22 +78,26 @@ void main()
     if (albedoTexture.a < 0.1) {
         discard;
     }
-
-    // and the diffuse per-fragment color
-    gAlbedoSpec.rgb = albedoTexture.rgb;
-
-    // store the fragment position vector in the first gbuffer texture
-    gPosition.rgb = FragPos;
-    // also store the per-fragment normals into the gbuffer
-    gNormal.rgb = getNormalFromMap();
-
-    vec4 roughnessMetalnessTexture = texture(currentMaterial.roughness_metalness, TexCoords);
-
-    gAlbedoSpec.a= roughnessMetalnessTexture.b;
-    gNormal.a = roughnessMetalnessTexture.g;
-    gPosition.a=gl_FragCoord.z;
-
-    gAmbient.r = texture(currentMaterial.specularMap, TexCoords).r;
-    gAmbient.g = texture(currentMaterial.ambient_occlusion, TexCoords).r;
-
+    if(statusCopy[drawId].plainColor>1){
+        gAmbient.b= float(statusCopy[drawId].plainColor);
+        gAlbedoSpec.rgb = vec3(currentMaterial.materialColor);
+    }else{
+        // and the diffuse per-fragment color
+        gAlbedoSpec.rgb = albedoTexture.rgb;
+
+        // store the fragment position vector in the first gbuffer texture
+        gPosition.rgb = FragPos;
+        // also store the per-fragment normals into the gbuffer
+        gNormal.rgb = getNormalFromMap();
+
+        vec4 roughnessMetalnessTexture = texture(currentMaterial.roughness_metalness, TexCoords);
+
+        gAlbedoSpec.a= roughnessMetalnessTexture.b;
+        gNormal.a = roughnessMetalnessTexture.g;
+        gPosition.a=gl_FragCoord.z;
+
+        gAmbient.r = texture(currentMaterial.specularMap, TexCoords).r;
+        gAmbient.g = texture(currentMaterial.ambient_occlusion, TexCoords).r;
+        gAmbient.b = 0;
+    }
 }
diff --git a/Engine/Shaders/DeferredPipeline/fragment_d.glsl b/Engine/Shaders/DeferredPipeline/fragment_d.glsl
@@ -25,14 +25,16 @@ layout(std140, binding = 1) uniform MeshData
 void main()
 {             
     // retrieve data from gbuffer
-    vec3 FragPos = texture(gPosition, TexCoords).rgb;
-    vec3 N = texture(gNormal, TexCoords).rgb;
-    vec3 albedo = texture(gAlbedo, TexCoords).rgb;
     vec4 aoSpecular = texture(gAmbient, TexCoords);
-    float roughness = texture(gNormal, TexCoords).a;
-    float metallic = texture(gAlbedo, TexCoords).a;
-
-    vec3 pbrColor = pbrCalculation(FragPos, N, albedo, aoSpecular,roughness,metallic);
-
-    FragColor = vec4(pbrColor, 1.0);
+    vec3 albedo = texture(gAlbedo, TexCoords).rgb;
+    if(int(aoSpecular.b)>0){
+        FragColor = vec4(albedo, 1.0);
+    }else{
+        vec3 FragPos = texture(gPosition, TexCoords).rgb;
+        vec3 N = texture(gNormal, TexCoords).rgb;
+        float roughness = texture(gNormal, TexCoords).a;
+        float metallic = texture(gAlbedo, TexCoords).a;
+        vec3 pbrColor = pbrCalculation(FragPos, N, albedo, aoSpecular,roughness,metallic);
+        FragColor = vec4(pbrColor, 1.0);
+    }
 }
diff --git a/Engine/Shaders/ForwardPipeline/fragment.glsl b/Engine/Shaders/ForwardPipeline/fragment.glsl
@@ -25,24 +25,28 @@ void main()
     #else
     currentMaterial = materialData[drawId];
     #endif
-
-    vec4 diffuseTexture = texture(currentMaterial.diffuse, TexCoords)+currentMaterial.materialColor;
-
-    vec3 albedo = diffuseTexture.rgb;
-    if (diffuseTexture.a < 0.1) {
-        discard;
+    if(statusCopy[drawId].plainColor>1){
+        FragColor=currentMaterial.materialColor;
+    }else{
+
+        vec4 diffuseTexture = texture(currentMaterial.diffuse, TexCoords)+currentMaterial.materialColor;
+
+        vec3 albedo = diffuseTexture.rgb;
+        if (diffuseTexture.a < 0.1) {
+            discard;
+        }
+        vec4 roughnessMetalnessTexture = texture(currentMaterial.roughness_metalness, TexCoords);
+        float metallic = roughnessMetalnessTexture.b;
+        float roughness = roughnessMetalnessTexture.g;
+        float specularMap = texture(currentMaterial.specularMap, TexCoords).r;
+        float ao = texture(currentMaterial.ambient_occlusion, TexCoords).r;
+
+        vec4 aoSpecular=vec4(specularMap, ao, 0, 0);
+
+        vec3 N = getNormalFromMap();
+
+        vec3 pbrColor = pbrCalculation(FragPos, N, albedo, aoSpecular,roughness,metallic);
+        FragColor = vec4(pbrColor, diffuseTexture.a);
     }
-    vec4 roughnessMetalnessTexture = texture(currentMaterial.roughness_metalness, TexCoords);
-    float metallic = roughnessMetalnessTexture.b;
-    float roughness = roughnessMetalnessTexture.g;
-    float specularMap = texture(currentMaterial.specularMap, TexCoords).r;
-    float ao = texture(currentMaterial.ambient_occlusion, TexCoords).r;
-
-    vec4 aoSpecular=vec4(specularMap, ao, 0, 0);
-
-    vec3 N = getNormalFromMap();
-
-    vec3 pbrColor = pbrCalculation(FragPos, N, albedo, aoSpecular,roughness,metallic);
 
-    FragColor = vec4(pbrColor, diffuseTexture.a);
 }
diff --git a/Engine/Shaders/PbrHeaderPipeline/pbr_func.glsl b/Engine/Shaders/PbrHeaderPipeline/pbr_func.glsl
@@ -23,6 +23,16 @@ layout(std140, binding = 3) uniform FragmentData
     sampler2D textureM;
 };
 
+struct StatusData{
+    uint status;
+    int plainColor;
+    vec2 padding;
+};
+
+layout(std430, binding = 25) buffer StatusCopy {
+    StatusData statusCopy[];
+};
+
 
 const float LUT_SIZE  = 64.0; // ltc_texture size
 const float LUT_SCALE = (LUT_SIZE - 1.0)/LUT_SIZE;

diff --git a/Engine/Shaders/StatusPipeline/compute.glsl b/Engine/Shaders/StatusPipeline/compute.glsl
@@ -16,7 +16,7 @@ layout(std430, binding = 22) buffer DrawElementsIndirectMeshCopy
 
 struct StatusData{
     uint status;
-    bool plainColor;
+    int plainColor;
     vec2 padding;
 };
 

diff --git a/Engine/Shaders/TransparentPipeline/computeCopy.glsl b/Engine/Shaders/TransparentPipeline/computeCopy.glsl
@@ -60,7 +60,7 @@ layout(std430, binding = 0) buffer Material {
 
 struct StatusData{
     uint status;
-    bool plainColor;
+    int plainColor;
     vec2 padding;
 };
 

diff --git a/Engine/Shaders/TransparentPipeline/computeHideShow.glsl b/Engine/Shaders/TransparentPipeline/computeHideShow.glsl
@@ -38,7 +38,7 @@ layout(std430, binding = 0) buffer Material
 
 struct StatusData{
     uint status;
-    bool plainColor;
+    int plainColor;
     vec2 padding;
 };
 

diff --git a/Engine/include/SceneData/MeshIndirect.h b/Engine/include/SceneData/MeshIndirect.h
@@ -118,7 +118,7 @@ namespace Prisma
 
 		struct StatusData {
 			unsigned int status;
-			bool plainMaterial;
+			int plainMaterial;
 			glm::vec2 padding;
 		};
 

diff --git a/Engine/src/SceneData/MeshIndirect.cpp b/Engine/src/SceneData/MeshIndirect.cpp
@@ -239,14 +239,14 @@ void Prisma::MeshIndirect::updateSize()
 
 		m_ssboIndices->resize(sizeof(glm::ivec4) * meshes.size());
 
-		std::vector<unsigned int> status;
+		std::vector<StatusData> status;
 		for (const auto& mesh : meshes)
 		{
-			status.push_back(mesh->visible());
+			status.push_back({ mesh->visible(),mesh->material()->plain(),glm::vec2(0) });
 		}
-		m_ssboStatusCopy->resize(sizeof(unsigned int) * status.size());
-		m_ssboStatusCopy->modifyData(0, sizeof(unsigned int) * status.size(), status.data());
-		m_ssboStatus->resize(sizeof(unsigned int) * status.size());
+		m_ssboStatusCopy->resize(sizeof(StatusData) * status.size());
+		m_ssboStatusCopy->modifyData(0, sizeof(StatusData) * status.size(), status.data());
+		m_ssboStatus->resize(sizeof(StatusData) * status.size());
 
 		//GENERATE DATA TO SEND INDIRECT
 		m_vao->bind();
@@ -478,13 +478,13 @@ void Prisma::MeshIndirect::updateAnimation()
 		m_ssboMaterialAnimation->modifyData(0, sizeof(MaterialData) * m_materialDataAnimation.size(),
 		                                    m_materialDataAnimation.data());
 
-		std::vector<unsigned int> status;
+		std::vector<StatusData> status;
 		for (const auto& mesh : meshes)
 		{
-			status.push_back(mesh->visible());
+			status.push_back({ mesh->visible(),mesh->material()->plain(),glm::vec2(0) });
 		}
-		m_ssboStatusAnimation->resize(sizeof(unsigned int) * status.size());
-		m_ssboStatusAnimation->modifyData(0, sizeof(unsigned int) * status.size(), status.data());
+		m_ssboStatusAnimation->resize(sizeof(StatusData) * status.size());
+		m_ssboStatusAnimation->modifyData(0, sizeof(StatusData) * status.size(), status.data());
 
 		//GENERATE DATA TO SEND INDIRECT
 		m_vaoAnimation->bind();