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

Comparing ray/src/rt/source.c (file contents):
Revision 2.25 by greg, Tue May 28 13:41:41 1996 UTC vs.
Revision 2.28 by gwlarson, Mon Aug 10 18:37:56 1998 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1995 Regents of the University of California */
1 > /* Copyright (c) 1998 Silicon Graphics, Inc. */
2  
3   #ifndef lint
4 < static char SCCSid[] = "$SunId$ LBL";
4 > static char SCCSid[] = "$SunId$ SGI";
5   #endif
6  
7   /*
# Line 227 | Line 227 | register RAY  *r;
227                          }
228  
229          if (r->ro != NULL) {
230 +                r->robj = objndx(r->ro);
231                  for (i = 0; i < 3; i++)
232                          r->ron[i] = -r->rdir[i];
233                  r->rod = 1.0;
# Line 423 | Line 424 | register RAY  *r;
424                          copycolor(sr.cext, r->cext);
425                          copycolor(sr.albedo, r->albedo);
426                          sr.gecc = r->gecc;
427 +                        sr.slights = r->slights;
428                          rayvalue(&sr);                  /* eval. source ray */
429                          if (bright(sr.rcol) <= FTINY)
430                                  continue;
# Line 536 | Line 538 | register RAY  *r;
538                                                  /* check for passed illum */
539          if (passillum(m, r)) {
540                  if (m->oargs.nsargs && strcmp(m->oargs.sarg[0], VOIDID))
541 <                        return(rayshade(r, modifier(m->oargs.sarg[0])));
541 >                        return(rayshade(r,lastmod(objndx(m),m->oargs.sarg[0])));
542                  raytrans(r);
543                  return(1);
544          }

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)