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.25 by greg, Thu Jan 1 19:47:05 2004 UTC vs.
Revision 2.31 by greg, Fri Feb 18 17:42:14 2005 UTC

# Line 10 | Line 10 | static const char      RCSid[] = "$Id$";
10   #include "copyright.h"
11  
12   #include  "rtio.h"
13 + #include  "rtmath.h"
14 + #include  "paths.h"
15   #include  "view.h"
16  
17  
# Line 19 | Line 21 | static const char      RCSid[] = "$Id$";
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 30 | 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 >        if (v->vdist <= FTINY)
38 >                return("illegal view distance");
39 >        v->vdist *= normalize(v->vdir);         /* normalize direction */
40 >        if (v->vdist == 0.0)
41                  return("zero view direction");
42  
43          if (normalize(v->vup) == 0.0)           /* normalize view up */
# Line 344 | Line 351 | register char  *av[];
351                  v->vdir[0] = atof(av[1]);
352                  v->vdir[1] = atof(av[2]);
353                  v->vdir[2] = atof(av[3]);
354 +                v->vdist = 1.;
355                  return(3);
356          case 'u':                       /* up */
357                  check(3,"fff");
# Line 424 | Line 432 | FILE  *fp;
432   {
433          fprintf(fp, " -vt%c", vp->type);
434          fprintf(fp, " -vp %.6g %.6g %.6g", vp->vp[0], vp->vp[1], vp->vp[2]);
435 <        fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]);
435 >        fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0]*vp->vdist,
436 >                                                vp->vdir[1]*vp->vdist,
437 >                                                vp->vdir[2]*vp->vdist);
438          fprintf(fp, " -vu %.6g %.6g %.6g", vp->vup[0], vp->vup[1], vp->vup[2]);
439          fprintf(fp, " -vh %.6g -vv %.6g", vp->horiz, vp->vert);
440          fprintf(fp, " -vo %.6g -va %.6g", vp->vfore, vp->vaft);
# Line 448 | Line 458 | register VIEW  *vp;
458                                  vp->vp[0], vp->vp[1], vp->vp[2]);
459                  cp += strlen(cp);
460          }
461 <        if (!VEQ(vp->vdir,stdview.vdir)) {
461 >        if (!FEQ(vp->vdist,stdview.vdist) || !VEQ(vp->vdir,stdview.vdir)) {
462                  sprintf(cp, " -vd %.6g %.6g %.6g",
463 <                                vp->vdir[0], vp->vdir[1], vp->vdir[2]);
463 >                                vp->vdir[0]*vp->vdist,
464 >                                vp->vdir[1]*vp->vdist,
465 >                                vp->vdir[2]*vp->vdist);
466                  cp += strlen(cp);
467          }
468          if (!VEQ(vp->vup,stdview.vup)) {
# Line 522 | Line 534 | struct myview {
534  
535  
536   static int
537 < gethview(s, v)                          /* get view from header */
538 < char  *s;
539 < register struct myview  *v;
537 > gethview(                               /* get view from header */
538 >        char  *s,
539 >        void  *v
540 > )
541   {
542 <        if (isview(s) && sscanview(v->hv, s) > 0)
543 <                v->ok++;
542 >        if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0)
543 >                ((struct myview*)v)->ok++;
544          return(0);
545   }
546  
# Line 549 | Line 562 | RESOLU  *rp;
562          mvs.hv = vp;
563          mvs.ok = 0;
564  
565 <        getheader(fp, (int (*)(char *, char *))&gethview, (char *)&mvs);
565 >        getheader(fp, gethview, &mvs);
566  
567          if (rp != NULL && !fgetsresolu(rp, fp))
568                  mvs.ok = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines