[ViewVC] Diff of: Development/ray/src/rt/raytrace.c

Comparing ray/src/rt/raytrace.c (file contents):
Revision 2.68 by greg, Fri May 22 09:19:11 2015 UTC vs.
Revision 2.70 by greg, Thu Mar 17 21:53:42 2016 UTC

+                setcolor(r->rcoef, 1., 1., 1.);
+        } else {
+                rw = intens(rc);
-+
+                if (rw > 1.0)
-+
+                        rw = 1.0;               /* avoid calculation growth */
+                if (rc != r->rcoef)
+                        copycolor(r->rcoef, rc);
+        if (r->crtype & SHADOW)                 /* shadow commitment */
+                return(0);
+                                                /* ambient in photon map? */
-<
+        if (photonMapping && ro != NULL && ro->crtype & AMBIENT)
-<
+                return(-1);
->
+        if (ro != NULL && ro->crtype & AMBIENT) {
->
+                if (causticPhotonMapping)
->
+                        return(-1);
->
+                if (photonMapping && rt != TRANS)
->
+                        return(-1);
->
+        }
+        if (maxdepth <= 0 && rc != NULL) {      /* Russian roulette */
+                if (minweight <= 0.0)
+                        error(USER, "zero ray weight in Russian roulette");

-–
+Removed lines
-+
+Added lines
-<
+Changed lines (old)
->
+Changed lines (new)