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.5 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.11 by greg, Tue Aug 20 21:37:46 2013 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  m_clip.c - routine for clipped (cut) objects.
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
11 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 < *
14 < * Redistribution and use in source and binary forms, with or without
15 < * modification, are permitted provided that the following conditions
16 < * are met:
17 < *
18 < * 1. Redistributions of source code must retain the above copyright
19 < *         notice, this list of conditions and the following disclaimer.
20 < *
21 < * 2. Redistributions in binary form must reproduce the above copyright
22 < *       notice, this list of conditions and the following disclaimer in
23 < *       the documentation and/or other materials provided with the
24 < *       distribution.
25 < *
26 < * 3. The end-user documentation included with the redistribution,
27 < *           if any, must include the following acknowledgment:
28 < *             "This product includes Radiance software
29 < *                 (http://radsite.lbl.gov/)
30 < *                 developed by the Lawrence Berkeley National Laboratory
31 < *               (http://www.lbl.gov/)."
32 < *       Alternately, this acknowledgment may appear in the software itself,
33 < *       if and wherever such third-party acknowledgments normally appear.
34 < *
35 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 < *       and "The Regents of the University of California" must
37 < *       not be used to endorse or promote products derived from this
38 < *       software without prior written permission. For written
39 < *       permission, please contact [email protected].
40 < *
41 < * 5. Products derived from this software may not be called "Radiance",
42 < *       nor may "Radiance" appear in their name, without prior written
43 < *       permission of Lawrence Berkeley National Laboratory.
44 < *
45 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 < * SUCH DAMAGE.
57 < * ====================================================================
58 < *
59 < * This software consists of voluntary contributions made by many
60 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 < * information on Lawrence Berkeley National Laboratory, please see
62 < * <http://www.lbl.gov/>.
63 < */
8 > #include "copyright.h"
9  
10   #include  "ray.h"
11 + #include  "rtotypes.h"
12  
13   /*
14   *  Clipping objects permit holes and sections to be taken out
# Line 74 | Line 20 | static const char      RCSid[] = "$Id$";
20  
21  
22   int
23 < m_clip(m, r)                    /* clip objects from ray */
24 < register OBJREC  *m;
25 < register RAY  *r;
23 > m_clip(                 /* clip objects from ray */
24 >        OBJREC  *m,
25 >        RAY  *r
26 > )
27   {
28          OBJECT  cset[MAXSET+1], *modset;
29          OBJECT  obj, mod;
30          int  entering;
31 <        register int  i;
31 >        int  i;
32  
33          obj = objndx(m);
34          if ((modset = (OBJECT *)m->os) == NULL) {
# Line 108 | Line 55 | register RAY  *r;
55                  }
56                  m->os = (char *)modset;
57          }
58 +        if (r == NULL)
59 +                return(0);                      /* just initializing */
60          if (r->clipset != NULL)
61                  setcopy(cset, r->clipset);
62          else
63                  cset[0] = 0;
64  
65 <        entering = r->rod > 0.0;                /* entering clipped region? */
65 >        entering = (r->rod > 0.0);              /* entering clipped region? */
66  
67 <        for (i = modset[0]; i > 0; i--) {
67 >        for (i = modset[0]; i > 0; i--)
68                  if (entering) {
69                          if (!inset(cset, modset[i])) {
70                                  if (cset[0] >= MAXSET)
71                                          error(INTERNAL, "set overflow in m_clip");
72                                  insertelem(cset, modset[i]);
73                          }
74 <                } else {
75 <                        if (inset(cset, modset[i]))
76 <                                deletelem(cset, modset[i]);
128 <                }
129 <        }
74 >                } else if (inset(cset, modset[i]))
75 >                        deletelem(cset, modset[i]);
76 >
77                                          /* compute ray value */
78          r->newcset = cset;
79          if (strcmp(m->oargs.sarg[0], VOIDID)) {
80                  int  inside = 0;
81 <                register RAY  *rp;
81 >                const RAY  *rp;
82                                          /* check for penetration */
83                  for (rp = r; rp->parent != NULL; rp = rp->parent)
84                          if (!(rp->rtype & RAYREFL) && rp->parent->ro != NULL
85 <                                        && inset(modset, rp->parent->ro->omod))
85 >                                        && inset(modset, rp->parent->ro->omod)) {
86                                  if (rp->parent->rod > 0.0)
87                                          inside++;
88                                  else
89                                          inside--;
90 +                        }
91                  if (inside > 0) {       /* we just hit the object */
92                          flipsurface(r);
93                          return(rayshade(r, lastmod(obj, m->oargs.sarg[0])));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines