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.15 by gwlarson, Fri Feb 26 12:24:07 1999 UTC vs.
Revision 2.29 by greg, Tue Jan 18 00:33:16 2005 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  "rtmath.h"
14 + #include  "paths.h"
15   #include  "view.h"
16  
15 #include  "resolu.h"
17  
17 #include  "paths.h"
18
18   #define  FEQ(x,y)       (fabs((x)-(y)) <= FTINY)
19   #define  VEQ(v,w)       (FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \
20                                  && FEQ((v)[2],(w)[2]))
21  
22   VIEW  stdview = STDVIEW;                /* default view parameters */
23  
24 + static gethfunc gethview;
25  
26 +
27   char *
28   setview(v)              /* set hvec and vvec, return message on error */
29   register VIEW  *v;
# Line 33 | Line 34 | register VIEW  *v;
34          if (v->vaft < -FTINY || (v->vaft > FTINY && v->vaft <= v->vfore))
35                  return("illegal fore/aft clipping plane");
36  
37 <        if (normalize(v->vdir) == 0.0)          /* normalize direction */
37 >        v->vdist *= normalize(v->vdir);         /* normalize direction */
38 >        if (v->vdist == 0.0)
39                  return("zero view direction");
40  
41          if (normalize(v->vup) == 0.0)           /* normalize view up */
# Line 108 | Line 110 | register VIEW  *v;
110   }
111  
112  
113 + void
114   normaspect(va, ap, xp, yp)              /* fix pixel aspect or resolution */
115   double  va;                     /* view aspect ratio */
116   double  *ap;                    /* pixel aspect in (or out if 0) */
# Line 199 | Line 202 | double  x, y;
202   }
203  
204  
205 + void
206   viewloc(ip, v, p)               /* find image location for point */
207   FVECT  ip;
208   register VIEW  *v;
# Line 268 | Line 272 | FVECT  p;
272   }
273  
274  
275 + void
276   pix2loc(loc, rp, px, py)        /* compute image location from pixel pos. */
277 < FLOAT  loc[2];
277 > RREAL  loc[2];
278   register RESOLU  *rp;
279   int  px, py;
280   {
281          register int  x, y;
282  
283 <        if (rp->or & YMAJOR) {
283 >        if (rp->rt & YMAJOR) {
284                  x = px;
285                  y = py;
286          } else {
287                  x = py;
288                  y = px;
289          }
290 <        if (rp->or & XDECR)
290 >        if (rp->rt & XDECR)
291                  x = rp->xr-1 - x;
292 <        if (rp->or & YDECR)
292 >        if (rp->rt & YDECR)
293                  y = rp->yr-1 - y;
294          loc[0] = (x+.5)/rp->xr;
295          loc[1] = (y+.5)/rp->yr;
296   }
297  
298  
299 + void
300   loc2pix(pp, rp, lx, ly)         /* compute pixel pos. from image location */
301   int  pp[2];
302   register RESOLU  *rp;
# Line 300 | Line 306 | double  lx, ly;
306  
307          x = lx * rp->xr;
308          y = ly * rp->yr;
309 <        if (rp->or & XDECR)
309 >        if (rp->rt & XDECR)
310                  x = rp->xr-1 - x;
311 <        if (rp->or & YDECR)
311 >        if (rp->rt & YDECR)
312                  y = rp->yr-1 - y;
313 <        if (rp->or & YMAJOR) {
313 >        if (rp->rt & YMAJOR) {
314                  pp[0] = x;
315                  pp[1] = y;
316          } else {
# Line 391 | Line 397 | register char  *s;
397          int  na;
398          int  nvopts = 0;
399  
400 +        while (*s == ' ')
401 +                s++;
402          if (*s != '-')
403                  s = sskip2(s,1);
404          while (*s) {
405                  ac = 0;
406                  do {
407 <                        av[ac++] = s;
407 >                        if (ac || *s == '-')
408 >                                av[ac++] = s;
409                          while (*s && *s != ' ')
410                                  s++;
411                          while (*s == ' ')
# Line 413 | Line 422 | register char  *s;
422   }
423  
424  
425 + void
426   fprintview(vp, fp)                      /* write out view parameters */
427   register VIEW  *vp;
428   FILE  *fp;
429   {
430          fprintf(fp, " -vt%c", vp->type);
431          fprintf(fp, " -vp %.6g %.6g %.6g", vp->vp[0], vp->vp[1], vp->vp[2]);
432 <        fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]);
432 >        fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0]*vp->vdist,
433 >                                                vp->vdir[1]*vp->vdist,
434 >                                                vp->vdir[2]*vp->vdist);
435          fprintf(fp, " -vu %.6g %.6g %.6g", vp->vup[0], vp->vup[1], vp->vup[2]);
436          fprintf(fp, " -vh %.6g -vv %.6g", vp->horiz, vp->vert);
437          fprintf(fp, " -vo %.6g -va %.6g", vp->vfore, vp->vaft);
# Line 443 | Line 455 | register VIEW  *vp;
455                                  vp->vp[0], vp->vp[1], vp->vp[2]);
456                  cp += strlen(cp);
457          }
458 <        if (!VEQ(vp->vdir,stdview.vdir)) {
458 >        if (!FEQ(vp->vdist,stdview.vdist) || !VEQ(vp->vdir,stdview.vdir)) {
459                  sprintf(cp, " -vd %.6g %.6g %.6g",
460 <                                vp->vdir[0], vp->vdir[1], vp->vdir[2]);
460 >                                vp->vdir[0]*vp->vdist,
461 >                                vp->vdir[1]*vp->vdist,
462 >                                vp->vdir[2]*vp->vdist);
463                  cp += strlen(cp);
464          }
465          if (!VEQ(vp->vup,stdview.vup)) {
# Line 485 | Line 499 | int
499   isview(s)                               /* is this a view string? */
500   char  *s;
501   {
502 <        static char  *altname[]={NULL,VIEWSTR,"rpict","rview","pinterp",NULL};
502 >        static char  *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL};
503          extern char  *progname;
504          register char  *cp;
505          register char  **an;
# Line 517 | Line 531 | struct myview {
531  
532  
533   static int
534 < gethview(s, v)                          /* get view from header */
535 < char  *s;
536 < register struct myview  *v;
534 > gethview(                               /* get view from header */
535 >        char  *s,
536 >        void  *v
537 > )
538   {
539 <        if (isview(s) && sscanview(v->hv, s) > 0)
540 <                v->ok++;
539 >        if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0)
540 >                ((struct myview*)v)->ok++;
541          return(0);
542   }
543  
# Line 536 | Line 551 | RESOLU  *rp;
551          struct myview   mvs;
552          FILE  *fp;
553  
554 <        if ((fp = fopen(fname, "r")) == NULL)
554 >        if (fname == NULL || !strcmp(fname, "-"))
555 >                fp = stdin;
556 >        else if ((fp = fopen(fname, "r")) == NULL)
557                  return(-1);
558  
559          mvs.hv = vp;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines