fixing rgb=>n mapping all shaders

fixing rgb=>n mapping all shaders

hw3d/PhongPSNormalMap.hlsl

@@ -36,9 +36,8 @@ float4 main(float3 viewPos : Position, float3 n : Normal, float3 tan : Tangent,
         );
         // unpack the normal from map into tangent space        
         const float3 normalSample = nmap.Sample(splr, tc).xyz;
-        n.x = normalSample.x * 2.0f - 1.0f;
-        n.y = -normalSample.y * 2.0f + 1.0f;
-        n.z = normalSample.z;
+        n = normalSample * 2.0f - 1.0f;
+        n.y = -n.y;
         // bring normal from tanspace into view space
         n = mul(n, tanToView);
     }

hw3d/PhongPSNormalMapObject.hlsl

@@ -33,15 +33,6 @@ float4 main( float3 viewPos : Position,float3 n : Normal,float2 tc : Texcoord )
 {
 	// sample normal from map if normal mapping enabled
     if (normalMapEnabled)
-    {
-        // unpack normal data
-        const float3 normalSample = nmap.Sample(splr, tc).xyz;
-        n.x = normalSample.x * 2.0f - 1.0f;
-        n.y = -normalSample.y * 2.0f + 1.0f;
-        n.z = -normalSample.z;
-        n = mul(n, (float3x3) modelView);
-    }
-    else
     {
         // unpack normal data
         const float3 normalSample = nmap.Sample(splr, tc).xyz;

hw3d/PhongPSSpecNormalMap.hlsl

@@ -35,9 +35,7 @@ float4 main(float3 viewPos : Position, float3 n : Normal, float3 tan : Tangent,
         );
         // unpack normal data
         const float3 normalSample = nmap.Sample(splr, tc).xyz;
-        n.x = normalSample.x * 2.0f - 1.0f;
-        n.y = -normalSample.y * 2.0f + 1.0f;
-        n.z = normalSample.z;
+        n = normalSample * 2.0f - 1.0f;
         // bring normal from tanspace into view space
         n = mul(n, tanToView);
     }