StandardPBR is now Standard ->no more blinn-phong/lambert (#538)

* StandardPBR is now Standard ->no more blinn-phong/lambert
* Removed lambert shader/material creation from asset browser
* Cleaned up standard shader

Author: adriengivry

Resources/Editor/Models/Camera.fbx

@@ -1,5 +1,5 @@
 <root>
-    <shader>:Shaders\StandardPBR.ovfx</shader>
+    <shader>:Shaders\Standard.ovfx</shader>
     <settings>
         <support_orthographic>true</support_orthographic>
         <support_perspective>true</support_perspective>

Resources/Engine/Materials/Default.ovmat

@@ -1,20 +1,53 @@
+#include ":Shaders/Common/Buffers/LightsSSBO.ovfxh"
+#include ":Shaders/Common/Constants.ovfxh"
 #include ":Shaders/Common/Physics.ovfxh"
 #include ":Shaders/Common/Utils.ovfxh"
-#include ":Shaders/Common/Constants.ovfxh"
-#include ":Shaders/Common/Buffers/LightsSSBO.ovfxh"
-#include ":Shaders/Lighting/Shared.ovfxh"
+#include ":Shaders/Lighting/Shadow.ovfxh"
+
+float LuminosityFromAttenuation(mat4 light, vec3 fragPos)
+{
+    const vec3 lightPosition = light[0].rgb;
+    const float constant = light[0][3];
+    const float linear = light[1][3];
+    const float quadratic = light[2][3];
+
+    const float distanceToLight = length(lightPosition - fragPos);
+    const float attenuation = (constant + linear * distanceToLight + quadratic * (distanceToLight * distanceToLight));
+
+    return 1.0 / attenuation;
+}
+
+vec3 ComputeAmbientBoxLight(mat4 light, vec3 fragPos)
+{
+    const vec3 lightPosition = light[0].rgb;
+    const vec3 lightColor = UnPack(light[2][0]);
+    const float intensity = light[3][3];
+    const vec3 size = vec3(light[0][3], light[1][3], light[2][3]);
+
+    return IsPointInAABB(fragPos, lightPosition, size) ? lightColor * intensity : vec3(0.0);
+}
+
+vec3 ComputeAmbientSphereLight(mat4 light, vec3 fragPos)
+{
+    const vec3 lightPosition = light[0].rgb;
+    const vec3 lightColor = UnPack(light[2][0]);
+    const float intensity = light[3][3];
+    const float radius = light[0][3];
+
+    return IsPointInSphere(fragPos, lightPosition, radius) ? lightColor * intensity : vec3(0.0);
+}
 
 float DistributionGGX(vec3 N, vec3 H, float roughness)
 {
     float a = roughness * roughness;
     float a2 = a * a;
     float NdotH  = max(dot(N, H), 0.0);
     float NdotH2 = NdotH * NdotH;
-	
+    
     float num = a2;
     float denom = (NdotH2 * (a2 - 1.0) + 1.0);
     denom = PI * denom * denom;
-	
+    
     return num / denom;
 }
 
@@ -25,7 +58,7 @@ float GeometrySchlickGGX(float NdotV, float roughness)
 
     float num = NdotV;
     float denom = NdotV * (1.0 - k) + k;
-	
+
     return num / denom;
 }
 float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness)
@@ -34,33 +67,13 @@ float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness)
     float NdotL = max(dot(N, L), 0.0);
     float ggx2 = GeometrySchlickGGX(NdotV, roughness);
     float ggx1 = GeometrySchlickGGX(NdotL, roughness);
-	
+
     return ggx1 * ggx2;
 }
 
 vec3 FresnelSchlick(float cosTheta, vec3 F0)
 {
     return F0 + (1.0 - F0) * pow(1.0 - cosTheta, 5.0);
-}  
-
-vec3 ComputeAmbientBoxLight(mat4 light, vec3 fragPos)
-{
-    const vec3 lightPosition = light[0].rgb;
-    const vec3 lightColor = UnPack(light[2][0]);
-    const float intensity = light[3][3];
-    const vec3 size = vec3(light[0][3], light[1][3], light[2][3]);
-
-    return IsPointInAABB(fragPos, lightPosition, size) ? lightColor * intensity : vec3(0.0);
-}
-
-vec3 ComputeAmbientSphereLight(mat4 light, vec3 fragPos)
-{
-    const vec3 lightPosition = light[0].rgb;
-    const vec3 lightColor = UnPack(light[2][0]);
-    const float intensity = light[3][3];
-    const float radius = light[0][3];
-
-    return IsPointInSphere(fragPos, lightPosition, radius) ? lightColor * intensity : vec3(0.0);
 }
 
 vec3 PBRLightingModel(vec3 albedo, float metallic, float roughness, float ao, vec3 normal, vec3 viewPos, vec3 fragPos, sampler2D shadowMap, mat4 lightSpaceMatrix)
@@ -72,7 +85,7 @@ vec3 PBRLightingModel(vec3 albedo, float metallic, float roughness, float ao, ve
     const vec3 V = normalize(viewPos - fragPos);
 
     const vec3 F0 = mix(vec3(0.04), albedo, metallic); 
-	           
+               
     // reflectance equation
     vec3 Lo = vec3(0.0);
     vec3 ambientSum = vec3(0.0);

Resources/Engine/Shaders/Lambert.ovfx

@@ -1,16 +1,3 @@
-float LuminosityFromAttenuation(mat4 light, vec3 fragPos)
-{
-    const vec3 lightPosition = light[0].rgb;
-    const float constant = light[0][3];
-    const float linear = light[1][3];
-    const float quadratic = light[2][3];
-
-    const float distanceToLight = length(lightPosition - fragPos);
-    const float attenuation = (constant + linear * distanceToLight + quadratic * (distanceToLight * distanceToLight));
-    
-    return 1.0 / attenuation;
-}
-
 float SampleShadow(sampler2D shadowMap, vec3 projCoords, float bias)
 {
     float depth = texture(shadowMap, projCoords.xy).r;