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

Comparing ray/src/common/rglsurf.c (file contents):
Revision 3.4 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 3.8 by greg, Sun May 25 06:09:44 2003 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   * Convert Radiance -> OpenGL surfaces.
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 "radogl.h"
11  
# Line 166 | Line 111 | newtess()                      /* allocate GLU tessellation object */
111   {
112          if ((gluto = gluNewTess()) == NULL)
113                  error(INTERNAL, "gluNewTess failed");
114 <        gluTessCallback(gluto, GLU_TESS_BEGIN, (_GLUfuncptr)glBegin);
115 <        gluTessCallback(gluto, GLU_TESS_VERTEX, (_GLUfuncptr)glVertex3dv);
114 >        gluTessCallback(gluto, GLU_TESS_BEGIN, glBegin);
115 >        gluTessCallback(gluto, GLU_TESS_VERTEX, glVertex3dv);
116          gluTessCallback(gluto, GLU_TESS_END, glEnd);
117          gluTessCallback(gluto, GLU_TESS_COMBINE, myCombine);
118          gluTessCallback(gluto, GLU_TESS_ERROR, glu_error);
# Line 197 | Line 142 | register OBJREC        *o;
142                  objerror(o, USER, "bad # real arguments");
143          area = polyarea(cent, norm, o->oargs.nfargs/3, (FVECT *)o->oargs.farg);
144          if (area <= FTINY)
145 <                return;
145 >                return(0);
146          if (dolights)                                   /* check for source */
147                  doflatsrc((MATREC *)o->os, cent, norm, area);
148          setmaterial((MATREC *)o->os, cent, 1);          /* set material */
# Line 232 | Line 177 | register OBJREC        *o;
177                                          (GLdouble)o->oargs.farg[3*i+1],
178                                          (GLdouble)o->oargs.farg[3*i+2]);
179          }
180 +        return(0);
181   }
182  
183  
# Line 262 | Line 208 | register OBJREC        *o;
208                  o->otype = o->otype==OBJ_SPHERE ? OBJ_BUBBLE : OBJ_SPHERE;
209                  o->oargs.farg[3] = -o->oargs.farg[3];
210          } else if (o->oargs.farg[3] <= FTINY)
211 <                return;
211 >                return(0);
212          if (dolights)
213                  dosphsrc((MATREC *)o->os, o->oargs.farg,
214                                  PI*o->oargs.farg[3]*o->oargs.farg[3]);
# Line 278 | Line 224 | register OBJREC        *o;
224                          (GLdouble)o->oargs.farg[2]);
225          gluSphere(gluqo, (GLdouble)o->oargs.farg[3], NSLICES, NSTACKS);
226          glPopMatrix();
227 +        return(0);
228   }
229  
230  
# Line 333 | Line 280 | register OBJREC *o;
280          x1 = o->oargs.farg[1] - o->oargs.farg[4];
281          y1 = o->oargs.farg[3] - o->oargs.farg[0];
282          /* z1 = 0; */
283 <        d = 180./PI * asin(sqrt(x1*x1 + y1*y1) / h);
283 >        d = x1*x1 + y1*y1;
284 >        if (d <= FTINY*FTINY)
285 >                x1 = 1.;
286 >        else
287 >                d = 180./PI * asin(sqrt(d) / h);
288          if (o->oargs.farg[5] < o->oargs.farg[2])
289                  d = 180. - d;
290          if (d > FTINY)
# Line 341 | Line 292 | register OBJREC *o;
292          gluCylinder(gluqo, o->oargs.farg[6], o->oargs.farg[iscyl ? 6 : 7],
293                          h, NSLICES, 1);
294          glPopMatrix();
295 +        return(0);
296   }
297  
298  
# Line 348 | Line 300 | int
300   o_ring(o)                       /* convert a ring */
301   register OBJREC *o;
302   {
303 <        double  x1, y1, d;
303 >        double  x1, y1, d, h;
304  
305          if (o->oargs.nfargs != 8)
306                  objerror(o, USER, "bad # real arguments");
# Line 377 | Line 329 | register OBJREC        *o;
329          glTranslated((GLdouble)o->oargs.farg[0], (GLdouble)o->oargs.farg[1],
330                          (GLdouble)o->oargs.farg[2]);
331                                          /* compute rotation angle */
332 <        d = VLEN(o->oargs.farg+3);
333 <        if (d <= FTINY)
332 >        h = VLEN(o->oargs.farg+3);
333 >        if (h <= FTINY)
334                  return;
335          x1 = -o->oargs.farg[4];
336          y1 = o->oargs.farg[3];
337          /* z1 = 0; */
338 <        d = 180./PI * asin(sqrt(x1*x1 + y1*y1) / d);
338 >        d = x1*x1 + y1*y1;
339 >        if (d <= FTINY*FTINY)
340 >                x1 = 1.;
341 >        else
342 >                d = 180./PI * asin(sqrt(d) / h);
343          if (o->oargs.farg[5] < 0.)
344                  d = 180. - d;
345          if (d > FTINY)
346                  glRotated(d, (GLdouble)x1, (GLdouble)y1, 0.);
347          gluDisk(gluqo, o->oargs.farg[6], o->oargs.farg[7], NSLICES, 1);
348          glPopMatrix();
349 +        return(0);
350   }

Diff Legend

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