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.31 by greg, Fri Feb 18 17:42:14 2005 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  "rtio.h"
13 > #include  "rtmath.h"
14 > #include  "paths.h"
15   #include  "view.h"
16  
71 #include  "paths.h"
17  
18   #define  FEQ(x,y)       (fabs((x)-(y)) <= FTINY)
19   #define  VEQ(v,w)       (FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \
# Line 76 | 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 87 | 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 326 | Line 276 | FVECT  p;
276  
277   void
278   pix2loc(loc, rp, px, py)        /* compute image location from pixel pos. */
279 < FLOAT  loc[2];
279 > RREAL  loc[2];
280   register RESOLU  *rp;
281   int  px, py;
282   {
# Line 401 | 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 449 | Line 400 | register char  *s;
400          int  na;
401          int  nvopts = 0;
402  
403 +        while (*s == ' ')
404 +                s++;
405          if (*s != '-')
406                  s = sskip2(s,1);
407          while (*s) {
408                  ac = 0;
409                  do {
410 <                        av[ac++] = s;
410 >                        if (ac || *s == '-')
411 >                                av[ac++] = s;
412                          while (*s && *s != ' ')
413                                  s++;
414                          while (*s == ' ')
# Line 478 | 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 502 | 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 544 | Line 502 | int
502   isview(s)                               /* is this a view string? */
503   char  *s;
504   {
505 <        static char  *altname[]={NULL,VIEWSTR,"rpict","rview","pinterp",NULL};
505 >        static char  *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL};
506          extern char  *progname;
507          register char  *cp;
508          register char  **an;
# Line 576 | 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 603 | 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