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.29 by greg, Tue Jan 18 00:33:16 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 >        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 326 | Line 274 | FVECT  p;
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   {
# Line 449 | 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 478 | Line 429 | 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 502 | 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 544 | 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 576 | 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 603 | Line 559 | RESOLU  *rp;
559          mvs.hv = vp;
560          mvs.ok = 0;
561  
562 <        getheader(fp, (int (*)(char *, char *))&gethview, (char *)&mvs);
562 >        getheader(fp, gethview, &mvs);
563  
564          if (rp != NULL && !fgetsresolu(rp, fp))
565                  mvs.ok = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines