Merge pull request #37 from knightcrawler25/dev

Cleanup

Author: knightcrawler25

src/shaders/common/disney.glsl

@@ -37,11 +37,9 @@
 vec3 EvalDielectricReflection(State state, vec3 V, vec3 N, vec3 L, vec3 H, inout float pdf)
 //-----------------------------------------------------------------------
 {
-    if (!(dot(N, L) * dot(N, V) > 0.0))
-	{
-		pdf = 0;
+    pdf = 0.0;
+    if (dot(N, L) <= 0.0)
 		return vec3(0.0);
-	}
 
     float F = DielectricFresnel(dot(V, H), state.eta);
     float D = GTR2(dot(N, H), state.mat.roughness);
@@ -56,11 +54,9 @@ vec3 EvalDielectricReflection(State state, vec3 V, vec3 N, vec3 L, vec3 H, inout
 vec3 EvalDielectricRefraction(State state, vec3 V, vec3 N, vec3 L, vec3 H, inout float pdf)
 //-----------------------------------------------------------------------
 {
-    if (dot(N, L) > 0.0)
-	{
-		pdf = 0;
-		return vec3(0.0);
-	}
+    pdf = 0.0;
+    if (dot(N, L) >= 0.0)
+        return vec3(0.0);
 
     float F = DielectricFresnel(abs(dot(V, H)), state.eta);
     float D = GTR2(dot(N, H), state.mat.roughness);
@@ -76,11 +72,9 @@ vec3 EvalDielectricRefraction(State state, vec3 V, vec3 N, vec3 L, vec3 H, inout
 vec3 EvalSpecular(State state, vec3 Cspec0, vec3 V, vec3 N, vec3 L, vec3 H, inout float pdf)
 //-----------------------------------------------------------------------
 {
-    if (!(dot(N, L) * dot(N, V) > 0.0))
-	{
-		pdf = 0;
-		return vec3(0.0);
-	}
+    pdf = 0.0;
+    if (dot(N, L) <= 0.0)
+        return vec3(0.0);
 
     float D = GTR2(dot(N, H), state.mat.roughness);
     pdf = D * dot(N, H) / (4.0 * dot(V, H));
@@ -95,11 +89,9 @@ vec3 EvalSpecular(State state, vec3 Cspec0, vec3 V, vec3 N, vec3 L, vec3 H, inou
 vec3 EvalClearcoat(State state, vec3 V, vec3 N, vec3 L, vec3 H, inout float pdf)
 //-----------------------------------------------------------------------
 {
-    if (!(dot(N, L) * dot(N, V) > 0.0))
-	{
-		pdf = 0;
-		return vec3(0.0);
-	}
+    pdf = 0.0;
+    if (dot(N, L) <= 0.0)
+        return vec3(0.0);
 
     float D = GTR1(dot(N, H), mix(0.1, 0.001, state.mat.clearcoatGloss));
     pdf = D * dot(N, H) / (4.0 * dot(V, H));
@@ -114,11 +106,9 @@ vec3 EvalClearcoat(State state, vec3 V, vec3 N, vec3 L, vec3 H, inout float pdf)
 vec3 EvalDiffuse(State state, vec3 Csheen, vec3 V, vec3 N, vec3 L, vec3 H, inout float pdf)
 //-----------------------------------------------------------------------
 {
-    if (!(dot(N, L) * dot(N, V) > 0.0))
-	{
-		pdf = 0;
-		return vec3(0.0);
-	}
+    pdf = 0.0;
+    if (dot(N, L) <= 0.0)
+        return vec3(0.0);
 
     pdf = dot(N, L) * (1.0 / PI);
 
@@ -164,7 +154,7 @@ vec3 DisneySample(inout State state, vec3 V, vec3 N, inout vec3 L, inout float p
         vec3 H = ImportanceSampleGTR2(state.mat.roughness, r1, r2);
         H = state.tangent * H.x + state.bitangent * H.y + N * H.z;
 
-        if (dot(N, H) < 0.0)
+        if (dot(V, H) < 0.0)
             H = -H;
 
         vec3 R = reflect(-V, H);
@@ -208,7 +198,7 @@ vec3 DisneySample(inout State state, vec3 V, vec3 N, inout vec3 L, inout float p
                 vec3 H = ImportanceSampleGTR2(state.mat.roughness, r1, r2);
                 H = state.tangent * H.x + state.bitangent * H.y + N * H.z;
 
-                if (dot(N, H) < 0.0)
+                if (dot(V, H) < 0.0)
                     H = -H;
 
                 L = normalize(reflect(-V, H));
@@ -221,7 +211,7 @@ vec3 DisneySample(inout State state, vec3 V, vec3 N, inout vec3 L, inout float p
                 vec3 H = ImportanceSampleGTR1(mix(0.1, 0.001, state.mat.clearcoatGloss), r1, r2);
                 H = state.tangent * H.x + state.bitangent * H.y + N * H.z;
 
-                if (dot(N, H) < 0.0)
+                if (dot(V, H) < 0.0)
                     H = -H;
 
                 L = normalize(reflect(-V, H));
@@ -242,14 +232,14 @@ vec3 DisneyEval(State state, vec3 V, vec3 N, vec3 L, inout float pdf)
 //-----------------------------------------------------------------------
 {
     vec3 H;
-    bool refl = dot(N, L) * dot(N, V) > 0.0;
+    bool refl = dot(N, L) > 0.0;
 
     if (refl)
         H = normalize(L + V);
     else
-        H = normalize(L * (1.0 / state.eta) + V);
+        H = normalize(L + V * state.eta);
 
-    if (dot(N, H) < 0.0)
+    if (dot(V, H) < 0.0)
         H = -H;
 
     float diffuseRatio = 0.5 * (1.0 - state.mat.metallic);

src/shaders/common/pathtrace.glsl

@@ -198,7 +198,7 @@ vec3 DirectLight(in Ray r, in State state)
         vec3 lightDir = lightSampleRec.surfacePos - surfacePos;
         float lightDist = length(lightDir);
         float lightDistSq = lightDist * lightDist;
-        lightDir /= sqrt(lightDistSq);
+        lightDir /= lightDist;
 
         if (dot(lightDir, lightSampleRec.normal) < 0.0)
         {