Avancement Limière

enginecustom/Light.ps

@@ -10,12 +10,12 @@ Texture2D shaderTexture : register(t0);
 SamplerState SampleType : register(s0);
 cbuffer LightBuffer
 {
-    float4 ambientColor;
     float4 diffuseColor;
     float3 lightDirection;
-    float specularPower;
-    float4 specularColor;
+    float padding;
 };
+
+
 //////////////
 // TYPEDEFS //
 //////////////
@@ -24,9 +24,9 @@ struct PixelInputType
     float4 position : SV_POSITION;
     float2 tex : TEXCOORD0;
     float3 normal : NORMAL;
-    float3 viewDirection : TEXCOORD1;
 };
 
+
 ////////////////////////////////////////////////////////////////////////////////
 // Pixel Shader
 ////////////////////////////////////////////////////////////////////////////////
@@ -36,44 +36,22 @@ float4 LightPixelShader(PixelInputType input) : SV_TARGET
     float3 lightDir;
     float lightIntensity;
     float4 color;
-    float3 reflection;
-    float4 specular;
 
 
     // Sample the pixel color from the texture using the sampler at this texture coordinate location.
     textureColor = shaderTexture.Sample(SampleType, input.tex);
 
-    // Set the default output color to the ambient light value for all pixels.
-    color = ambientColor;
-
-    // Initialize the specular color.
-    specular = float4(0.0f, 0.0f, 0.0f, 0.0f);
-
     // Invert the light direction for calculations.
     lightDir = -lightDirection;
 
     // Calculate the amount of light on this pixel.
     lightIntensity = saturate(dot(input.normal, lightDir));
 
-    if(lightIntensity > 0.0f)
-    {
-        // Determine the final diffuse color based on the diffuse color and the amount of light intensity.
-        color += (diffuseColor * lightIntensity);
-
-        // Saturate the ambient and diffuse color.
-        color = saturate(color);
-
-        // Calculate the reflection vector based on the light intensity, normal vector, and light direction.
-        reflection = normalize(2.0f * lightIntensity * input.normal - lightDir); 
-
-        // Determine the amount of specular light based on the reflection vector, viewing direction, and specular power.
-        specular = pow(saturate(dot(reflection, input.viewDirection)), specularPower);
-    }
+    // Determine the final amount of diffuse color based on the diffuse color combined with the light intensity.
+    color = saturate(diffuseColor * lightIntensity);
 
     // Multiply the texture pixel and the final diffuse color to get the final pixel color result.
     color = color * textureColor;
-        // Add the specular component last to the output color.
-    color = saturate(color + specular);
 
     return color;
-}
+}