36 |
|
static LUTAB mat_tab = LU_SINIT(free,free); /* material lookup table */ |
37 |
|
static LUTAB vtx_tab = LU_SINIT(free,free); /* vertex lookup table */ |
38 |
|
|
39 |
< |
/* CIE 1931 Standard Observer */ |
40 |
< |
static C_COLOR cie_xf = C_CIEX; |
41 |
< |
static C_COLOR cie_yf = C_CIEY; |
42 |
< |
static C_COLOR cie_zf = C_CIEZ; |
39 |
> |
/* CIE 1931 Standard Observer curves */ |
40 |
> |
static C_COLOR cie_xf = { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
41 |
> |
{14,42,143,435,1344,2839,3483,3362,2908,1954,956, |
42 |
> |
320,49,93,633,1655,2904,4334,5945,7621,9163,10263, |
43 |
> |
10622,10026,8544,6424,4479,2835,1649,874,468,227, |
44 |
> |
114,58,29,14,7,3,2,1,0}, 106836L, .467, .368, 362.230 |
45 |
> |
}; |
46 |
> |
static C_COLOR cie_yf = { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
47 |
> |
{0,1,4,12,40,116,230,380,600,910,1390,2080,3230, |
48 |
> |
5030,7100,8620,9540,9950,9950,9520,8700,7570,6310, |
49 |
> |
5030,3810,2650,1750,1070,610,320,170,82,41,21,10, |
50 |
> |
5,2,1,1,0,0}, 106856L, .398, .542, 493.525 |
51 |
> |
}; |
52 |
> |
static C_COLOR cie_zf = { 1, C_CDSPEC|C_CSSPEC|C_CSXY|C_CSEFF, |
53 |
> |
{65,201,679,2074,6456,13856,17471,17721,16692, |
54 |
> |
12876,8130,4652,2720,1582,782,422,203,87,39,21,17, |
55 |
> |
11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, |
56 |
> |
106770L, .147, .077, 54.363 |
57 |
> |
}; |
58 |
> |
/* Derived CIE 1931 Primaries (imaginary) */ |
59 |
> |
static C_COLOR cie_xp = { 1, C_CDSPEC|C_CSSPEC|C_CSXY, |
60 |
> |
{-174,-198,-195,-197,-202,-213,-235,-272,-333, |
61 |
> |
-444,-688,-1232,-2393,-4497,-6876,-6758,-5256, |
62 |
> |
-3100,-815,1320,3200,4782,5998,6861,7408,7754, |
63 |
> |
7980,8120,8199,8240,8271,8292,8309,8283,8469, |
64 |
> |
8336,8336,8336,8336,8336,8336}, |
65 |
> |
127424L, 1., .0, |
66 |
> |
}; |
67 |
> |
static C_COLOR cie_yp = { 1, C_CDSPEC|C_CSSPEC|C_CSXY, |
68 |
> |
{-451,-431,-431,-430,-427,-417,-399,-366,-312, |
69 |
> |
-204,57,691,2142,4990,8810,9871,9122,7321,5145, |
70 |
> |
3023,1123,-473,-1704,-2572,-3127,-3474,-3704, |
71 |
> |
-3846,-3927,-3968,-3999,-4021,-4038,-4012,-4201, |
72 |
> |
-4066,-4066,-4066,-4066,-4066,-4066}, |
73 |
> |
-23035L, .0, 1., |
74 |
> |
}; |
75 |
> |
static C_COLOR cie_zp = { 1, C_CDSPEC|C_CSSPEC|C_CSXY, |
76 |
> |
{4051,4054,4052,4053,4054,4056,4059,4064,4071, |
77 |
> |
4074,4056,3967,3677,2933,1492,313,-440,-795, |
78 |
> |
-904,-918,-898,-884,-869,-863,-855,-855,-851, |
79 |
> |
-848,-847,-846,-846,-846,-845,-846,-843,-845, |
80 |
> |
-845,-845,-845,-845,-845}, |
81 |
> |
36057L, .0, .0, |
82 |
> |
}; |
83 |
|
|
84 |
|
static int setspectrum(); |
85 |
|
static int setbbtemp(); |
105 |
|
c_ccname = NULL; |
106 |
|
return(MG_OK); |
107 |
|
} |
108 |
+ |
if (!isname(av[1])) |
109 |
+ |
return(MG_EILL); |
110 |
|
lp = lu_find(&clr_tab, av[1]); /* lookup context */ |
111 |
|
if (lp == NULL) |
112 |
|
return(MG_EMEM); |
223 |
|
c_cmname = NULL; |
224 |
|
return(MG_OK); |
225 |
|
} |
226 |
+ |
if (!isname(av[1])) |
227 |
+ |
return(MG_EILL); |
228 |
|
lp = lu_find(&mat_tab, av[1]); /* lookup context */ |
229 |
|
if (lp == NULL) |
230 |
|
return(MG_EMEM); |
263 |
|
*c_cmaterial = *(C_MATERIAL *)lp->data; |
264 |
|
c_cmaterial->clock = i + 1; |
265 |
|
return(MG_OK); |
266 |
+ |
case MG_E_IR: /* set index of refraction */ |
267 |
+ |
if (ac != 3) |
268 |
+ |
return(MG_EARGC); |
269 |
+ |
if (!isflt(av[1]) | !isflt(av[2])) |
270 |
+ |
return(MG_ETYPE); |
271 |
+ |
c_cmaterial->nr = atof(av[1]); |
272 |
+ |
c_cmaterial->ni = atof(av[2]); |
273 |
+ |
if (c_cmaterial->nr <= FTINY) |
274 |
+ |
return(MG_EILL); |
275 |
+ |
c_cmaterial->clock++; |
276 |
+ |
return(MG_OK); |
277 |
|
case MG_E_RD: /* set diffuse reflectance */ |
278 |
|
if (ac != 2) |
279 |
|
return(MG_EARGC); |
370 |
|
c_cvname = NULL; |
371 |
|
return(MG_OK); |
372 |
|
} |
373 |
+ |
if (!isname(av[1])) |
374 |
+ |
return(MG_EILL); |
375 |
|
lp = lu_find(&vtx_tab, av[1]); /* lookup context */ |
376 |
|
if (lp == NULL) |
377 |
|
return(MG_EMEM); |
529 |
|
clr->cy = y / z; |
530 |
|
clr->flags |= C_CSXY; |
531 |
|
} else if (fl & C_CSSPEC) { /* cxy -> cspec */ |
532 |
< |
z = (cie_xf.ssum + cie_yf.ssum + cie_zf.ssum) / 3.; |
533 |
< |
x = clr->cx * z / cie_xf.ssum; |
534 |
< |
y = clr->cy * z / cie_yf.ssum; |
478 |
< |
z = (1. - clr->cx - clr->cy) * z / cie_zf.ssum; |
532 |
> |
x = clr->cx; |
533 |
> |
y = clr->cy; |
534 |
> |
z = 1. - x - y; |
535 |
|
clr->ssum = 0; |
536 |
< |
for (i = 0; i < C_CNSS; i++) |
537 |
< |
clr->ssum += clr->ssamp[i] = |
538 |
< |
x * cie_xf.ssamp[i] + |
539 |
< |
y * cie_yf.ssamp[i] + |
540 |
< |
z * cie_zf.ssamp[i] + .5; |
536 |
> |
for (i = 0; i < C_CNSS; i++) { |
537 |
> |
clr->ssamp[i] = x*cie_xp.ssamp[i] + y*cie_yp.ssamp[i] |
538 |
> |
+ z*cie_zp.ssamp[i] + .5; |
539 |
> |
if (clr->ssamp[i] < 0) /* out of gamut! */ |
540 |
> |
clr->ssamp[i] = 0; |
541 |
> |
else |
542 |
> |
clr->ssum += clr->ssamp[i]; |
543 |
> |
} |
544 |
|
clr->flags |= C_CSSPEC; |
545 |
|
} |
546 |
|
if (fl & C_CSEFF) { /* compute efficacy */ |
547 |
< |
if (clr->flags & C_CDSPEC) { /* from spectrum */ |
547 |
> |
if (clr->flags & C_CSSPEC) { /* from spectrum */ |
548 |
|
y = 0.; |
549 |
|
for (i = 0; i < C_CNSS; i++) |
550 |
|
y += cie_yf.ssamp[i] * clr->ssamp[i]; |
551 |
|
clr->eff = C_CLPWM * y / clr->ssum; |
552 |
< |
} else /* clr->flags & C_CDXY */ { /* from (x,y) */ |
552 |
> |
} else /* clr->flags & C_CSXY */ { /* from (x,y) */ |
553 |
|
clr->eff = clr->cx*cie_xf.eff + clr->cy*cie_yf.eff + |
554 |
|
(1. - clr->cx - clr->cy)*cie_zf.eff; |
555 |
|
} |
571 |
|
int n, imax; |
572 |
|
int wl; |
573 |
|
double wl0, wlstep; |
574 |
+ |
double boxpos, boxstep; |
575 |
|
/* check bounds */ |
576 |
|
if (wlmax <= C_CMINWL | wlmax <= wlmin | wlmin >= C_CMAXWL) |
577 |
|
return(MG_EILL); |
584 |
|
wlmax -= wlstep; |
585 |
|
ac--; |
586 |
|
} |
527 |
– |
if (ac < 2) |
528 |
– |
return(MG_EILL); |
587 |
|
imax = ac; /* box filter if necessary */ |
588 |
+ |
boxpos = 0; |
589 |
+ |
boxstep = 1; |
590 |
|
if (wlstep < C_CWLI) { |
591 |
+ |
imax = (wlmax - wlmin)/C_CWLI + (1-FTINY); |
592 |
+ |
boxpos = (wlmin - C_CMINWL)/C_CWLI; |
593 |
+ |
boxstep = wlstep/C_CWLI; |
594 |
|
wlstep = C_CWLI; |
532 |
– |
imax = (wlmax - wlmin)/wlstep; |
595 |
|
} |
596 |
|
scale = 0.; /* get values and maximum */ |
597 |
|
pos = 0; |
598 |
|
for (i = 0; i < imax; i++) { |
599 |
|
va[i] = 0.; n = 0; |
600 |
< |
while (pos < (i+.5)*ac/imax) { |
600 |
> |
while (boxpos < i+.5 && pos < ac) { |
601 |
|
if (!isflt(av[pos])) |
602 |
|
return(MG_ETYPE); |
603 |
|
va[i] += atof(av[pos++]); |
604 |
|
n++; |
605 |
+ |
boxpos += boxstep; |
606 |
|
} |
607 |
|
if (n > 1) |
608 |
|
va[i] /= (double)n; |
611 |
|
if (va[i] > scale) |
612 |
|
scale = va[i]; |
613 |
|
} |
614 |
< |
if (scale == 0.) |
614 |
> |
if (scale <= FTINY) |
615 |
|
return(MG_EILL); |
616 |
|
scale = C_CMAXV / scale; |
617 |
|
clr->ssum = 0; /* convert to our spacing */ |