Shader mostly working apart from specular

Giants.Launcher/Giants.Launcher.csproj

@@ -213,7 +213,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent Condition='$(Configuration)' == 'Release'>xcopy /DY "$(TargetPath)" "$(GIANTS_PATH)\$(TargetFileName)*"</PostBuildEvent>
+    <PostBuildEvent Condition="'$(Configuration)' == 'Release'">xcopy /DY "$(TargetPath)" "$(GIANTS_PATH)\$(TargetFileName)*"</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Shaders/fx/FFP.fx

@@ -16,13 +16,6 @@
 
 //this file contains light, fog, and texture types
 // (originally a include, inserted here)
-#define NUM_LIGHTS               5
-
-#define LIGHT_TYPE_NONE          0
-#define LIGHT_TYPE_POINT         1
-#define LIGHT_TYPE_SPOT          2
-#define LIGHT_TYPE_DIRECTIONAL   3
-#define LIGHT_NUM_TYPES          4
 
 #define FOG_TYPE_NONE            0
 #define FOG_TYPE_EXP             1
@@ -40,7 +33,7 @@
 #define TEXGEN_TYPE_CAMERASPACEREFLECTIONVECTOR   3
 #define TEXGEN_NUM_TYPES                          4
 
-
+#define MAX_DIRECTIONAL_LIGHTS 3
 
 // Structs and variables with default values
 
@@ -57,14 +50,11 @@ int iTexGenType = TEXGEN_TYPE_NONE;
 
 int g_NumLights;
 
-struct DirectionalLight
+float4 DirectionalLightAmbient[MAX_DIRECTIONAL_LIGHTS] : DirectionalLightAmbient;
-{
+float4 DirectionalLightDiffuse[MAX_DIRECTIONAL_LIGHTS] : DirectionalLightDiffuse;
-    float4 Diffuse;
+float3 DirectionalLightDirection[MAX_DIRECTIONAL_LIGHTS] : DirectionalLightDirection;
-    float4 Specular;
+bool DirectionalLightEnabled[MAX_DIRECTIONAL_LIGHTS] : DirectionalLightEnabled;
-    float4 Ambient;
+float4 DirectionalLightSpecular[MAX_DIRECTIONAL_LIGHTS] : DirectionalLightSpecular;
-    float3 Position;
-    float3 Direction;
-};
 
 struct Material
 {
@@ -75,34 +65,12 @@ struct Material
     float Power;
 };
 
-DirectionalLight DirectionalLights[2] : DirectionalLights =
-{
-    {
-        float4(0.398, 0.391, 0.523, 0.764),
-        float4(0.398, 0.391, 0.523, 0.764),
-        float4(0.398, 0.391, 0.523, 0.764),
-        float3(-1141, -182, 133),
-        float3(0.93, 0.35, 0)
-    },
-    {
-        float4(0.434, 0.402, 0.398, 0.712),
-        float4(0.434, 0.402, 0.398, 0.712),
-        float4(0.434, 0.402, 0.398, 0.712),
-        float3(-1138, -168, 133),
-        float3(-0.75, -0.165, -0.633)
-    },
-};
-
 Material g_Material : Material;
 
 //transformation matrices
 float4x4 matWorldViewProjection : WorldViewProjection;
 float4x4 matWorldView      : WorldView;
-float4x4 matView           : View;
 float4x4 matWorld          : World;
-float4x4 matProjection : Projection;
-float4x4 matWorldViewIT : WorldViewInverseTranspose;
-float4x4 matViewIT : ViewInverseTranspose;
 
 //function output structures
 struct VS_OUTPUT
@@ -120,33 +88,67 @@ struct COLOR_PAIR
    float4 ColorSpec     : COLOR1;
 };
 
