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

Comparing ray/src/rt/srcsupp.c (file contents):
Revision 1.10 by greg, Thu Jul 18 14:43:07 1991 UTC vs.
Revision 1.12 by greg, Mon Aug 26 10:11:08 1991 UTC

# Line 392 | Line 392 | register RAY  *r;
392                  first = 0; last = nsources-1;
393          }
394          for (i = first; i <= last; i++)
395 <                if (source[i].sflags & SDISTANT)
395 >                if ((source[i].sflags & (SDISTANT|SVIRTUAL)) == SDISTANT)
396                          /*
397                           * Check to see if ray is within
398                           * solid angle of source.
# Line 415 | Line 415 | register RAY  *r;
415   }
416  
417  
418 < #define  wrongsource(m, r)      (m->otype!=MAT_ILLUM && \
419 <                                r->rsrc>=0 && \
420 <                                source[r->rsrc].so!=r->ro)
418 > #define  wrongsource(m, r)      (r->rsrc>=0 && \
419 >                                source[r->rsrc].so!=r->ro && \
420 >                                (m->otype!=MAT_ILLUM || \
421 >                        objptr(source[r->rsrc].so->omod)->otype==MAT_ILLUM))
422  
423   #define  distglow(m, r)         (m->otype==MAT_GLOW && \
424                                  r->rot > m->oargs.farg[3])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines