Added emission

Author: deni2312

Engine/Shaders/DecalPipeline/fragment.glsl

@@ -24,7 +24,8 @@ struct StatusData
     int DispersionSampleCount;
     float metalness;
     float roughness;
-    vec2 padding;
+    float emission;
+    float padding;
 };
 
 readonly buffer statusData{
@@ -107,7 +108,7 @@ void main()
     // also store the per-fragment normals into the gbuffer
     gNormal.rgb = normalize(outTBN*normalize(tangentNormal * 2.0 - 1.0));
 
-    gAlbedoSpec.rgb = diffuse.rgb;
+    gAlbedoSpec.rgb = diffuse.rgb*statusData_data[outDrawId].emission;
 
     gAlbedoSpec.a= metallic;
     gNormal.a = roughness;

Engine/Shaders/DecalPipeline/vertex.glsl

@@ -43,7 +43,7 @@ void main()
     metallic =  clamp(metallic+statusData_data[outDrawId].metalness,0,1);
     roughness = clamp(roughness+statusData_data[outDrawId].roughness,0,1);
 
-    vec3 color = pbrCalculation(outFragPos, worldNormal, vec3(diffuse), vec4(1.0), roughness, metallic,1);
+    vec3 color = pbrCalculation(outFragPos, worldNormal, vec3(diffuse)*statusData_data[outDrawId].emission, vec4(1.0), roughness, metallic,1);
 
     FragColor = vec4(color,1);
 }

Engine/Shaders/DeferredForwardPipeline/fragment.glsl

@@ -49,7 +49,7 @@ void main()
     metallic =  metallic+statusData_data[outDrawId].metalness;
     roughness = roughness+statusData_data[outDrawId].roughness;
 
-    vec3 color = pbrCalculation(outFragPos, worldNormal, vec3(diffuse), vec4(1.0), roughness, metallic,1);
+    vec3 color = pbrCalculation(outFragPos, worldNormal, vec3(diffuse)*statusData_data[outDrawId].emission, vec4(1.0), roughness, metallic,1);
     float weight = clamp(pow(min(1.0, diffuse.a * 10.0) + 0.01, 3.0) * 1e8 * pow(1.0 - gl_FragCoord.z * 0.9, 3.0), 1e-2, 3e3);
 
     reveal = diffuse.a;

Engine/Shaders/ForwardPipeline/fragment.glsl

@@ -26,7 +26,8 @@ struct StatusData
     int DispersionSampleCount;
     float metalness;
     float roughness;
-    vec2 padding;
+    float emission;
+    float padding;
 };
 
 const float PI = 3.14159265359;

Engine/Shaders/ForwardPipeline/fragment1.glsl

@@ -53,7 +53,8 @@ struct StatusData
     unsigned int DispersionSampleCount; // 1..16
     float metalness;
     float roughness;
-    float2 padding;
+    float emission;
+    float padding;
 };
 
 #define NUM_LIGHTS          2

Engine/Shaders/ForwardPipeline/fragment_transparent.glsl

@@ -90,7 +90,7 @@ void main(inout PrimaryRayPayload payload, in BuiltInTriangleIntersectionAttribu
     metallic = saturate(metallic + statusData[InstanceID()].metalness);
     roughness = saturate(roughness + statusData[InstanceID()].roughness);
     // Sample texturing. Ray tracing shaders don't support LOD calculation, so we must specify LOD and apply filtering.
-    payload.Color = diffuseTexture[NonUniformResourceIndex(InstanceID())].SampleLevel(g_SamLinearWrap, uv, 0).xyz;
+    payload.Color = diffuseTexture[NonUniformResourceIndex(InstanceID())].SampleLevel(g_SamLinearWrap, uv, 0).xyz * float3(statusData[InstanceID()].emission, statusData[InstanceID()].emission, statusData[InstanceID()].emission);
 
 	payload.Depth = RayTCurrent();