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

Comparing ray/src/cv/mgflib/parser.h (file contents):
Revision 1.1 by greg, Tue Jun 21 14:45:41 1994 UTC vs.
Revision 1.5 by greg, Fri Jun 24 09:32:55 1994 UTC

# Line 12 | Line 12
12   #define MG_E_COMMENT    0
13   #define MG_E_COLOR      1
14   #define MG_E_CONE       2
15 < #define MG_E_CXY        3
16 < #define MG_E_CYL        4
17 < #define MG_E_ED         5
18 < #define MG_E_FACE       6
19 < #define MG_E_INCLUDE    7
20 < #define MG_E_IES        8
21 < #define MG_E_MATERIAL   9
22 < #define MG_E_NORMAL     10
23 < #define MG_E_OBJECT     11
24 < #define MG_E_POINT      12
25 < #define MG_E_RD         13
26 < #define MG_E_RING       14
27 < #define MG_E_RS         15
28 < #define MG_E_SPH        16
29 < #define MG_E_TD         17
30 < #define MG_E_TORUS      18
31 < #define MG_E_TS         19
32 < #define MG_E_VERTEX     20
33 < #define MG_E_XF         21
15 > #define MG_E_CMIX       3
16 > #define MG_E_CXY        4
17 > #define MG_E_CSPEC      5
18 > #define MG_E_CYL        6
19 > #define MG_E_ED         7
20 > #define MG_E_FACE       8
21 > #define MG_E_INCLUDE    9
22 > #define MG_E_IES        10
23 > #define MG_E_MATERIAL   11
24 > #define MG_E_NORMAL     12
25 > #define MG_E_OBJECT     13
26 > #define MG_E_POINT      14
27 > #define MG_E_PRISM      15
28 > #define MG_E_RD         16
29 > #define MG_E_RING       17
30 > #define MG_E_RS         18
31 > #define MG_E_SPH        19
32 > #define MG_E_TD         20
33 > #define MG_E_TORUS      21
34 > #define MG_E_TS         22
35 > #define MG_E_VERTEX     23
36 > #define MG_E_XF         24
37  
38 < #define MG_NENTITIES    22
38 > #define MG_NENTITIES    25
39  
40 < #define MG_NAMELIST     {"#","c","cone","cxy","cyl","ed","f","i","ies",\
41 <        "m","n","o","p","rd","ring","rs","sph","td","torus","ts","v","xf"}
40 > #define MG_NAMELIST     {"#","c","cone","cmix","cspec","cxy","cyl","ed","f",\
41 >                        "i","ies","m","n","o","p","prism","rd","ring","rs",\
42 >                        "sph","td","torus","ts","v","xf"}
43  
44   #define MG_MAXELEN      6
45  
# Line 60 | Line 64 | extern int     (*mg_ehand[MG_NENTITIES])(int argc, char **
64   #define MG_EINCL        7               /* error in included file */
65   #define MG_EMEM         8               /* out of memory */
66   #define MG_ESEEK        9               /* file seek error */
67 + #define MG_EBADMAT      10              /* bad material specification */
68  
69 < #define MG_NERRS        10
69 > #define MG_NERRS        11
70  
71   extern char     *mg_err[MG_NERRS];
72  
# Line 140 | Line 145 | extern int isflt(char *);              /* non-zero if floating poi
145   *      Definitions for 3-d vector manipulation functions
146   */
147  
148 < typedef double  FVECT[3];
148 > #ifdef  SMLFLT
149 > #define  FLOAT          float
150 > #define  FTINY          (1e-3)
151 > #else
152 > #define  FLOAT          double
153 > #define  FTINY          (1e-6)
154 > #endif
155 > #define  FHUGE          (1e10)
156  
157 + typedef FLOAT  FVECT[3];
158 +
159 + #define  VCOPY(v1,v2)   ((v1)[0]=(v2)[0],(v1)[1]=(v2)[1],(v1)[2]=(v2)[2])
160 + #define  DOT(v1,v2)     ((v1)[0]*(v2)[0]+(v1)[1]*(v2)[1]+(v1)[2]*(v2)[2])
161 + #define  VSUM(vr,v1,v2,f)       ((vr)[0]=(v1)[0]+(f)*(v2)[0], \
162 +                                (vr)[1]=(v1)[1]+(f)*(v2)[1], \
163 +                                (vr)[2]=(v1)[2]+(f)*(v2)[2])
164 +
165 + #define is0vect(v)      (DOT(v,v) < FTINY*FTINY)
166 +
167 + #define round0(x)       if (x <= FTINY && x >= -FTINY) x = 0
168 +
169   #ifdef NOPROTO
170   extern double   normalize();            /* normalize a vector */
171   #else
# Line 153 | Line 177 | extern double  normalize(FVECT);       /* normalize a vector
177   *      (materials, colors, vectors)
178   */
179  
180 + /* The following structure will change when we add spectral data support */
181   typedef struct {
182 <        double  cx, cy;         /* XY chromaticity coordinates */
182 >        float   cx, cy;         /* XY chromaticity coordinates */
183   } C_COLOR;              /* color context */
184  
185 + #ifdef later
186 +
187 + #define C_CMAXWL        780             /* maximum wavelength */
188 + #define C_CMINWL        380             /* minimum wavelength */
189 + #define C_CNSS          41              /* number of spectral samples */
190 + #define C_WLINC         ((C_MAXWL-C_MINWL)/(C_NSS-1))   /* 10 nm increment */
191 + #define C_CMAXV         10000           /* nominal maximum sample value */
192 +
193 + #define C_CXY           1               /* flag if has xy chromaticity */
194 + #define C_CSPEC         2               /* flag if has spectrum */
195 +
196   typedef struct {
197 <        double  rd;             /* diffuse reflectance */
197 >        short   flags;                  /* what's been set */
198 >        float   cx, cy;                 /* xy chromaticity value */
199 >        short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
200 >        long    ssum;                   /* straight sum of spectral values */
201 > } C_COLOR;
202 >
203 > #define C_DEFCOLOR      { C_CXY|C_CSPEC, 1./3., 1./3.,
204 >                        {C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
205 >                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
206 >                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
207 >                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
208 >                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
209 >                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
210 >                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
211 >                        (long)C_CNSS*C_MAXV }
212 >
213 > #define C_CIEX          { C_CXY|C_CSPEC, ???, ???,
214 >                        {14,42,143,435,1344,2839,3483,3362,2908,1954,956,\
215 >                        320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\
216 >                        10622,10026,8544,6424,4479,2835,1649,874,468,227,\
217 >                        114,58,29,14,7,3,2,1,0}, 106836L }
218 >
219 > #define C_CIEY          { C_CXY|C_CSPEC, ???, ???,
220 >                        {0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\
221 >                        5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\
222 >                        5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\
223 >                        5,2,1,1,0,0}, 106856L }
224 >
225 > #define C_CIEZ          { C_CXY|C_CSPEC, ???, ???,
226 >                        {65,201,679,2074,6456,13856,17471,17721,16692,\
227 >                        12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\
228 >                        11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, 106770L }
229 >
230 > #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_WLINC] / (c)->sum)
231 >
232 > #endif
233 >
234 > typedef struct {
235 >        char    *name;          /* material name */
236 >        int     clock;          /* incremented each change -- resettable */
237 >        float   rd;             /* diffuse reflectance */
238          C_COLOR rd_c;           /* diffuse reflectance color */
239 <        double  td;             /* diffuse transmittance */
239 >        float   td;             /* diffuse transmittance */
240          C_COLOR td_c;           /* diffuse transmittance color */
241 <        double  ed;             /* diffuse emittance */
241 >        float   ed;             /* diffuse emittance */
242          C_COLOR ed_c;           /* diffuse emittance color */
243 <        double  rs;             /* specular reflectance */
243 >        float   rs;             /* specular reflectance */
244          C_COLOR rs_c;           /* specular reflectance color */
245 <        double  rs_a;           /* specular reflectance roughness */
246 <        double  ts;             /* specular transmittance */
245 >        float   rs_a;           /* specular reflectance roughness */
246 >        float   ts;             /* specular transmittance */
247          C_COLOR ts_c;           /* specular transmittance color */
248 <        double  ts_a;           /* specular transmittance roughness */
248 >        float   ts_a;           /* specular transmittance roughness */
249   } C_MATERIAL;           /* material context */
250  
251   typedef struct {
252          FVECT   p, n;           /* point and normal */
253   } C_VERTEX;             /* vertex context */
254  
255 + #define isgrey(cxy)     ((cxy)->cx > .32 && (cxy)->cx < .34 && \
256 +                        (cxy)->cy > .32 && (cxy)->cy < .34)
257 +
258   #define C_DEFCOLOR      {.333,.333}
259 < #define C_DEFMATERIAL   {0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
260 <                        0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
259 > #define C_DEFMATERIAL   {NULL,1,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
260 >                                        0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
261   #define C_DEFVERTEX     {{0.,0.,0.},{0.,0.,0.}}
262  
263   extern C_COLOR          *c_ccolor;      /* the current color */
# Line 208 | Line 287 | extern char    **obj_name;             /* names in hierarchy */
287  
288   #ifdef NOPROTO
289   extern int      obj_handler();                  /* handle an object entity */
290 + extern void     obj_clear();                    /* clear object stack */
291   #else
292   extern int      obj_handler(int, char **);      /* handle an object entity */
293 + extern void     obj_clear(void);                /* clear object stack */
294   #endif
295  
296   /**************************************************************************
297   *      Definitions for hierarchical transformation handler
298   */
299  
300 < typedef double  MAT4[4][4];
300 > typedef FLOAT  MAT4[4][4];
301  
302   #ifdef  BSD
303   #define  copymat4(m4a,m4b)      bcopy((char *)m4b,(char *)m4a,sizeof(MAT4))
# Line 235 | Line 316 | extern MAT4  m4ident;
316                                  /* regular transformation */
317   typedef struct {
318          MAT4  xfm;                              /* transform matrix */
319 <        double  sca;                            /* scalefactor */
319 >        FLOAT  sca;                             /* scalefactor */
320   }  XF;
321  
322   #define identxf(xp)             (void)(setident4((xp)->xfm),(xp)->sca=1.0)
# Line 270 | Line 351 | extern void    xf_xfmpoint();          /* transform point */
351   extern void     xf_xfmvect();           /* transform vector */
352   extern void     xf_rotvect();           /* rotate vector */
353   extern double   xf_scale();             /* scale a value */
354 + extern void     xf_clear();             /* clear xf stack */
355  
356   /* The following are support routines you probably won't call directly */
357  
# Line 280 | Line 362 | extern int     xf();                   /* interpret transform spec. */
362  
363   #else
364  
365 < extern int      xf_handler();           /* handle xf entity */
366 < extern void     xf_xfmpoint();          /* transform point */
367 < extern void     xf_xfmvect();           /* transform vector */
368 < extern void     xf_rotvect();           /* rotate vector */
369 < extern double   xf_scale();             /* scale a value */
365 > extern int      xf_handler(int, char **);       /* handle xf entity */
366 > extern void     xf_xfmpoint(FVECT, FVECT);      /* transform point */
367 > extern void     xf_xfmvect(FVECT, FVECT);       /* transform vector */
368 > extern void     xf_rotvect(FVECT, FVECT);       /* rotate vector */
369 > extern double   xf_scale(double);               /* scale a value */
370 > extern void     xf_clear(void);                 /* clear xf stack */
371  
372   /* The following are support routines you probably won't call directly */
373  
# Line 316 | Line 399 | extern double  atof();
399   extern MEM_PTR  malloc();
400   extern MEM_PTR  calloc();
401   extern MEM_PTR  realloc();
402 + extern void     free();

Diff Legend

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