84 |
|
* the mg_handle function rather than the mg_ehand routines directly. |
85 |
|
* (The first argument to mg_handle is the entity #, or -1.) |
86 |
|
* To free any data structures and clear the parser, use mg_clear. |
87 |
< |
* If there is an error, mg_load, mg_open, mg_parse, and mg_rewind |
88 |
< |
* will return an error from the list above. In addition, mg_load |
89 |
< |
* will report the error to stderr. The mg_read routine returns 0 |
90 |
< |
* when the end of file has been reached. |
87 |
> |
* If there is an error, mg_load, mg_open, mg_parse, mg_handle and |
88 |
> |
* mg_rewind will return an error from the list above. In addition, |
89 |
> |
* mg_load will report the error to stderr. The mg_read routine |
90 |
> |
* returns 0 when the end of file has been reached. |
91 |
|
*/ |
92 |
|
|
93 |
< |
#define MG_MAXLINE 512 /* maximum input line length */ |
93 |
> |
#define MG_MAXLINE 4096 /* maximum input line length */ |
94 |
|
#define MG_MAXARGC (MG_MAXLINE/4) /* maximum argument count */ |
95 |
|
|
96 |
|
typedef struct mg_fctxt { |
195 |
|
#define C_CNSS 41 /* number of spectral samples */ |
196 |
|
#define C_CWLI ((C_CMAXWL-C_CMINWL)/(C_CNSS-1)) |
197 |
|
#define C_CMAXV 10000 /* nominal maximum sample value */ |
198 |
+ |
#define C_CLPWM (683./C_CMAXV) /* peak lumens/watt multiplier */ |
199 |
|
|
200 |
|
#define C_CSSPEC 01 /* flag if spectrum is set */ |
201 |
|
#define C_CDSPEC 02 /* flag if defined w/ spectrum */ |
202 |
|
#define C_CSXY 04 /* flag if xy is set */ |
203 |
|
#define C_CDXY 010 /* flag if defined w/ xy */ |
204 |
+ |
#define C_CSEFF 020 /* flag if efficacy set */ |
205 |
|
|
206 |
|
typedef struct { |
207 |
|
int clock; /* incremented each change */ |
208 |
< |
short flags; /* what's been set */ |
209 |
< |
short ssamp[C_CNSS]; /* spectral samples, min wl to max */ |
210 |
< |
long ssum; /* straight sum of spectral values */ |
208 |
> |
unsigned short flags; /* what's been set */ |
209 |
> |
unsigned short ssamp[C_CNSS]; /* spectral samples, min wl to max */ |
210 |
> |
unsigned long ssum; /* straight sum of spectral values */ |
211 |
|
float cx, cy; /* xy chromaticity value */ |
212 |
+ |
float eff; /* efficacy (lumens/watt) */ |
213 |
|
} C_COLOR; |
214 |
|
|
215 |
< |
#define C_DEFCOLOR { 1, C_CDXY|C_CSXY|C_CSSPEC,\ |
215 |
> |
#define C_DEFCOLOR { 1, C_CDXY|C_CSXY|C_CSSPEC|C_CSEFF,\ |
216 |
|
{C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\ |
217 |
|
C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\ |
218 |
|
C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\ |
220 |
|
C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\ |
221 |
|
C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\ |
222 |
|
C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\ |
223 |
< |
(long)C_CNSS*C_CMAXV, 1./3., 1./3. } |
223 |
> |
(long)C_CNSS*C_CMAXV, 1./3., 1./3., 178.006 } |
224 |
|
|
225 |
< |
#define C_CIEX { 1, C_CDSPEC|C_CSSPEC|C_CSXY,\ |
225 |
> |
#define C_CIEX { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\ |
226 |
|
{14,42,143,435,1344,2839,3483,3362,2908,1954,956,\ |
227 |
|
320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\ |
228 |
|
10622,10026,8544,6424,4479,2835,1649,874,468,227,\ |
229 |
< |
114,58,29,14,7,3,2,1,0}, 106836L, .735, .265 } |
229 |
> |
114,58,29,14,7,3,2,1,0}, 106836L, .467, .368, 362.230 } |
230 |
|
|
231 |
< |
#define C_CIEY { 1, C_CDSPEC|C_CSSPEC|C_CSXY,\ |
231 |
> |
#define C_CIEY { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\ |
232 |
|
{0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\ |
233 |
|
5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\ |
234 |
|
5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\ |
235 |
< |
5,2,1,1,0,0}, 106856L, .274, .717 } |
235 |
> |
5,2,1,1,0,0}, 106856L, .398, .542, 493.525 } |
236 |
|
|
237 |
< |
#define C_CIEZ { 1, C_CDSPEC|C_CSSPEC|C_CSXY,\ |
237 |
> |
#define C_CIEZ { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF,\ |
238 |
|
{65,201,679,2074,6456,13856,17471,17721,16692,\ |
239 |
|
12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\ |
240 |
|
11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},\ |
241 |
< |
106770L, .167, .009 } |
241 |
> |
106770L, .147, .077, 54.363 } |
242 |
|
|
243 |
< |
#define c_cval(c,l) ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->sum) |
243 |
> |
#define c_cval(c,l) ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->ssum) |
244 |
|
|
245 |
|
typedef struct { |
246 |
|
int clock; /* incremented each change -- resettable */ |
333 |
|
|
334 |
|
/* regular transformation */ |
335 |
|
typedef struct { |
336 |
< |
MAT4 xfm; /* transform matrix */ |
337 |
< |
FLOAT sca; /* scalefactor */ |
336 |
> |
MAT4 xfm; /* transform matrix */ |
337 |
> |
FLOAT sca; /* scalefactor */ |
338 |
|
} XF; |
339 |
|
|
340 |
|
#define identxf(xp) (void)(setident4((xp)->xfm),(xp)->sca=1.0) |
354 |
|
long xid; /* unique transform id */ |
355 |
|
short xav0; /* zeroeth argument in xf_argv array */ |
356 |
|
short xac; /* transform argument count */ |
357 |
+ |
short rev; /* boolean true if vertices reversed */ |
358 |
|
XF xf; /* cumulative transformation */ |
359 |
|
struct xf_array *xarr; /* transformation array pointer */ |
360 |
|
struct xf_spec *prev; /* previous transformation context */ |