Merge pull request #23 from cadubentzen/fix-shadows

fix shadows
cadubentzen · Nov 21, 2017 · b571e02 · b571e02
2 parents ad337cc + 87ec864
commit b571e02
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/js/fragment_shader.js b/js/fragment_shader.js
@@ -183,7 +183,8 @@ bool intersectSomethingGoingToLight(vec3 origin, vec3 N_aux) {
 }
 
 bool intersectSomething(vec3 origin, vec3 rayDirection, out vec3 intersection,
-                        out vec3 N, out vec3 color, out vec3 reflectedColor) {
+                        out vec3 N, out vec3 color, out vec3 reflectedColor,
+                        out bool shadow) {
   float dist1, dist2;
   vec3 V, L, R;
   vec3 V2, N2, L2;
@@ -212,8 +213,12 @@ bool intersectSomething(vec3 origin, vec3 rayDirection, out vec3 intersection,
 
   if (intersectSomethingGoingToLight(intersection, N)) {
     reflectedColor = vec3(0.0, 0.0, 0.0);
+    color = reflectedColor;
+    shadow = true;
+    return true;
   }
 
+  shadow = false;
   R = reflect(L, N);
   color = colorAt(reflectedColor, V, N, L, R);
   return true;
@@ -245,15 +250,16 @@ void main() {
   
   vec3 color, tempColor, colorMax, reflectedColor;
   vec3 N;
+  bool shadow = false;
 
-  if (intersectSomething(cameraPosition, rayDirection, intersection1, N, color, reflectedColor)) {
+  if (intersectSomething(cameraPosition, rayDirection, intersection1, N, color, reflectedColor, shadow)) {
     colorMax = (reflectedColor + vec3(0.7))/1.7;
     rayDirection = reflect(rayDirection, N);
-    if (intersectSomething(intersection1, rayDirection, intersection2, N, tempColor, reflectedColor)) {
+    if (!shadow && intersectSomething(intersection1, rayDirection, intersection2, N, tempColor, reflectedColor, shadow)) {
       color += tempColor * colorMax;
       colorMax = (reflectedColor + vec3(0.7))/1.7;
       rayDirection = reflect(rayDirection, N);
-      if (intersectSomething(intersection2, rayDirection, intersection1, N, tempColor, reflectedColor)) {
+      if (!shadow && intersectSomething(intersection2, rayDirection, intersection1, N, tempColor, reflectedColor, shadow)) {
         color += tempColor * colorMax;  
       }
     }