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

Comparing ray/src/rt/data.h (file contents):
Revision 2.4 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.9 by greg, Tue Mar 12 16:54:51 2024 UTC

# Line 1 | Line 1
1 < /* RCSid: $Id$ */
1 > /* RCSid $Id$ */
2   /*
3   * Header for data file loading and computation routines.
4   */
5 + #ifndef _RAD_DATA_H_
6 + #define _RAD_DATA_H_
7 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
11 < /* ====================================================================
7 < * The Radiance Software License, Version 1.0
8 < *
9 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
10 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
11 < *
12 < * Redistribution and use in source and binary forms, with or without
13 < * modification, are permitted provided that the following conditions
14 < * are met:
15 < *
16 < * 1. Redistributions of source code must retain the above copyright
17 < *         notice, this list of conditions and the following disclaimer.
18 < *
19 < * 2. Redistributions in binary form must reproduce the above copyright
20 < *       notice, this list of conditions and the following disclaimer in
21 < *       the documentation and/or other materials provided with the
22 < *       distribution.
23 < *
24 < * 3. The end-user documentation included with the redistribution,
25 < *           if any, must include the following acknowledgment:
26 < *             "This product includes Radiance software
27 < *                 (http://radsite.lbl.gov/)
28 < *                 developed by the Lawrence Berkeley National Laboratory
29 < *               (http://www.lbl.gov/)."
30 < *       Alternately, this acknowledgment may appear in the software itself,
31 < *       if and wherever such third-party acknowledgments normally appear.
32 < *
33 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
34 < *       and "The Regents of the University of California" must
35 < *       not be used to endorse or promote products derived from this
36 < *       software without prior written permission. For written
37 < *       permission, please contact [email protected].
38 < *
39 < * 5. Products derived from this software may not be called "Radiance",
40 < *       nor may "Radiance" appear in their name, without prior written
41 < *       permission of Lawrence Berkeley National Laboratory.
42 < *
43 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
44 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
45 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
46 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
47 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
48 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
49 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
50 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
51 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
52 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
53 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
54 < * SUCH DAMAGE.
55 < * ====================================================================
56 < *
57 < * This software consists of voluntary contributions made by many
58 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
59 < * information on Lawrence Berkeley National Laboratory, please see
60 < * <http://www.lbl.gov/>.
61 < */
11 > #define  MAXDDIM        6               /* maximum data dimensions */
12  
63 #define  MAXDDIM        5               /* maximum data dimensions */
64
13   #define  DATATYPE       float           /* single precision to save space */
14   #define  DATATY         'f'             /* format for DATATYPE */
15 + #define  SPECTY         'c'             /* format for SCOLR */
16  
17   typedef struct datarray {
18 +        struct datarray  *next;         /* next array in list */
19          char  *name;                    /* name of our data */
20 <        short  type;                    /* DATATY, RED, GRN or BLU */
20 >        short  type;                    /* DATATY, SPECTY, RED, GRN or BLU */
21          short  nd;                      /* number of dimensions */
72        struct {
73                DATATYPE  org, siz;             /* coordinate domain */
74                int  ne;                        /* number of elements */
75                DATATYPE  *p;                   /* point locations */
76        } dim[MAXDDIM];                 /* dimension specifications */
22          union {
23                  DATATYPE  *d;                   /* float data */
24 <                COLR  *c;                       /* RGB data */
24 >                COLR  *c;                       /* RGBE data */
25 >                uby8  *s;                       /* spectral data */
26 >                void  *p;                       /* generic pointer */
27          }  arr;                         /* the data */
28 <        struct datarray  *next;         /* next array in list */
28 >        struct dadim {                  /* put this last */
29 >                DATATYPE  *p;                   /* point locations */
30 >                DATATYPE  org, siz;             /* coordinate domain */
31 >                int  ne;                        /* number of elements */
32 >        } dim[MAXDDIM];                 /* dimension specifications */
33   } DATARRAY;                     /* a data array */
34  
84 #ifdef NOPROTO
85
86 extern DATARRAY *getdata();
87 extern DATARRAY *getpict();
88 extern void     freedata();
89 extern double   datavalue();
90
91 #else
92
35   extern DATARRAY *getdata(char *dname);
36   extern DATARRAY *getpict(char *pname);
37 + extern DATARRAY *getspec(char *sname);
38   extern void     freedata(DATARRAY *dta);
39   extern double   datavalue(DATARRAY *dp, double *pt);
40 + /* release datavector() pointer with free() not freedata() */
41 + extern DATARRAY *datavector(DATARRAY *dp, double *pt);
42  
43 + #ifdef __cplusplus
44 + }
45   #endif
46 + #endif /* _RAD_DATA_H_ */
47 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines