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.81 by greg, Sun Mar 29 18:21:57 2020 UTC vs.
Revision 2.87 by greg, Thu Mar 16 00:25:24 2023 UTC

# Line 147 | Line 147 | rayclear(                      /* clear a ray for (re)evaluation */
147          r->rox = NULL;
148          r->rxt = r->rmt = r->rot = FHUGE;
149          VCOPY(r->rop, r->rorg);
150 +        r->ron[0] = -r->rdir[0]; r->ron[1] = -r->rdir[1]; r->ron[2] = -r->rdir[2];
151 +        r->rod = 1.0;
152          r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
153          r->rflips = 0;
154          r->uv[0] = r->uv[1] = 0.0;
# Line 215 | Line 217 | raytirrad(                     /* irradiance hack */
217                          raytrans(r);
218                          return(1);
219                  }
220 <                if (!islight(m->otype))
220 >                if (!islight(m->otype)) {
221 >                        setcolor(r->pcol, 1.0, 1.0, 1.0);
222                          return((*ofun[Lamb.otype].funp)(&Lamb, r));
223 +                }
224          }
225          return(0);              /* not a qualifying surface */
226   }
# Line 514 | Line 518 | flipsurface(                   /* reverse surface orientation */
518          r->rflips++;
519   }
520  
521 +
522 + int
523 + rayreject(              /* check if candidate hit is worse than current */
524 +        OBJREC *o,
525 +        RAY *r,
526 +        double t,
527 +        double rod
528 + )
529 + {
530 +        OBJREC  *mnew, *mray;
531 +
532 +        if ((t <= FTINY) | (t > r->rot + FTINY))
533 +                return(1);
534 +        if (t < r->rot - FTINY)         /* is new hit significantly closer? */
535 +                return(0);
536 +                                        /* coincident point, so decide... */
537 +        if (o == r->ro)
538 +                return(1);              /* shouldn't happen */
539 +        if (r->ro == NULL)
540 +                return(0);              /* ditto */
541 +        mnew = findmaterial(o);
542 +        mray = findmaterial(r->ro);     /* check material transparencies */
543 +        if (mnew == NULL) {
544 +                if (mray != NULL)
545 +                        return(1);      /* old has material, new does not */
546 +        } else if (mray == NULL) {
547 +                return(0);              /* new has material, old does not */
548 +        } else if (istransp(mnew->otype)) {
549 +                if (!istransp(mray->otype))
550 +                        return(1);      /* new is transparent, old is not */
551 +        } else if (istransp(mray->otype)) {
552 +                return(0);              /* old is transparent, new is not */
553 +        }
554 +        if (rod <= 0) {                 /* check which side we hit */
555 +                if (r->rod > 0)
556 +                        return(1);      /* old hit front, new did not */
557 +        } else if (r->rod <= 0) {
558 +                return(0);              /* new hit front, old did not */
559 +        }
560 +                        /* earlier modifier definition wins tie */
561 +        return (r->ro->omod >= o->omod);
562 + }
563  
564   void
565   rayhit(                 /* standard ray hit test */

Diff Legend

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