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

Comparing ray/src/common/face.c (file contents):
Revision 2.6 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.13 by greg, Fri Sep 16 15:09:21 2016 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   *  face.c - routines dealing with polygonal faces.
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  "standard.h"
11  
# Line 80 | Line 25 | static const char      RCSid[] = "$Id$";
25   */
26  
27   #ifdef  SMLFLT
28 < #define  VERTEPS        1e-2            /* allowed vertex error */
28 > #define  VERTEPS        1e-3            /* allowed vertex error */
29   #else
30 < #define  VERTEPS        1e-4            /* allowed vertex error */
30 > #define  VERTEPS        1e-5            /* allowed vertex error */
31   #endif
32  
33  
34   FACE *
35 < getface(o)                      /* get arguments for a face */
36 < OBJREC  *o;
35 > getface(                                /* get arguments for a face */
36 >        OBJREC  *o
37 > )
38   {
39          double  d1;
40 <        int  badvert;
40 >        int  smalloff, badvert;
41          FVECT  v1, v2, v3;
42 <        register FACE  *f;
43 <        register int  i;
42 >        FACE  *f;
43 >        int  i;
44  
45          if ((f = (FACE *)o->os) != NULL)
46                  return(f);                      /* already done */
# Line 139 | Line 85 | OBJREC  *o;
85                                                  /* compute offset */
86          badvert = 0;
87          f->offset = DOT(f->norm, VERTEX(f,0));
88 +        smalloff = fabs(f->offset) <= VERTEPS;
89          for (i = 1; i < f->nv; i++) {
90                  d1 = DOT(f->norm, VERTEX(f,i));
91 <                badvert += fabs(d1 - f->offset/i) > VERTEPS;
91 >                if (smalloff)
92 >                        badvert += fabs(d1 - f->offset/i) > VERTEPS;
93 >                else
94 >                        badvert += fabs(1.0 - d1*i/f->offset) > VERTEPS;
95                  f->offset += d1;
96          }
97          f->offset /= (double)f->nv;
98 <        if (badvert)
98 >        if (f->nv > 3 && badvert)
99                  objerror(o, WARNING, "non-planar vertex");
100                                                  /* find axis */
101          f->ax = fabs(f->norm[0]) > fabs(f->norm[1]) ? 0 : 1;
# Line 157 | Line 107 | OBJREC  *o;
107  
108  
109   void
110 < freeface(o)                     /* free memory associated with face */
111 < OBJREC  *o;
110 > freeface(                       /* free memory associated with face */
111 >        OBJREC  *o
112 > )
113   {
114          if (o->os == NULL)
115                  return;
# Line 168 | Line 119 | OBJREC  *o;
119  
120  
121   int
122 < inface(p, f)                    /* determine if point is in face */
123 < FVECT  p;
124 < FACE  *f;
122 > inface(                         /* determine if point is in face */
123 >        FVECT  p,
124 >        FACE  *f
125 > )
126   {
127          int  ncross, n;
128          double  x, y;
129 <        register int  xi, yi;
130 <        register FLOAT  *p0, *p1;
129 >        int  tst;
130 >        int  xi, yi;
131 >        RREAL  *p0, *p1;
132  
133 <        xi = (f->ax+1)%3;
134 <        yi = (f->ax+2)%3;
133 >        if ((xi = f->ax + 1) >= 3) xi -= 3;
134 >        if ((yi = xi + 1) >= 3) yi -= 3;
135          x = p[xi];
136          y = p[yi];
137          n = f->nv;
# Line 187 | Line 140 | FACE  *f;
140          ncross = 0;
141                                          /* positive x axis cross test */
142          while (n--) {
143 <                if ((p0[yi] > y) ^ (p1[yi] > y))
144 <                        if (p0[xi] > x && p1[xi] > x)
143 >                if ((p0[yi] > y) ^ (p1[yi] > y)) {
144 >                        tst = (p0[xi] > x) + (p1[xi] > x);
145 >                        if (tst == 2)
146                                  ncross++;
147 <                        else if (p0[xi] > x || p1[xi] > x)
147 >                        else if (tst)
148                                  ncross += (p1[yi] > p0[yi]) ^
149                                                  ((p0[yi]-y)*(p1[xi]-x) >
150                                                  (p0[xi]-x)*(p1[yi]-y));
151 +                }
152                  p0 = p1;
153                  p1 += 3;
154          }

Diff Legend

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