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.16 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.35 by greg, Fri Dec 12 22:05:38 2008 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *  External symbols declared in view.h
8   */
9  
10 < /* ====================================================================
11 < * The Radiance Software License, Version 1.0
12 < *
13 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 < *
16 < * Redistribution and use in source and binary forms, with or without
17 < * modification, are permitted provided that the following conditions
18 < * are met:
19 < *
20 < * 1. Redistributions of source code must retain the above copyright
21 < *         notice, this list of conditions and the following disclaimer.
22 < *
23 < * 2. Redistributions in binary form must reproduce the above copyright
24 < *       notice, this list of conditions and the following disclaimer in
25 < *       the documentation and/or other materials provided with the
26 < *       distribution.
27 < *
28 < * 3. The end-user documentation included with the redistribution,
29 < *           if any, must include the following acknowledgment:
30 < *             "This product includes Radiance software
31 < *                 (http://radsite.lbl.gov/)
32 < *                 developed by the Lawrence Berkeley National Laboratory
33 < *               (http://www.lbl.gov/)."
34 < *       Alternately, this acknowledgment may appear in the software itself,
35 < *       if and wherever such third-party acknowledgments normally appear.
36 < *
37 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 < *       and "The Regents of the University of California" must
39 < *       not be used to endorse or promote products derived from this
40 < *       software without prior written permission. For written
41 < *       permission, please contact [email protected].
42 < *
43 < * 5. Products derived from this software may not be called "Radiance",
44 < *       nor may "Radiance" appear in their name, without prior written
45 < *       permission of Lawrence Berkeley National Laboratory.
46 < *
47 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 < * SUCH DAMAGE.
59 < * ====================================================================
60 < *
61 < * This software consists of voluntary contributions made by many
62 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 < * information on Lawrence Berkeley National Laboratory, please see
64 < * <http://www.lbl.gov/>.
65 < */
10 > #include "copyright.h"
11  
12 < #include  "standard.h"
13 <
12 > #include  <ctype.h>
13 > #include  "rtio.h"
14 > #include  "rtmath.h"
15 > #include  "paths.h"
16   #include  "view.h"
17  
71 – #include  "paths.h"
18  
19   #define  FEQ(x,y)       (fabs((x)-(y)) <= FTINY)
20   #define  VEQ(v,w)       (FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \
# Line 76 | Line 22 | static const char      RCSid[] = "$Id$";
22  
23   VIEW  stdview = STDVIEW;                /* default view parameters */
24  
25 + 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";
# Line 87 | Line 36 | register VIEW  *v;
36          if (v->vaft < -FTINY || (v->vaft > FTINY && v->vaft <= v->vfore))
37                  return("illegal fore/aft clipping plane");
38  
39 <        if (normalize(v->vdir) == 0.0)          /* normalize direction */
39 >        if (v->vdist <= FTINY)
40 >                return("illegal view distance");
41 >        v->vdist *= normalize(v->vdir);         /* normalize direction */
42 >        if (v->vdist == 0.0)
43                  return("zero view direction");
44  
45          if (normalize(v->vup) == 0.0)           /* normalize view up */
# Line 142 | Line 94 | register VIEW  *v;
94                  v->hn2 = 2.0 * sin(v->horiz*(PI/180.0/2.0));
95                  v->vn2 = 2.0 * sin(v->vert*(PI/180.0/2.0));
96                  break;
97 +        case VT_PLS:                            /* planispheric fisheye */
98 +                if (v->horiz >= 360.0-FTINY)
99 +                        return(ill_horiz);
100 +                if (v->vert >= 360.0-FTINY)
101 +                        return(ill_vert);
102 +                v->hn2 = 2.*sin(v->horiz*(PI/180.0/2.0)) /
103 +                                (1.0 + cos(v->horiz*(PI/180.0/2.0)));
104 +                v->vn2 = 2.*sin(v->vert*(PI/180.0/2.0)) /
105 +                                (1.0 + cos(v->vert*(PI/180.0/2.0)));
106 +                break;
107          default:
108                  return("unknown view type");
109          }
110 <        if (v->type != VT_ANG) {
110 >        if (v->type != VT_ANG && v->type != VT_PLS) {
111                  if (v->type != VT_CYL) {
112                          v->hvec[0] *= v->hn2;
113                          v->hvec[1] *= v->hn2;
# Line 163 | Line 125 | register VIEW  *v;
125  
126  
127   void
128 < normaspect(va, ap, xp, yp)              /* fix pixel aspect or resolution */
129 < double  va;                     /* view aspect ratio */
130 < double  *ap;                    /* pixel aspect in (or out if 0) */
131 < int  *xp, *yp;                  /* x and y resolution in (or out if *ap!=0) */
128 > normaspect(                             /* fix pixel aspect or resolution */
129 > double  va,                     /* view aspect ratio */
130 > double  *ap,                    /* pixel aspect in (or out if 0) */
131 > int  *xp,
132 > int  *yp                        /* x and y resolution in (or out if *ap!=0) */
133 > )
134   {
135          if (*ap <= FTINY)
136                  *ap = va * *xp / *yp;           /* compute pixel aspect */
# Line 178 | Line 142 | int  *xp, *yp;                 /* x and y resolution in (or out if *
142  
143  
144   double
145 < viewray(orig, direc, v, x, y)           /* compute ray origin and direction */
146 < FVECT  orig, direc;
147 < register VIEW  *v;
148 < double  x, y;
145 > viewray(                                /* compute ray origin and direction */
146 > FVECT  orig,
147 > FVECT  direc,
148 > VIEW  *v,
149 > double  x,
150 > double  y
151 > )
152   {
153          double  d, z;
154          
# Line 232 | Line 199 | double  x, y;
199                  d = normalize(direc);
200                  return(v->vaft > FTINY ? (v->vaft - v->vfore)*d : 0.0);
201          case VT_ANG:                    /* angular fisheye */
202 <                x *= v->horiz/180.0;
203 <                y *= v->vert/180.0;
202 >                x *= (1.0/180.0)*v->horiz;
203 >                y *= (1.0/180.0)*v->vert;
204                  d = x*x + y*y;
205                  if (d > 1.0)
206                          return(-1.0);
207                  d = sqrt(d);
208                  z = cos(PI*d);
209 <                d = d <= FTINY ? PI : sqrt(1 - z*z)/d;
209 >                d = d <= FTINY ? PI : sqrt(1.0 - z*z)/d;
210                  x *= d;
211                  y *= d;
212                  direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0];
# Line 249 | Line 216 | double  x, y;
216                  orig[1] = v->vp[1] + v->vfore*direc[1];
217                  orig[2] = v->vp[2] + v->vfore*direc[2];
218                  return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0);
219 +        case VT_PLS:                    /* planispheric fisheye */
220 +                x *= sqrt(v->hn2);
221 +                y *= sqrt(v->vn2);
222 +                d = x*x + y*y;
223 +                z = (1. - d)/(1. + d);
224 +                d = d <= FTINY*FTINY ? PI : sqrt((1.0 - z*z)/d);
225 +                x *= d;
226 +                y *= d;
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];
230 +                orig[0] = v->vp[0] + v->vfore*direc[0];
231 +                orig[1] = v->vp[1] + v->vfore*direc[1];
232 +                orig[2] = v->vp[2] + v->vfore*direc[2];
233 +                return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0);
234          }
235          return(-1.0);
236   }
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;
248  
249 <        disp[0] = p[0] - v->vp[0];
267 <        disp[1] = p[1] - v->vp[1];
268 <        disp[2] = p[2] - v->vp[2];
249 >        VSUB(disp, p, v->vp);
250  
251          switch (v->type) {
252          case VT_PAR:                    /* parallel view */
# Line 314 | Line 295 | FVECT  p;
295                          ip[0] += 180.0/v->horiz;
296                          return;
297                  }
298 <                d = acos(d)/PI / sqrt(1.0 - d*d);
299 <                ip[0] += DOT(disp,v->hvec)*d*180.0/v->horiz;
300 <                ip[1] += DOT(disp,v->vvec)*d*180.0/v->vert;
298 >                d = (180.0/PI)*acos(d) / sqrt(1.0 - d*d);
299 >                ip[0] += DOT(disp,v->hvec)*d/v->horiz;
300 >                ip[1] += DOT(disp,v->vvec)*d/v->vert;
301                  return;
302 +        case VT_PLS:                    /* planispheric fisheye */
303 +                ip[0] = 0.5 - v->hoff;
304 +                ip[1] = 0.5 - v->voff;
305 +                ip[2] = normalize(disp) - v->vfore;
306 +                d = DOT(disp,v->vdir);
307 +                if (d >= 1.0-FTINY)
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);
313 +                ip[1] += DOT(disp,v->vvec)*d/sqrt(v->vn2);
314 +                return;
315          }
316          ip[0] = DOT(disp,v->hvec)/v->hn2 + 0.5 - v->hoff;
317          ip[1] = DOT(disp,v->vvec)/v->vn2 + 0.5 - v->voff;
# Line 325 | Line 319 | FVECT  p;
319  
320  
321   void
322 < pix2loc(loc, rp, px, py)        /* compute image location from pixel pos. */
323 < FLOAT  loc[2];
324 < register RESOLU  *rp;
325 < int  px, py;
322 > pix2loc(                /* compute image location from pixel pos. */
323 > RREAL  loc[2],
324 > RESOLU  *rp,
325 > int  px,
326 > int  py
327 > )
328   {
329          register int  x, y;
330  
# Line 349 | Line 345 | int  px, py;
345  
346  
347   void
348 < loc2pix(pp, rp, lx, ly)         /* compute pixel pos. from image location */
349 < int  pp[2];
350 < register RESOLU  *rp;
351 < double  lx, ly;
348 > loc2pix(                        /* compute pixel pos. from image location */
349 > int  pp[2],
350 > RESOLU  *rp,
351 > double  lx,
352 > double  ly
353 > )
354   {
355          register int  x, y;
356  
# Line 373 | 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 401 | Line 400 | register char  *av[];
400                  v->vdir[0] = atof(av[1]);
401                  v->vdir[1] = atof(av[2]);
402                  v->vdir[2] = atof(av[3]);
403 +                v->vdist = 1.;
404                  return(3);
405          case 'u':                       /* up */
406                  check(3,"fff");
# Line 440 | 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];
450          int  na;
451          int  nvopts = 0;
452  
453 <        if (*s != '-')
454 <                s = sskip2(s,1);
453 >        while (isspace(*s))
454 >                if (!*s++)
455 >                        return(0);
456          while (*s) {
457                  ac = 0;
458                  do {
459 <                        av[ac++] = s;
460 <                        while (*s && *s != ' ')
459 >                        if (ac || *s == '-')
460 >                                av[ac++] = s;
461 >                        while (*s && !isspace(*s))
462                                  s++;
463 <                        while (*s == ' ')
463 >                        while (isspace(*s))
464                                  s++;
465                  } while (*s && ac < 4);
466                  if ((na = getviewopt(vp, ac, av)) >= 0) {
# Line 472 | 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]);
485 <        fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]);
485 >        fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0]*vp->vdist,
486 >                                                vp->vdir[1]*vp->vdist,
487 >                                                vp->vdir[2]*vp->vdist);
488          fprintf(fp, " -vu %.6g %.6g %.6g", vp->vup[0], vp->vup[1], vp->vup[2]);
489          fprintf(fp, " -vh %.6g -vv %.6g", vp->horiz, vp->vert);
490          fprintf(fp, " -vo %.6g -va %.6g", vp->vfore, vp->vaft);
# Line 487 | 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;
502  
503 +        *cp = '\0';
504          if (vp->type != stdview.type) {
505                  sprintf(cp, " -vt%c", vp->type);
506                  cp += strlen(cp);
# Line 502 | Line 510 | register VIEW  *vp;
510                                  vp->vp[0], vp->vp[1], vp->vp[2]);
511                  cp += strlen(cp);
512          }
513 <        if (!VEQ(vp->vdir,stdview.vdir)) {
513 >        if (!FEQ(vp->vdist,stdview.vdist) || !VEQ(vp->vdir,stdview.vdir)) {
514                  sprintf(cp, " -vd %.6g %.6g %.6g",
515 <                                vp->vdir[0], vp->vdir[1], vp->vdir[2]);
515 >                                vp->vdir[0]*vp->vdist,
516 >                                vp->vdir[1]*vp->vdist,
517 >                                vp->vdir[2]*vp->vdist);
518                  cp += strlen(cp);
519          }
520          if (!VEQ(vp->vup,stdview.vup)) {
# Line 541 | 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","pinterp",NULL};
558 >        static char  *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL};
559          extern char  *progname;
560          register char  *cp;
561          register char  **an;
# Line 576 | Line 587 | struct myview {
587  
588  
589   static int
590 < gethview(s, v)                          /* get view from header */
591 < char  *s;
592 < register struct myview  *v;
590 > gethview(                               /* get view from header */
591 >        char  *s,
592 >        void  *v
593 > )
594   {
595 <        if (isview(s) && sscanview(v->hv, s) > 0)
596 <                v->ok++;
595 >        if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0)
596 >                ((struct myview*)v)->ok++;
597          return(0);
598   }
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;
# Line 603 | Line 616 | RESOLU  *rp;
616          mvs.hv = vp;
617          mvs.ok = 0;
618  
619 <        getheader(fp, (int (*)(char *, char *))&gethview, (char *)&mvs);
619 >        getheader(fp, gethview, &mvs);
620  
621          if (rp != NULL && !fgetsresolu(rp, fp))
622                  mvs.ok = 0;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines