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

Comparing ray/src/common/rglsurf.c (file contents):
Revision 3.7 by greg, Wed Apr 23 02:28:06 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.
# Line 280 | 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 296 | 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 325 | 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)

Diff Legend

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