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.14 by gwlarson, Tue Oct 27 08:44:29 1998 UTC vs.
Revision 2.27 by greg, Thu Feb 12 18:55:50 2004 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1996 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   *  image.c - routines for image generation.
6 + *
7 + *  External symbols declared in view.h
8   */
9  
10 < #include  "standard.h"
10 > #include "copyright.h"
11  
12 + #include  "rtio.h"
13 + #include  "paths.h"
14   #include  "view.h"
15  
15 #include  "resolu.h"
16  
17 #include  "paths.h"
18
17   #define  FEQ(x,y)       (fabs((x)-(y)) <= FTINY)
18   #define  VEQ(v,w)       (FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \
19                                  && FEQ((v)[2],(w)[2]))
20  
21   VIEW  stdview = STDVIEW;                /* default view parameters */
22  
23 + static gethfunc gethview;
24  
25 +
26   char *
27   setview(v)              /* set hvec and vvec, return message on error */
28   register VIEW  *v;
# Line 30 | Line 30 | register VIEW  *v;
30          static char  ill_horiz[] = "illegal horizontal view size";
31          static char  ill_vert[] = "illegal vertical view size";
32          
33 <        if (v->vfore < -FTINY || v->vaft < -FTINY ||
34 <                        (v->vaft > FTINY && v->vaft <= v->vfore))
33 >        if (v->vaft < -FTINY || (v->vaft > FTINY && v->vaft <= v->vfore))
34                  return("illegal fore/aft clipping plane");
35  
36          if (normalize(v->vdir) == 0.0)          /* normalize direction */
# Line 109 | Line 108 | register VIEW  *v;
108   }
109  
110  
111 + void
112   normaspect(va, ap, xp, yp)              /* fix pixel aspect or resolution */
113   double  va;                     /* view aspect ratio */
114   double  *ap;                    /* pixel aspect in (or out if 0) */
# Line 200 | Line 200 | double  x, y;
200   }
201  
202  
203 + void
204   viewloc(ip, v, p)               /* find image location for point */
205   FVECT  ip;
206   register VIEW  *v;
# Line 246 | Line 247 | FVECT  p;
247                  d = 1.0/sqrt(d*d + d2*d2);
248                  ip[1] = DOT(disp,v->vvec)*d/v->vn2 + 0.5 - v->voff;
249                  ip[2] = VLEN(disp);
250 <                if (v->vfore > FTINY)
250 <                        ip[2] *= (1.0 - v->vfore*d);
250 >                ip[2] *= (1.0 - v->vfore*d);
251                  return;
252          case VT_ANG:                    /* angular fisheye */
253                  ip[0] = 0.5 - v->hoff;
# Line 270 | Line 270 | FVECT  p;
270   }
271  
272  
273 + void
274   pix2loc(loc, rp, px, py)        /* compute image location from pixel pos. */
275 < FLOAT  loc[2];
275 > RREAL  loc[2];
276   register RESOLU  *rp;
277   int  px, py;
278   {
279          register int  x, y;
280  
281 <        if (rp->or & YMAJOR) {
281 >        if (rp->rt & YMAJOR) {
282                  x = px;
283                  y = py;
284          } else {
285                  x = py;
286                  y = px;
287          }
288 <        if (rp->or & XDECR)
288 >        if (rp->rt & XDECR)
289                  x = rp->xr-1 - x;
290 <        if (rp->or & YDECR)
290 >        if (rp->rt & YDECR)
291                  y = rp->yr-1 - y;
292          loc[0] = (x+.5)/rp->xr;
293          loc[1] = (y+.5)/rp->yr;
294   }
295  
296  
297 + void
298   loc2pix(pp, rp, lx, ly)         /* compute pixel pos. from image location */
299   int  pp[2];
300   register RESOLU  *rp;
# Line 302 | Line 304 | double  lx, ly;
304  
305          x = lx * rp->xr;
306          y = ly * rp->yr;
307 <        if (rp->or & XDECR)
307 >        if (rp->rt & XDECR)
308                  x = rp->xr-1 - x;
309 <        if (rp->or & YDECR)
309 >        if (rp->rt & YDECR)
310                  y = rp->yr-1 - y;
311 <        if (rp->or & YMAJOR) {
311 >        if (rp->rt & YMAJOR) {
312                  pp[0] = x;
313                  pp[1] = y;
314          } else {
# Line 393 | Line 395 | register char  *s;
395          int  na;
396          int  nvopts = 0;
397  
398 +        while (*s == ' ')
399 +                s++;
400          if (*s != '-')
401                  s = sskip2(s,1);
402          while (*s) {
403                  ac = 0;
404                  do {
405 <                        av[ac++] = s;
405 >                        if (ac || *s == '-')
406 >                                av[ac++] = s;
407                          while (*s && *s != ' ')
408                                  s++;
409                          while (*s == ' ')
# Line 415 | Line 420 | register char  *s;
420   }
421  
422  
423 + void
424   fprintview(vp, fp)                      /* write out view parameters */
425   register VIEW  *vp;
426   FILE  *fp;
# Line 487 | Line 493 | int
493   isview(s)                               /* is this a view string? */
494   char  *s;
495   {
496 <        static char  *altname[]={NULL,VIEWSTR,"rpict","rview","pinterp",NULL};
496 >        static char  *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL};
497          extern char  *progname;
498          register char  *cp;
499          register char  **an;
# Line 519 | Line 525 | struct myview {
525  
526  
527   static int
528 < gethview(s, v)                          /* get view from header */
529 < char  *s;
530 < register struct myview  *v;
528 > gethview(                               /* get view from header */
529 >        char  *s,
530 >        void  *v
531 > )
532   {
533 <        if (isview(s) && sscanview(v->hv, s) > 0)
534 <                v->ok++;
533 >        if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0)
534 >                ((struct myview*)v)->ok++;
535          return(0);
536   }
537  
# Line 538 | Line 545 | RESOLU  *rp;
545          struct myview   mvs;
546          FILE  *fp;
547  
548 <        if ((fp = fopen(fname, "r")) == NULL)
548 >        if (fname == NULL || !strcmp(fname, "-"))
549 >                fp = stdin;
550 >        else if ((fp = fopen(fname, "r")) == NULL)
551                  return(-1);
552  
553          mvs.hv = vp;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines