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

Comparing ray/src/rt/m_clip.c (file contents):
Revision 2.3 by greg, Mon Feb 12 17:04:08 1996 UTC vs.
Revision 2.7 by schorsch, Mon Jul 21 22:30:19 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1986 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   *  m_clip.c - routine for clipped (cut) objects.
9 *
10 *     3/17/86
6   */
7  
8 + #include "copyright.h"
9 +
10   #include  "ray.h"
11  
12   /*
# Line 21 | Line 18 | static char SCCSid[] = "$SunId$ LBL";
18   */
19  
20  
21 + int
22   m_clip(m, r)                    /* clip objects from ray */
23   register OBJREC  *m;
24   register RAY  *r;
25   {
26          OBJECT  cset[MAXSET+1], *modset;
27 +        OBJECT  obj, mod;
28          int  entering;
29          register int  i;
30  
31 +        obj = objndx(m);
32          if ((modset = (OBJECT *)m->os) == NULL) {
33                OBJECT  obj, mod;
34
33                  if (m->oargs.nsargs < 1 || m->oargs.nsargs > MAXSET)
34                          objerror(m, USER, "bad # arguments");
37                obj = objndx(m);
35                  modset = (OBJECT *)malloc((m->oargs.nsargs+1)*sizeof(OBJECT));
36                  if (modset == NULL)
37                          error(SYSTEM, "out of memory in m_clip");
# Line 83 | Line 80 | register RAY  *r;
80                                          /* check for penetration */
81                  for (rp = r; rp->parent != NULL; rp = rp->parent)
82                          if (!(rp->rtype & RAYREFL) && rp->parent->ro != NULL
83 <                                        && inset(modset, rp->parent->ro->omod))
83 >                                        && inset(modset, rp->parent->ro->omod)) {
84                                  if (rp->parent->rod > 0.0)
85                                          inside++;
86                                  else
87                                          inside--;
88 +                        }
89                  if (inside > 0) {       /* we just hit the object */
90                          flipsurface(r);
91 <                        return(rayshade(r, modifier(m->oargs.sarg[0])));
91 >                        return(rayshade(r, lastmod(obj, m->oargs.sarg[0])));
92                  }
93          }
94          raytrans(r);                    /* else transfer ray */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines