ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/raytrace.c
(Generate patch)

Comparing ray/src/rt/raytrace.c (file contents):
Revision 2.74 by greg, Wed Dec 5 02:12:23 2018 UTC vs.
Revision 2.76 by greg, Fri Feb 22 17:12:58 2019 UTC

# Line 195 | Line 195 | raytrans(                      /* transmit ray as is */
195          rayorigin(&tr, TRANS, r, NULL);         /* always continue */
196          VCOPY(tr.rdir, r->rdir);
197          rayvalue(&tr);
198 +        copycolor(r->mcol, tr.mcol);
199          copycolor(r->rcol, tr.rcol);
200          r->rmt = r->rot + tr.rmt;
201          r->rxt = r->rot + tr.rxt;
# Line 207 | Line 208 | raytirrad(                     /* irradiance hack */
208          RAY     *r
209   )
210   {
211 <        if ((ofun[m->otype].flags & (T_M|T_X)) && m->otype != MAT_CLIP) {
211 >        if (ofun[m->otype].flags & (T_M|T_X) && m->otype != MAT_CLIP) {
212                  if (istransp(m->otype) || isBSDFproxy(m)) {
213                          raytrans(r);
214                          return(1);
# Line 367 | Line 368 | raymixture(            /* mix modifiers */
368          scalecolor(br.rcol, 1.0-coef);
369          copycolor(r->rcol, fr.rcol);
370          addcolor(r->rcol, br.rcol);
371 +        scalecolor(fr.mcol, coef);
372 +        scalecolor(br.mcol, 1.0-coef);
373 +        copycolor(r->mcol, fr.mcol);
374 +        addcolor(r->mcol, br.mcol);
375          mfore = bright(fr.mcol); mback = bright(br.mcol);
376          r->rmt = mfore > mback ? fr.rmt : br.rmt;
377          r->rxt = bright(fr.rcol)-mfore > bright(br.rcol)-mback ?
# Line 398 | Line 403 | raycontrib(            /* compute (cumulative) ray contribution
403          int  flags
404   )
405   {
401 –        double  eext[3];
402 –        int     i;
403 –
404 –        eext[0] = eext[1] = eext[2] = 0.;
406          rc[0] = rc[1] = rc[2] = 1.;
407  
408          while (r != NULL && r->crtype&flags) {
409 <                for (i = 3; i--; ) {
409 >                int     i = 3;
410 >                while (i--)
411                          rc[i] *= colval(r->rcoef,i);
410 –                        eext[i] += r->rot * colval(r->cext,i);
411 –                }
412                  r = r->parent;
413          }
414 –        for (i = 3; i--; )
415 –                rc[i] *= (eext[i] <= FTINY) ? 1. :
416 –                                (eext[i] > 92.) ? 0. : exp(-eext[i]);
414   }
415  
416  

Diff Legend

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