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

Comparing ray/src/common/image.c (file contents):
Revision 2.34 by greg, Tue Mar 11 02:21:46 2008 UTC vs.
Revision 2.39 by greg, Sun Mar 24 19:40:26 2013 UTC

# Line 26 | Line 26 | static gethfunc gethview;
26  
27  
28   char *
29 < setview(v)              /* set hvec and vvec, return message on error */
30 < register VIEW  *v;
29 > setview(                /* set hvec and vvec, return message on error */
30 > VIEW  *v
31 > )
32   {
33          static char  ill_horiz[] = "illegal horizontal view size";
34          static char  ill_vert[] = "illegal vertical view size";
35          
36 <        if (v->vaft < -FTINY || (v->vaft > FTINY && v->vaft <= v->vfore))
36 >        if ((v->vfore < -FTINY) | (v->vaft < -FTINY) ||
37 >                        (v->vaft > FTINY) & (v->vaft <= v->vfore))
38                  return("illegal fore/aft clipping plane");
39  
40          if (v->vdist <= FTINY)
# Line 124 | Line 126 | register VIEW  *v;
126  
127  
128   void
129 < normaspect(va, ap, xp, yp)              /* fix pixel aspect or resolution */
130 < double  va;                     /* view aspect ratio */
131 < double  *ap;                    /* pixel aspect in (or out if 0) */
132 < int  *xp, *yp;                  /* x and y resolution in (or out if *ap!=0) */
129 > normaspect(                             /* fix pixel aspect or resolution */
130 > double  va,                     /* view aspect ratio */
131 > double  *ap,                    /* pixel aspect in (or out if 0) */
132 > int  *xp,
133 > int  *yp                        /* x and y resolution in (or out if *ap!=0) */
134 > )
135   {
136          if (*ap <= FTINY)
137                  *ap = va * *xp / *yp;           /* compute pixel aspect */
# Line 139 | Line 143 | int  *xp, *yp;                 /* x and y resolution in (or out if *
143  
144  
145   double
146 < viewray(orig, direc, v, x, y)           /* compute ray origin and direction */
147 < FVECT  orig, direc;
148 < register VIEW  *v;
149 < double  x, y;
146 > viewray(                                /* compute ray origin and direction */
147 > FVECT  orig,
148 > FVECT  direc,
149 > VIEW  *v,
150 > double  x,
151 > double  y
152 > )
153   {
154          double  d, z;
155          
# Line 215 | Line 222 | double  x, y;
222                  y *= sqrt(v->vn2);
223                  d = x*x + y*y;
224                  z = (1. - d)/(1. + d);
225 <                d = d <= FTINY*FTINY ? PI : sqrt((1.0 - z*z)/d);
226 <                x *= d;
220 <                y *= d;
225 >                x *= (1. + z);
226 >                y *= (1. + z);
227                  direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0];
228                  direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1];
229                  direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2];
# Line 231 | Line 237 | double  x, y;
237  
238  
239   void
240 < viewloc(ip, v, p)               /* find image location for point */
241 < FVECT  ip;
242 < register VIEW  *v;
243 < FVECT  p;
240 > viewloc(                        /* find image location for point */
241 > FVECT  ip,
242 > VIEW  *v,
243 > FVECT  p
244 > )
245   {
246          double  d, d2;
247          FVECT  disp;
# Line 301 | Line 308 | FVECT  p;
308                          return;
309                  if (d <= -(1.0-FTINY))
310                          return;         /* really an error */
311 <                d = sqrt(1.0 - d*d) / (1.0 + d);
312 <                ip[0] += DOT(disp,v->hvec)*d/sqrt(v->hn2);
306 <                ip[1] += DOT(disp,v->vvec)*d/sqrt(v->vn2);
311 >                ip[0] += DOT(disp,v->hvec)/((1. + d)*sqrt(v->hn2));
312 >                ip[1] += DOT(disp,v->vvec)/((1. + d)*sqrt(v->vn2));
313                  return;
314          }
315          ip[0] = DOT(disp,v->hvec)/v->hn2 + 0.5 - v->hoff;
# Line 312 | Line 318 | FVECT  p;
318  
319  
320   void
321 < pix2loc(loc, rp, px, py)        /* compute image location from pixel pos. */
322 < RREAL  loc[2];
323 < register RESOLU  *rp;
324 < int  px, py;
321 > pix2loc(                /* compute image location from pixel pos. */
322 > RREAL  loc[2],
323 > RESOLU  *rp,
324 > int  px,
325 > int  py
326 > )
327   {
328 <        register int  x, y;
328 >        int  x, y;
329  
330          if (rp->rt & YMAJOR) {
331                  x = px;
# Line 336 | Line 344 | int  px, py;
344  
345  
346   void
347 < loc2pix(pp, rp, lx, ly)         /* compute pixel pos. from image location */
348 < int  pp[2];
349 < register RESOLU  *rp;
350 < double  lx, ly;
347 > loc2pix(                        /* compute pixel pos. from image location */
348 > int  pp[2],
349 > RESOLU  *rp,
350 > double  lx,
351 > double  ly
352 > )
353   {
354 <        register int  x, y;
354 >        int  x, y;
355  
356 <        x = lx * rp->xr;
357 <        y = ly * rp->yr;
356 >        x = (int)(lx*rp->xr + .5 - (lx < 0.0));
357 >        y = (int)(ly*rp->yr + .5 - (ly < 0.0));
358 >
359          if (rp->rt & XDECR)
360                  x = rp->xr-1 - x;
361          if (rp->rt & YDECR)
# Line 360 | Line 371 | double  lx, ly;
371  
372  
373   int
374 < getviewopt(v, ac, av)                   /* process view argument */
375 < register VIEW  *v;
376 < int  ac;
377 < register char  *av[];
374 > getviewopt(                             /* process view argument */
375 > VIEW  *v,
376 > int  ac,
377 > char  *av[]
378 > )
379   {
380   #define check(c,l)      if ((av[0][c]&&av[0][c]!=' ') || \
381                          badarg(ac-1,av+1,l)) return(-1)
# Line 428 | Line 440 | register char  *av[];
440  
441  
442   int
443 < sscanview(vp, s)                        /* get view parameters from string */
444 < VIEW  *vp;
445 < register char  *s;
443 > sscanview(                              /* get view parameters from string */
444 > VIEW  *vp,
445 > char  *s
446 > )
447   {
448          int  ac;
449          char  *av[4];
# Line 462 | Line 475 | register char  *s;
475  
476  
477   void
478 < fprintview(vp, fp)                      /* write out view parameters */
479 < register VIEW  *vp;
480 < FILE  *fp;
478 > fprintview(                             /* write out view parameters */
479 > VIEW  *vp,
480 > FILE  *fp
481 > )
482   {
483          fprintf(fp, " -vt%c", vp->type);
484          fprintf(fp, " -vp %.6g %.6g %.6g", vp->vp[0], vp->vp[1], vp->vp[2]);
# Line 479 | Line 493 | FILE  *fp;
493  
494  
495   char *
496 < viewopt(vp)                             /* translate to minimal view string */
497 < register VIEW  *vp;
496 > viewopt(                                /* translate to minimal view string */
497 > VIEW  *vp
498 > )
499   {
500          static char  vwstr[128];
501 <        register char  *cp = vwstr;
501 >        char  *cp = vwstr;
502  
503          *cp = '\0';
504          if (vp->type != stdview.type) {
# Line 536 | Line 551 | register VIEW  *vp;
551  
552  
553   int
554 < isview(s)                               /* is this a view string? */
555 < char  *s;
554 > isview(                                 /* is this a view string? */
555 > char  *s
556 > )
557   {
558          static char  *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL};
559          extern char  *progname;
560 <        register char  *cp;
561 <        register char  **an;
560 >        char  *cp;
561 >        char  **an;
562                                          /* add program name to list */
563          if (altname[0] == NULL) {
564                  for (cp = progname; *cp; cp++)
# Line 583 | Line 599 | gethview(                              /* get view from header */
599  
600  
601   int
602 < viewfile(fname, vp, rp)                 /* get view from file */
603 < char  *fname;
604 < VIEW  *vp;
605 < RESOLU  *rp;
602 > viewfile(                               /* get view from file */
603 > char  *fname,
604 > VIEW  *vp,
605 > RESOLU  *rp
606 > )
607   {
608          struct myview   mvs;
609          FILE  *fp;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines