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

Comparing ray/src/rt/raytrace.c (file contents):
Revision 2.90 by greg, Fri Nov 15 20:47:42 2024 UTC vs.
Revision 2.94 by greg, Sat Jan 18 03:49:00 2025 UTC

# Line 61 | Line 61 | rayorigin(             /* start new ray from old one */
61                  r->rweight = rw;
62                  r->crtype = r->rtype = rt;
63                  r->rsrc = -1;
64 – #ifdef SSKIPOPT
65 –                r->scorr = 1.f;
66 – #endif
64                  r->clipset = NULL;
65                  r->revf = raytrace;
66                  copycolor(r->cext, cextinction);
# Line 77 | Line 74 | rayorigin(             /* start new ray from old one */
74                  }
75                  r->rlvl = ro->rlvl;
76                  r->rsrc = ro->rsrc;
80 – #ifdef SSKIPOPT
81 –                r->scorr = ro->scorr;
82 – #endif
77                  if (rt & RAYREFL) {
78                          r->rlvl++;
79                          if (r->rsrc >= 0)       /* malfunctioning material? */
# Line 219 | Line 213 | raytirrad(                     /* irradiance hack */
213          RAY     *r
214   )
215   {
216 <        if (ofun[m->otype].flags & (T_M|T_X) && m->otype != MAT_CLIP) {
217 <                if (istransp(m->otype) || isBSDFproxy(m)) {
216 >        if (m->otype != MAT_CLIP && ismaterial(m->otype)) {
217 >                if (istransp(m) || isBSDFproxy(m)) {
218                          raytrans(r);
219                          return(1);
220                  }
# Line 461 | Line 455 | raynormal(             /* compute perturbed normal for ray */
455                  return(r->rod);
456          }
457          newdot = -DOT(norm, r->rdir);
458 <        if ((newdot > 0.0) != (r->rod > 0.0)) {         /* fix orientation */
458 >        if ((newdot > 0.0) ^ (r->rod > 0.0)) {          /* fix orientation */
459                  for (i = 0; i < 3; i++)
460                          norm[i] += 2.0*newdot*r->rdir[i];
461                  newdot = -newdot;
# Line 550 | Line 544 | rayreject(             /* check if candidate hit is worse than cu
544                          return(1);      /* old has material, new does not */
545          } else if (mray == NULL) {
546                  return(0);              /* new has material, old does not */
547 <        } else if (istransp(mnew->otype)) {
548 <                if (!istransp(mray->otype))
547 >        } else if (istransp(mnew)) {
548 >                if (!istransp(mray))
549                          return(1);      /* new is transparent, old is not */
550 <        } else if (istransp(mray->otype)) {
550 >        } else if (istransp(mray)) {
551                  return(0);              /* old is transparent, new is not */
552          }
553          if (rod <= 0) {                 /* check which side we hit */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines