ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/view.h
(Generate patch)

Comparing ray/src/common/view.h (file contents):
Revision 2.7 by greg, Sat Feb 22 02:07:23 2003 UTC vs.
Revision 2.14 by greg, Fri Oct 24 05:29:42 2003 UTC

# Line 1 | Line 1
1 < /* RCSid: $Id$ */
1 > /* RCSid $Id$ */
2   /*
3   *  view.h - header file for image generation.
4   *
5 < *  Include after fvect.h
5 > *  Include after stdio.h and fvect.h
6   *  Includes resolu.h
7   */
8 + #ifndef _RAD_VIEW_H_
9 + #define _RAD_VIEW_H_
10  
11 < /* ====================================================================
10 < * The Radiance Software License, Version 1.0
11 < *
12 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
13 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
14 < *
15 < * Redistribution and use in source and binary forms, with or without
16 < * modification, are permitted provided that the following conditions
17 < * are met:
18 < *
19 < * 1. Redistributions of source code must retain the above copyright
20 < *         notice, this list of conditions and the following disclaimer.
21 < *
22 < * 2. Redistributions in binary form must reproduce the above copyright
23 < *       notice, this list of conditions and the following disclaimer in
24 < *       the documentation and/or other materials provided with the
25 < *       distribution.
26 < *
27 < * 3. The end-user documentation included with the redistribution,
28 < *           if any, must include the following acknowledgment:
29 < *             "This product includes Radiance software
30 < *                 (http://radsite.lbl.gov/)
31 < *                 developed by the Lawrence Berkeley National Laboratory
32 < *               (http://www.lbl.gov/)."
33 < *       Alternately, this acknowledgment may appear in the software itself,
34 < *       if and wherever such third-party acknowledgments normally appear.
35 < *
36 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
37 < *       and "The Regents of the University of California" must
38 < *       not be used to endorse or promote products derived from this
39 < *       software without prior written permission. For written
40 < *       permission, please contact [email protected].
41 < *
42 < * 5. Products derived from this software may not be called "Radiance",
43 < *       nor may "Radiance" appear in their name, without prior written
44 < *       permission of Lawrence Berkeley National Laboratory.
45 < *
46 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
47 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
48 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
49 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
50 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
51 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
52 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
53 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
54 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
55 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
56 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
57 < * SUCH DAMAGE.
58 < * ====================================================================
59 < *
60 < * This software consists of voluntary contributions made by many
61 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
62 < * information on Lawrence Berkeley National Laboratory, please see
63 < * <http://www.lbl.gov/>.
64 < */
65 <
11 > #include  <time.h>
12   #include  "resolu.h"
13  
14 + #ifdef __cplusplus
15 + extern "C" {
16 + #endif
17 +
18                                  /* view types */
19   #define  VT_PER         'v'             /* perspective */
20   #define  VT_PAR         'l'             /* parallel */
# Line 100 | Line 50 | extern VIEW  stdview;
50   #define  VIEWSTR        "VIEW="
51   #define  VIEWSTRL       5
52  
103 #ifdef NOPROTO
53  
105 extern char     *setview();
106 extern void     normaspect();
107 extern double   viewray();
108 extern void     viewloc();
109 extern void     pix2loc();
110 extern void     loc2pix();
111 extern int      getviewopt();
112 extern int      sscanview();
113 extern void     fprintview();
114 extern char     *viewopt();
115 extern int      isview();
116 extern int      viewfile();
117
118 #else
119
54   extern char     *setview(VIEW *v);
55   extern void     normaspect(double va, double *ap, int *xp, int *yp);
56   extern double   viewray(FVECT orig, FVECT direc, VIEW *v, double x, double y);
57   extern void     viewloc(FVECT ip, VIEW *v, FVECT p);
58 < extern void     pix2loc(FLOAT loc[2], RESOLU *rp, int px, int py);
58 > extern void     pix2loc(RREAL loc[2], RESOLU *rp, int px, int py);
59   extern void     loc2pix(int pp[2], RESOLU *rp, double lx, double ly);
60   extern int      getviewopt(VIEW *v, int ac, char *av[]);
61   extern int      sscanview(VIEW *vp, char *s);
# Line 130 | Line 64 | extern char    *viewopt(VIEW *vp);
64   extern int      isview(char *s);
65   extern int      viewfile(char *fname, VIEW *vp, RESOLU *rp);
66  
67 +
68 + #ifdef __cplusplus
69 + }
70   #endif
71 + #endif /* _RAD_VIEW_H_ */
72 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines