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

Comparing ray/src/rt/source.c (file contents):
Revision 2.10 by greg, Mon Feb 22 15:54:04 1993 UTC vs.
Revision 2.11 by greg, Tue Apr 6 17:55:51 1993 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1992 Regents of the University of California */
1 > /* Copyright (c) 1993 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 355 | Line 355 | char  *p;                      /* data for f */
355   * because they are very nasty and difficult to understand.
356   */
357  
358 < /* wrongillum *
358 > /* illumblock *
359   *
360   * We cannot allow an illum to pass to another illum, because that
361   * would almost certainly constitute overcounting.
362   * However, we do allow an illum to pass to another illum
363   * that is actually going to relay to a virtual light source.
364 + * We also prevent an illum from passing to a glow; this provides a
365 + * convenient mechanism for defining detailed light source
366 + * geometry behind (or inside) an effective radiator.
367   */
368  
369 < #define  wrongillum(m, r)       (!(source[r->rsrc].sflags&SVIRTUAL) && \
370 <                        objptr(source[r->rsrc].so->omod)->otype==MAT_ILLUM)
369 > static int weaksrcmod(obj) int obj;     /* efficiency booster function */
370 > {register OBJREC *o = objptr(obj);
371 > return(o->otype==MAT_ILLUM|o->otype==MAT_GLOW);}
372  
373 + #define  illumblock(m, r)       (!(source[r->rsrc].sflags&SVIRTUAL) && \
374 +                                weaksrcmod(source[r->rsrc].so->omod))
375 +
376   /* wrongsource *
377   *
378   * This source is the wrong source (ie. overcounted) if we are
379   * aimed to a different source than the one we hit and the one
380 < * we hit is not an illum which should be passed.
380 > * we hit is not an illum that should be passed.
381   */
382  
383   #define  wrongsource(m, r)      (r->rsrc>=0 && source[r->rsrc].so!=r->ro && \
384 <                                (m->otype!=MAT_ILLUM || wrongillum(m,r)))
384 >                                (m->otype!=MAT_ILLUM || illumblock(m,r)))
385  
386   /* distglow *
387   *
388   * A distant glow is an object that sometimes acts as a light source,
389   * but is too far away from the test point to be one in this case.
390 + * (Glows with negative radii should NEVER participate in illumination.)
391   */
392  
393   #define  distglow(m, r)         (m->otype==MAT_GLOW && \

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines