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.7 by greg, Thu Oct 22 09:55:16 1992 UTC vs.
Revision 2.12 by greg, Wed Aug 18 00:19:05 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 81 | Line 81 | marksources()                  /* find and mark source objects */
81                  if (m->otype == MAT_GLOW) {
82                          source[ns].sflags |= SPROX;
83                          source[ns].sl.prox = m->oargs.farg[3];
84 <                        if (o->otype == OBJ_SOURCE)
84 >                        if (source[ns].sflags & SDISTANT)
85                                  source[ns].sflags |= SSKIP;
86                  } else if (m->otype == MAT_SPOT) {
87                          source[ns].sflags |= SSPOT;
# 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 +                                r->rod > 0.0 && \
375 +                                weaksrcmod(source[r->rsrc].so->omod))
376 +
377   /* wrongsource *
378   *
379   * This source is the wrong source (ie. overcounted) if we are
380   * aimed to a different source than the one we hit and the one
381 < * we hit is not an illum which should be passed.
381 > * we hit is not an illum that should be passed.
382   */
383  
384   #define  wrongsource(m, r)      (r->rsrc>=0 && source[r->rsrc].so!=r->ro && \
385 <                                (m->otype!=MAT_ILLUM || wrongillum(m,r)))
385 >                                (m->otype!=MAT_ILLUM || illumblock(m,r)))
386  
387   /* distglow *
388   *
389   * A distant glow is an object that sometimes acts as a light source,
390   * but is too far away from the test point to be one in this case.
391 + * (Glows with negative radii should NEVER participate in illumination.)
392   */
393  
394   #define  distglow(m, r)         (m->otype==MAT_GLOW && \
395 +                                m->oargs.farg[3] >= -FTINY && \
396                                  r->rot > m->oargs.farg[3])
397  
398   /* badcomponent *
# Line 398 | Line 408 | char  *p;                      /* data for f */
408                                  !(r->crtype&SHADOW || r->rod < 0.0 || \
409                                          distglow(m, r)))
410  
401 – /* overcount *
402 – *
403 – * All overcounting possibilities are contained here.
404 – */
405 –
406 – #define  overcount(m, r)        (badcomponent(m,r) || wrongsource(m,r))
407 –
411   /* passillum *
412   *
413   * An illum passes to another material type when we didn't hit it
# Line 418 | Line 421 | char  *p;                      /* data for f */
421  
422   /* srcignore *
423   *
424 < * The -di flag renders light sources invisible, and here is the test.
424 > * The -dv flag is normally on for sources to be visible.
425   */
426  
427 < #define  srcignore(m, r)        (directinvis && !(r->crtype&SHADOW) && \
427 > #define  srcignore(m, r)        (!directvis && !(r->crtype&SHADOW) && \
428                                  !distglow(m, r))
429  
430  
# Line 430 | Line 433 | register OBJREC  *m;
433   register RAY  *r;
434   {
435                                                  /* check for over-counting */
436 <        if (overcount(m, r))
436 >        if (badcomponent(m, r))
437                  return;
438 +        if (wrongsource(m,r))
439 +                return;
440                                                  /* check for passed illum */
441          if (passillum(m, r)) {
442                  if (m->oargs.nsargs < 1 || !strcmp(m->oargs.sarg[0], VOIDID))
# Line 448 | Line 453 | register RAY  *r;
453          if (srcignore(m, r))
454                  return;
455                                                  /* check for outside spot */
456 <        if (m->otype==MAT_SPOT && spotout(r, (SPOT *)m->os, r->rot>=FHUGE))
456 >        if (m->otype==MAT_SPOT && spotout(r, makespot(m), r->rot>=FHUGE))
457                  return;
458                                                  /* get distribution pattern */
459          raytexture(r, m->omod);

Diff Legend

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