+float4 CalculateAmbientLight()
+{
+    float4 ambient = 0;
+    for (int i = 0; i < MAX_DIRECTIONAL_LIGHTS; i++)
+    {
+        if (DirectionalLightEnabled[i])
+        {
+            ambient += DirectionalLightAmbient[i];
+        }
+    }
 
-//-----------------------------------------------------------------------------
+    return g_Material.Ambient * ambient;
-// Name: DoDirLight()
+}
-// Desc: Directional light computation
+
-//-----------------------------------------------------------------------------
+COLOR_PAIR DoDirectionalLight(float3 N, int i)
-COLOR_PAIR DoDirLight(float3 N, float3 V, int i)
 {
     COLOR_PAIR Out;
-   float3 L = mul((float3x3)matViewIT, -normalize(DirectionalLights[i].Direction));
+    float NdotL = dot(N, -DirectionalLightDirection[i]);
-   float NdotL = dot(N, L);
+    Out.Color = 0; // g_Material.Ambient* DirectionalLights[i].Ambient;
-   Out.Color = 0;// DirectionalLights[i].Ambient;
     Out.ColorSpec = 0;
-   if(NdotL > 0.f)
+    if (NdotL > 0.f)
     {
         //compute diffuse color
-      Out.Color += NdotL * DirectionalLights[i].Diffuse;
+        Out.Color += max(0, NdotL * DirectionalLightDiffuse[i]); //+ (g_Material.Ambient * DirectionalLightAmbient[i]);
 
        //add specular component
-      if(g_Material.Power > 0)
+       //if(g_Material.Power > 0)
-      {
+       //{
-         float3 H = normalize(L + V);   //half vector
+       //   float3 H = normalize(L + V);   //half vector
-         Out.ColorSpec = pow(max(0, dot(H, N)), g_Material.Power) * DirectionalLights[i].Specular;
+       //   Out.ColorSpec = pow(max(0, dot(H, N)), g_Material.Power) * DirectionalLights[i].Specular;
-      }
+       //}
     }
     return Out;
 }
 
+COLOR_PAIR ComputeLighting(float3 N)
+{
+    COLOR_PAIR finalResult = (COLOR_PAIR)0;
+
+    for (int i = 0; i < MAX_DIRECTIONAL_LIGHTS; i++)
+    {
+        COLOR_PAIR lightResult = (COLOR_PAIR)0;
+        if (DirectionalLightEnabled[i])
+        {
+            lightResult = DoDirectionalLight(N, i);
+        }
+
+        finalResult.Color += lightResult.Color;
+        finalResult.ColorSpec += lightResult.ColorSpec;
+    }
+
+    float4 ambient = g_Material.Ambient * CalculateAmbientLight();
+    float4 diffuse = g_Material.Diffuse * finalResult.Color;
+    float4 specular = g_Material.Specular * finalResult.ColorSpec;
+
+    finalResult.Color = saturate(ambient + diffuse);
+    finalResult.ColorSpec = saturate(specular);
+
+    return finalResult;
+}
+
 //-----------------------------------------------------------------------------
 // Name: DoPointLight()
 // Desc: Point light computation
