90 |
|
double dtmp; |
91 |
|
COLOR ctmp; |
92 |
|
FVECT ldx; |
93 |
< |
double lddx[3], pt[MAXDIM]; |
94 |
< |
double vldx[4]; |
93 |
> |
static double vldx[5], pt[MAXDIM]; |
94 |
|
register char **sa; |
95 |
|
register int i; |
96 |
+ |
#define lddx (vldx+1) |
97 |
|
|
98 |
|
setcolor(cval, 0.0, 0.0, 0.0); |
99 |
|
|
134 |
|
multv3(ldx, ldir, funcxf.xfm); |
135 |
|
for (i = 0; i < 3; i++) |
136 |
|
lddx[i] = ldx[i]/funcxf.sca; |
137 |
+ |
lddx[3] = omega; |
138 |
|
/* compute BRTDF */ |
139 |
|
if (np->mp->otype == MAT_BRTDF) { |
140 |
|
if (sa[6][0] == '0') /* special case */ |
141 |
|
colval(ctmp,RED) = 0.0; |
142 |
|
else |
143 |
< |
colval(ctmp,RED) = funvalue(sa[6], 3, lddx); |
143 |
> |
colval(ctmp,RED) = funvalue(sa[6], 4, lddx); |
144 |
|
if (!strcmp(sa[7],sa[6])) |
145 |
|
colval(ctmp,GRN) = colval(ctmp,RED); |
146 |
|
else |
147 |
< |
colval(ctmp,GRN) = funvalue(sa[7], 3, lddx); |
147 |
> |
colval(ctmp,GRN) = funvalue(sa[7], 4, lddx); |
148 |
|
if (!strcmp(sa[8],sa[6])) |
149 |
|
colval(ctmp,BLU) = colval(ctmp,RED); |
150 |
|
else if (!strcmp(sa[8],sa[7])) |
151 |
|
colval(ctmp,BLU) = colval(ctmp,GRN); |
152 |
|
else |
153 |
< |
colval(ctmp,BLU) = funvalue(sa[8], 3, lddx); |
153 |
> |
colval(ctmp,BLU) = funvalue(sa[8], 4, lddx); |
154 |
|
dtmp = bright(ctmp); |
155 |
|
} else if (np->dp == NULL) { |
156 |
< |
dtmp = funvalue(sa[0], 3, lddx); |
156 |
> |
dtmp = funvalue(sa[0], 4, lddx); |
157 |
|
setcolor(ctmp, dtmp, dtmp, dtmp); |
158 |
|
} else { |
159 |
|
for (i = 0; i < np->dp->nd; i++) |
160 |
< |
pt[i] = funvalue(sa[3+i], 3, lddx); |
160 |
> |
pt[i] = funvalue(sa[3+i], 4, lddx); |
161 |
|
vldx[0] = datavalue(np->dp, pt); |
162 |
< |
vldx[1] = lddx[0]; vldx[2] = lddx[1]; vldx[3] = lddx[2]; |
162 |
< |
dtmp = funvalue(sa[0], 4, vldx); |
162 |
> |
dtmp = funvalue(sa[0], 5, vldx); |
163 |
|
setcolor(ctmp, dtmp, dtmp, dtmp); |
164 |
|
} |
165 |
|
if (errno) { |
187 |
|
scalecolor(ctmp, dtmp); |
188 |
|
addcolor(cval, ctmp); |
189 |
|
} |
190 |
+ |
#undef lddx |
191 |
|
} |
192 |
|
|
193 |
|
|