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.38 by greg, Fri Nov 16 00:14:19 2012 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 +                x *= (1. + z);
225 +                y *= (1. + z);
226 +                direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0];
227 +                direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1];
228 +                direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2];
229 +                orig[0] = v->vp[0] + v->vfore*direc[0];
230 +                orig[1] = v->vp[1] + v->vfore*direc[1];
231 +                orig[2] = v->vp[2] + v->vfore*direc[2];
232 +                return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0);
233          }
234          return(-1.0);
235   }
236  
237  
238   void
239 < viewloc(ip, v, p)               /* find image location for point */
240 < FVECT  ip;
241 < register VIEW  *v;
242 < FVECT  p;
239 > viewloc(                        /* find image location for point */
240 > FVECT  ip,
241 > VIEW  *v,
242 > FVECT  p
243 > )
244   {
245          double  d, d2;
246          FVECT  disp;
247  
248 <        disp[0] = p[0] - v->vp[0];
267 <        disp[1] = p[1] - v->vp[1];
268 <        disp[2] = p[2] - v->vp[2];
248 >        VSUB(disp, p, v->vp);
249  
250          switch (v->type) {
251          case VT_PAR:                    /* parallel view */
# Line 314 | Line 294 | FVECT  p;
294                          ip[0] += 180.0/v->horiz;
295                          return;
296                  }
297 <                d = acos(d)/PI / sqrt(1.0 - d*d);
298 <                ip[0] += DOT(disp,v->hvec)*d*180.0/v->horiz;
299 <                ip[1] += DOT(disp,v->vvec)*d*180.0/v->vert;
297 >                d = (180.0/PI)*acos(d) / sqrt(1.0 - d*d);
298 >                ip[0] += DOT(disp,v->hvec)*d/v->horiz;
299 >                ip[1] += DOT(disp,v->vvec)*d/v->vert;
300                  return;
301 +        case VT_PLS:                    /* planispheric fisheye */
302 +                ip[0] = 0.5 - v->hoff;
303 +                ip[1] = 0.5 - v->voff;
304 +                ip[2] = normalize(disp) - v->vfore;
305 +                d = DOT(disp,v->vdir);
306 +                if (d >= 1.0-FTINY)
307 +                        return;
308 +                if (d <= -(1.0-FTINY))
309 +                        return;         /* really an error */
310 +                ip[0] += DOT(disp,v->hvec)/((1. + d)*sqrt(v->hn2));
311 +                ip[1] += DOT(disp,v->vvec)/((1. + d)*sqrt(v->vn2));
312 +                return;
313          }
314          ip[0] = DOT(disp,v->hvec)/v->hn2 + 0.5 - v->hoff;
315          ip[1] = DOT(disp,v->vvec)/v->vn2 + 0.5 - v->voff;
# Line 325 | Line 317 | FVECT  p;
317  
318  
319   void
320 < pix2loc(loc, rp, px, py)        /* compute image location from pixel pos. */
321 < FLOAT  loc[2];
322 < register RESOLU  *rp;
323 < int  px, py;
320 > pix2loc(                /* compute image location from pixel pos. */
321 > RREAL  loc[2],
322 > RESOLU  *rp,
323 > int  px,
324 > int  py
325 > )
326   {
327 <        register int  x, y;
327 >        int  x, y;
328  
329          if (rp->rt & YMAJOR) {
330                  x = px;
# Line 349 | Line 343 | int  px, py;
343  
344  
345   void
346 < loc2pix(pp, rp, lx, ly)         /* compute pixel pos. from image location */
347 < int  pp[2];
348 < register RESOLU  *rp;
349 < double  lx, ly;
346 > loc2pix(                        /* compute pixel pos. from image location */
347 > int  pp[2],
348 > RESOLU  *rp,
349 > double  lx,
350 > double  ly
351 > )
352   {
353 <        register int  x, y;
353 >        int  x, y;
354  
355 <        x = lx * rp->xr;
356 <        y = ly * rp->yr;
355 >        x = (int)(lx*rp->xr + .5 - (lx < 0.0));
356 >        y = (int)(ly*rp->yr + .5 - (ly < 0.0));
357 >
358          if (rp->rt & XDECR)
359                  x = rp->xr-1 - x;
360          if (rp->rt & YDECR)
# Line 373 | Line 370 | double  lx, ly;
370  
371  
372   int
373 < getviewopt(v, ac, av)                   /* process view argument */
374 < register VIEW  *v;
375 < int  ac;
376 < register char  *av[];
373 > getviewopt(                             /* process view argument */
374 > VIEW  *v,
375 > int  ac,
376 > char  *av[]
377 > )
378   {
379   #define check(c,l)      if ((av[0][c]&&av[0][c]!=' ') || \
380                          badarg(ac-1,av+1,l)) return(-1)
# Line 401 | Line 399 | register char  *av[];
399                  v->vdir[0] = atof(av[1]);
400                  v->vdir[1] = atof(av[2]);
401                  v->vdir[2] = atof(av[3]);
402 +                v->vdist = 1.;
403                  return(3);
404          case 'u':                       /* up */
405                  check(3,"fff");
# Line 440 | Line 439 | register char  *av[];
439  
440  
441   int
442 < sscanview(vp, s)                        /* get view parameters from string */
443 < VIEW  *vp;
444 < register char  *s;
442 > sscanview(                              /* get view parameters from string */
443 > VIEW  *vp,
444 > char  *s
445 > )
446   {
447          int  ac;
448          char  *av[4];
449          int  na;
450          int  nvopts = 0;
451  
452 <        if (*s != '-')
453 <                s = sskip2(s,1);
452 >        while (isspace(*s))
453 >                if (!*s++)
454 >                        return(0);
455          while (*s) {
456                  ac = 0;
457                  do {
458 <                        av[ac++] = s;
459 <                        while (*s && *s != ' ')
458 >                        if (ac || *s == '-')
459 >                                av[ac++] = s;
460 >                        while (*s && !isspace(*s))
461                                  s++;
462 <                        while (*s == ' ')
462 >                        while (isspace(*s))
463                                  s++;
464                  } while (*s && ac < 4);
465                  if ((na = getviewopt(vp, ac, av)) >= 0) {
# Line 472 | Line 474 | register char  *s;
474  
475  
476   void
477 < fprintview(vp, fp)                      /* write out view parameters */
478 < register VIEW  *vp;
479 < FILE  *fp;
477 > fprintview(                             /* write out view parameters */
478 > VIEW  *vp,
479 > FILE  *fp
480 > )
481   {
482          fprintf(fp, " -vt%c", vp->type);
483          fprintf(fp, " -vp %.6g %.6g %.6g", vp->vp[0], vp->vp[1], vp->vp[2]);
484 <        fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]);
484 >        fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0]*vp->vdist,
485 >                                                vp->vdir[1]*vp->vdist,
486 >                                                vp->vdir[2]*vp->vdist);
487          fprintf(fp, " -vu %.6g %.6g %.6g", vp->vup[0], vp->vup[1], vp->vup[2]);
488          fprintf(fp, " -vh %.6g -vv %.6g", vp->horiz, vp->vert);
489          fprintf(fp, " -vo %.6g -va %.6g", vp->vfore, vp->vaft);
# Line 487 | Line 492 | FILE  *fp;
492  
493  
494   char *
495 < viewopt(vp)                             /* translate to minimal view string */
496 < register VIEW  *vp;
495 > viewopt(                                /* translate to minimal view string */
496 > VIEW  *vp
497 > )
498   {
499          static char  vwstr[128];
500 <        register char  *cp = vwstr;
500 >        char  *cp = vwstr;
501  
502 +        *cp = '\0';
503          if (vp->type != stdview.type) {
504                  sprintf(cp, " -vt%c", vp->type);
505                  cp += strlen(cp);
# Line 502 | Line 509 | register VIEW  *vp;
509                                  vp->vp[0], vp->vp[1], vp->vp[2]);
510                  cp += strlen(cp);
511          }
512 <        if (!VEQ(vp->vdir,stdview.vdir)) {
512 >        if (!FEQ(vp->vdist,stdview.vdist) || !VEQ(vp->vdir,stdview.vdir)) {
513                  sprintf(cp, " -vd %.6g %.6g %.6g",
514 <                                vp->vdir[0], vp->vdir[1], vp->vdir[2]);
514 >                                vp->vdir[0]*vp->vdist,
515 >                                vp->vdir[1]*vp->vdist,
516 >                                vp->vdir[2]*vp->vdist);
517                  cp += strlen(cp);
518          }
519          if (!VEQ(vp->vup,stdview.vup)) {
# Line 541 | Line 550 | register VIEW  *vp;
550  
551  
552   int
553 < isview(s)                               /* is this a view string? */
554 < char  *s;
553 > isview(                                 /* is this a view string? */
554 > char  *s
555 > )
556   {
557 <        static char  *altname[]={NULL,VIEWSTR,"rpict","rview","pinterp",NULL};
557 >        static char  *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL};
558          extern char  *progname;
559 <        register char  *cp;
560 <        register char  **an;
559 >        char  *cp;
560 >        char  **an;
561                                          /* add program name to list */
562          if (altname[0] == NULL) {
563                  for (cp = progname; *cp; cp++)
# Line 576 | Line 586 | struct myview {
586  
587  
588   static int
589 < gethview(s, v)                          /* get view from header */
590 < char  *s;
591 < register struct myview  *v;
589 > gethview(                               /* get view from header */
590 >        char  *s,
591 >        void  *v
592 > )
593   {
594 <        if (isview(s) && sscanview(v->hv, s) > 0)
595 <                v->ok++;
594 >        if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0)
595 >                ((struct myview*)v)->ok++;
596          return(0);
597   }
598  
599  
600   int
601 < viewfile(fname, vp, rp)                 /* get view from file */
602 < char  *fname;
603 < VIEW  *vp;
604 < RESOLU  *rp;
601 > viewfile(                               /* get view from file */
602 > char  *fname,
603 > VIEW  *vp,
604 > RESOLU  *rp
605 > )
606   {
607          struct myview   mvs;
608          FILE  *fp;
# Line 603 | Line 615 | RESOLU  *rp;
615          mvs.hv = vp;
616          mvs.ok = 0;
617  
618 <        getheader(fp, (int (*)(char *, char *))&gethview, (char *)&mvs);
618 >        getheader(fp, gethview, &mvs);
619  
620          if (rp != NULL && !fgetsresolu(rp, fp))
621                  mvs.ok = 0;

Diff Legend

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