@@ -197,12 +199,9 @@ VS_OUTPUT vs_main (float4 vPosition  : POSITION0,
    VS_OUTPUT Out = (VS_OUTPUT) 0;
 
    vNormal = normalize(vNormal);
-
    Out.Pos = mul(vPosition, matWorldViewProjection);
 
-   float3 P = mul(matWorldView, vPosition);           //position in view space
+   //float3 V = -normalize(P);                          //viewer
-   float3 N = mul((float3x3)matWorldViewIT, vNormal); //normal in view space
-   float3 V = -normalize(P);                          //viewer
 
    //automatic texture coordinate generation
    Out.Tex0.xy = tc;
@@ -212,16 +211,10 @@ VS_OUTPUT vs_main (float4 vPosition  : POSITION0,
    Out.Tex0.xy += tc * (iTexGenType == TEXGEN_TYPE_NONE);*/
 
    //light computation
-   Out.Color = g_Material.Ambient;
-   Out.ColorSpec = 0;
 
    //directional lights
-   for(int i = 0; i < 2; i++)
+   float3 N = mul(vNormal, (float3x3)matWorld);
-   {
+   COLOR_PAIR lighting = ComputeLighting(N);
-      COLOR_PAIR ColOut = DoDirLight(N, V, i);
-      Out.Color += ColOut.Color;
-      Out.ColorSpec += ColOut.ColorSpec;
-   }
 
    ////point lights
    //for(int i = 0; i < iLightPointNum; i++)
@@ -231,23 +224,12 @@ VS_OUTPUT vs_main (float4 vPosition  : POSITION0,
    //   Out.ColorSpec += ColOut.ColorSpec;
    //}
 
-   ////spot lights
-   //for(int i = 0; i < iLightSpotNum; i++)
-   //{
-   //   COLOR_PAIR ColOut = DoSpotLight(vPosition, N, V, i+iLightSpotIni);
-   //   Out.Color += ColOut.Color;
-   //   Out.ColorSpec += ColOut.ColorSpec;
-   //}
-
    //apply material color
-   Out.Color *= g_Material.Diffuse;
+   Out.Color = lighting.Color;
-   Out.ColorSpec *= g_Material.Specular;
+   Out.ColorSpec = lighting.ColorSpec;
-
-   // saturate
-   Out.Color = min(1, Out.Color);
-   Out.ColorSpec = min(1, Out.ColorSpec);
 
    //apply fog
+   float3 P = mul(matWorldView, vPosition);           //position in view space
    float d;
    if(bFogRange)
       d = length(P);

Shaders/fx/FixedFuncEMU.fx

@@ -126,7 +126,9 @@ struct ColorsOutput
     float4 Specular;
 };
 
-// camerPos = WorldView
+// cameraPos = WorldView
+// worldNormal = inputNormal * World
+// worldPos = inputPos * World
 ColorsOutput CalcLighting( float3 worldNormal, float3 worldPos, float3 cameraPos )
 {
     ColorsOutput output = (ColorsOutput)0.0;

Shaders/fx/LandBump.fx

@@ -13,12 +13,12 @@ float4x4 g_TexGenTransform0 : TexGenTransform0;
 float4x4 g_TexGenTransform1 : TexGenTransform1;
 float4x4 g_ShoreGen : TexGenTransform2;
 
-float4 g_LightDiffuseColors[MAX_LIGHTS] : EffectLightColors;
+float4 g_LightDiffuseColors[MAX_LIGHTS] : PointLightDiffuse;
-float3 g_LightPositions[MAX_LIGHTS] : EffectLightPositions;
+float3 g_LightPositions[MAX_LIGHTS] : PointLightPosition;
-float g_LightRangeSquared[MAX_LIGHTS] : EffectLightRanges;
+float g_LightRangeSquared[MAX_LIGHTS] : PointLightRange;
+bool g_LightEnabled[MAX_LIGHTS] : PointLightEnabled;
 
 float4 g_TextureFactor : TextureFactor;
-int g_NumLights = 0;
 
 //////////////////////////////////////////////////////
 
@@ -125,7 +125,9 @@ float4 LandBumpPS(VS_OUTPUT_BUMP input) : COLOR0
 	normalMap = saturate((float4)dot((float3)normal, (float3)normalcol)).xyz; 
 	float3 finalColor = 2.0 * (normalMap * (tex2D(g_LandTextureSampler, input.LandTextureUV)) + input.LandBumpDiffuse);
 
-	for (int i = 0; i < g_NumLights; i++)
+	for (int i = 0; i < MAX_LIGHTS; i++)
+	{
+		if (g_LightEnabled[i])
 		{
 			// Get light direction for this fragment
 			float3 lightDir = normalize(input.WorldPos - g_LightPositions[i]); // per pixel diffuse lighting
@@ -140,6 +142,7 @@ float4 LandBumpPS(VS_OUTPUT_BUMP input) : COLOR0
 
 			finalColor += diffuseColor;
 		}
+	}
 
 	return float4(finalColor, 1);
 }
@@ -193,7 +196,9 @@ float4 LandscapePS(VS_OUTPUT input) : COLOR0
 { 
 	float4 finalColor = 0;
 
-	for (int i = 0; i < g_NumLights; i++)
+	for (int i = 0; i < MAX_LIGHTS; i++)
+	{
+		if (g_LightEnabled[i])
 		{
 			// Get light direction for this fragment
 			float3 lightDir = normalize(input.WorldPos - g_LightPositions[i]); // per pixel diffuse lighting
@@ -208,6 +213,7 @@ float4 LandscapePS(VS_OUTPUT input) : COLOR0
 
 			finalColor += diffuseColor;
 		}
+	}
 
 	float3 texel = tex2D(g_LandTextureSampler, input.TextureUV);
 	return float4(saturate((texel.xyz + input.Diffuse) + (finalColor)), 1.0f);