| 5 |
|
* Shading for materials with arbitrary BRDF's |
| 6 |
|
*/ |
| 7 |
|
|
| 8 |
< |
/* ==================================================================== |
| 9 |
< |
* The Radiance Software License, Version 1.0 |
| 10 |
< |
* |
| 11 |
< |
* Copyright (c) 1990 - 2002 The Regents of the University of California, |
| 12 |
< |
* through Lawrence Berkeley National Laboratory. All rights reserved. |
| 13 |
< |
* |
| 14 |
< |
* Redistribution and use in source and binary forms, with or without |
| 15 |
< |
* modification, are permitted provided that the following conditions |
| 16 |
< |
* are met: |
| 17 |
< |
* |
| 18 |
< |
* 1. Redistributions of source code must retain the above copyright |
| 19 |
< |
* notice, this list of conditions and the following disclaimer. |
| 20 |
< |
* |
| 21 |
< |
* 2. Redistributions in binary form must reproduce the above copyright |
| 22 |
< |
* notice, this list of conditions and the following disclaimer in |
| 23 |
< |
* the documentation and/or other materials provided with the |
| 24 |
< |
* distribution. |
| 25 |
< |
* |
| 26 |
< |
* 3. The end-user documentation included with the redistribution, |
| 27 |
< |
* if any, must include the following acknowledgment: |
| 28 |
< |
* "This product includes Radiance software |
| 29 |
< |
* (http://radsite.lbl.gov/) |
| 30 |
< |
* developed by the Lawrence Berkeley National Laboratory |
| 31 |
< |
* (http://www.lbl.gov/)." |
| 32 |
< |
* Alternately, this acknowledgment may appear in the software itself, |
| 33 |
< |
* if and wherever such third-party acknowledgments normally appear. |
| 34 |
< |
* |
| 35 |
< |
* 4. The names "Radiance," "Lawrence Berkeley National Laboratory" |
| 36 |
< |
* and "The Regents of the University of California" must |
| 37 |
< |
* not be used to endorse or promote products derived from this |
| 38 |
< |
* software without prior written permission. For written |
| 39 |
< |
* permission, please contact [email protected]. |
| 40 |
< |
* |
| 41 |
< |
* 5. Products derived from this software may not be called "Radiance", |
| 42 |
< |
* nor may "Radiance" appear in their name, without prior written |
| 43 |
< |
* permission of Lawrence Berkeley National Laboratory. |
| 44 |
< |
* |
| 45 |
< |
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED |
| 46 |
< |
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| 47 |
< |
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 48 |
< |
* DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR |
| 49 |
< |
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 50 |
< |
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 51 |
< |
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF |
| 52 |
< |
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 53 |
< |
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, |
| 54 |
< |
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT |
| 55 |
< |
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| 56 |
< |
* SUCH DAMAGE. |
| 57 |
< |
* ==================================================================== |
| 58 |
< |
* |
| 59 |
< |
* This software consists of voluntary contributions made by many |
| 60 |
< |
* individuals on behalf of Lawrence Berkeley National Laboratory. For more |
| 61 |
< |
* information on Lawrence Berkeley National Laboratory, please see |
| 62 |
< |
* <http://www.lbl.gov/>. |
| 63 |
< |
*/ |
| 8 |
> |
#include "copyright.h" |
| 9 |
|
|
| 10 |
|
#include "ray.h" |
| 11 |
< |
|
| 11 |
> |
#include "ambient.h" |
| 12 |
|
#include "data.h" |
| 13 |
< |
|
| 13 |
> |
#include "source.h" |
| 14 |
|
#include "otypes.h" |
| 15 |
< |
|
| 15 |
> |
#include "rtotypes.h" |
| 16 |
|
#include "func.h" |
| 17 |
+ |
#include "pmapmat.h" |
| 18 |
|
|
| 19 |
|
/* |
| 20 |
|
* Arguments to this material include the color and specularity. |
| 39 |
|
* Arguments for MAT_TFUNC are: |
| 40 |
|
* 2+ func funcfile transform |
| 41 |
|
* 0 |
| 42 |
< |
* 4+ red grn blu rspec trans tspec A7 .. |
| 42 |
> |
* 6+ red grn blu rspec trans tspec A7 .. |
| 43 |
|
* |
| 44 |
|
* Arguments for MAT_TDATA are: |
| 45 |
|
* 4+ func datafile funcfile v0 .. transform |
| 46 |
|
* 0 |
| 47 |
< |
* 4+ red grn blu rspec trans tspec A7 .. |
| 47 |
> |
* 6+ red grn blu rspec trans tspec A7 .. |
| 48 |
|
* |
| 49 |
|
* Arguments for the more general MAT_BRTDF are: |
| 50 |
|
* 10+ rrefl grefl brefl |
| 78 |
|
} BRDFDAT; /* BRDF material data */ |
| 79 |
|
|
| 80 |
|
|
| 81 |
+ |
static int setbrdfunc(BRDFDAT *np); |
| 82 |
+ |
|
| 83 |
+ |
|
| 84 |
|
static void |
| 85 |
< |
dirbrdf(cval, np, ldir, omega) /* compute source contribution */ |
| 86 |
< |
COLOR cval; /* returned coefficient */ |
| 87 |
< |
register BRDFDAT *np; /* material data */ |
| 88 |
< |
FVECT ldir; /* light source direction */ |
| 89 |
< |
double omega; /* light source size */ |
| 85 |
> |
dirbrdf( /* compute source contribution */ |
| 86 |
> |
COLOR cval, /* returned coefficient */ |
| 87 |
> |
void *nnp, /* material data */ |
| 88 |
> |
FVECT ldir, /* light source direction */ |
| 89 |
> |
double omega /* light source size */ |
| 90 |
> |
) |
| 91 |
|
{ |
| 92 |
+ |
BRDFDAT *np = nnp; |
| 93 |
|
double ldot; |
| 94 |
|
double dtmp; |
| 95 |
|
COLOR ctmp; |
| 96 |
|
FVECT ldx; |
| 97 |
|
static double vldx[5], pt[MAXDIM]; |
| 98 |
< |
register char **sa; |
| 99 |
< |
register int i; |
| 98 |
> |
char **sa; |
| 99 |
> |
int i; |
| 100 |
|
#define lddx (vldx+1) |
| 101 |
|
|
| 102 |
|
setcolor(cval, 0.0, 0.0, 0.0); |
| 128 |
|
scalecolor(ctmp, dtmp); |
| 129 |
|
addcolor(cval, ctmp); |
| 130 |
|
} |
| 131 |
< |
if (ldot > 0.0 ? np->rspec <= FTINY : np->tspec <= FTINY) |
| 132 |
< |
return; /* no specular component */ |
| 131 |
> |
if ((ldot > 0.0 ? np->rspec <= FTINY : np->tspec <= FTINY) || |
| 132 |
> |
ambRayInPmap(np->pr)) |
| 133 |
> |
return; /* diffuse only */ |
| 134 |
|
/* set up function */ |
| 135 |
|
setbrdfunc(np); |
| 136 |
|
sa = np->mp->oargs.sarg; |
| 142 |
|
lddx[3] = omega; |
| 143 |
|
/* compute BRTDF */ |
| 144 |
|
if (np->mp->otype == MAT_BRTDF) { |
| 145 |
< |
if (sa[6][0] == '0') /* special case */ |
| 145 |
> |
if (sa[6][0] == '0' && !sa[6][1]) /* special case */ |
| 146 |
|
colval(ctmp,RED) = 0.0; |
| 147 |
|
else |
| 148 |
|
colval(ctmp,RED) = funvalue(sa[6], 4, lddx); |
| 149 |
< |
if (!strcmp(sa[7],sa[6])) |
| 149 |
> |
if (sa[7][0] == '0' && !sa[7][1]) |
| 150 |
> |
colval(ctmp,GRN) = 0.0; |
| 151 |
> |
else if (!strcmp(sa[7],sa[6])) |
| 152 |
|
colval(ctmp,GRN) = colval(ctmp,RED); |
| 153 |
|
else |
| 154 |
|
colval(ctmp,GRN) = funvalue(sa[7], 4, lddx); |
| 155 |
< |
if (!strcmp(sa[8],sa[6])) |
| 155 |
> |
if (sa[8][0] == '0' && !sa[8][1]) |
| 156 |
> |
colval(ctmp,BLU) = 0.0; |
| 157 |
> |
else if (!strcmp(sa[8],sa[6])) |
| 158 |
|
colval(ctmp,BLU) = colval(ctmp,RED); |
| 159 |
|
else if (!strcmp(sa[8],sa[7])) |
| 160 |
|
colval(ctmp,BLU) = colval(ctmp,GRN); |
| 171 |
|
dtmp = funvalue(sa[0], 5, vldx); |
| 172 |
|
setcolor(ctmp, dtmp, dtmp, dtmp); |
| 173 |
|
} |
| 174 |
< |
if (errno) { |
| 174 |
> |
if ((errno == EDOM) | (errno == ERANGE)) { |
| 175 |
|
objerror(np->mp, WARNING, "compute error"); |
| 176 |
|
return; |
| 177 |
|
} |
| 181 |
|
/* |
| 182 |
|
* Compute reflected non-diffuse component. |
| 183 |
|
*/ |
| 184 |
< |
if (np->mp->otype == MAT_MFUNC | np->mp->otype == MAT_MDATA) |
| 184 |
> |
if ((np->mp->otype == MAT_MFUNC) | (np->mp->otype == MAT_MDATA)) |
| 185 |
|
multcolor(ctmp, np->mcolor); |
| 186 |
|
dtmp = ldot * omega * np->rspec; |
| 187 |
|
scalecolor(ctmp, dtmp); |
| 190 |
|
/* |
| 191 |
|
* Compute transmitted non-diffuse component. |
| 192 |
|
*/ |
| 193 |
< |
if (np->mp->otype == MAT_TFUNC | np->mp->otype == MAT_TDATA) |
| 193 |
> |
if ((np->mp->otype == MAT_TFUNC) | (np->mp->otype == MAT_TDATA)) |
| 194 |
|
multcolor(ctmp, np->mcolor); |
| 195 |
|
dtmp = -ldot * omega * np->tspec; |
| 196 |
|
scalecolor(ctmp, dtmp); |
| 201 |
|
|
| 202 |
|
|
| 203 |
|
int |
| 204 |
< |
m_brdf(m, r) /* color a ray that hit a BRDTfunc material */ |
| 205 |
< |
register OBJREC *m; |
| 206 |
< |
register RAY *r; |
| 204 |
> |
m_brdf( /* color a ray that hit a BRDTfunc material */ |
| 205 |
> |
OBJREC *m, |
| 206 |
> |
RAY *r |
| 207 |
> |
) |
| 208 |
|
{ |
| 209 |
|
int hitfront = 1; |
| 210 |
|
BRDFDAT nd; |
| 211 |
|
RAY sr; |
| 212 |
< |
double transtest, transdist; |
| 212 |
> |
double mirtest=0, mirdist=0; |
| 213 |
> |
double transtest=0, transdist=0; |
| 214 |
|
int hasrefl, hastrans; |
| 215 |
+ |
int hastexture; |
| 216 |
|
COLOR ctmp; |
| 217 |
|
FVECT vtmp; |
| 218 |
< |
register MFUNC *mf; |
| 219 |
< |
register int i; |
| 218 |
> |
double d; |
| 219 |
> |
MFUNC *mf; |
| 220 |
> |
int i; |
| 221 |
|
/* check arguments */ |
| 222 |
< |
if (m->oargs.nsargs < 10 | m->oargs.nfargs < 9) |
| 222 |
> |
if ((m->oargs.nsargs < 10) | (m->oargs.nfargs < 9)) |
| 223 |
|
objerror(m, USER, "bad # arguments"); |
| 224 |
|
nd.mp = m; |
| 225 |
|
nd.pr = r; |
| 239 |
|
setcolor(nd.tdiff, m->oargs.farg[6], |
| 240 |
|
m->oargs.farg[7], |
| 241 |
|
m->oargs.farg[8]); |
| 242 |
< |
/* get modifiers */ |
| 242 |
> |
/* get modifiers */ |
| 243 |
|
raytexture(r, m->omod); |
| 244 |
< |
nd.pdot = raynormal(nd.pnorm, r); /* perturb normal */ |
| 244 |
> |
hastexture = DOT(r->pert,r->pert) > FTINY*FTINY; |
| 245 |
> |
if (hastexture) { /* perturb normal */ |
| 246 |
> |
nd.pdot = raynormal(nd.pnorm, r); |
| 247 |
> |
} else { |
| 248 |
> |
VCOPY(nd.pnorm, r->ron); |
| 249 |
> |
nd.pdot = r->rod; |
| 250 |
> |
} |
| 251 |
|
if (r->rod < 0.0) { /* orient perturbed values */ |
| 252 |
|
nd.pdot = -nd.pdot; |
| 253 |
|
for (i = 0; i < 3; i++) { |
| 266 |
|
mf = getfunc(m, 9, 0x3f, 0); |
| 267 |
|
/* compute transmitted ray */ |
| 268 |
|
setbrdfunc(&nd); |
| 303 |
– |
transtest = 0; |
| 304 |
– |
transdist = r->rot; |
| 269 |
|
errno = 0; |
| 270 |
|
setcolor(ctmp, evalue(mf->ep[3]), |
| 271 |
|
evalue(mf->ep[4]), |
| 272 |
|
evalue(mf->ep[5])); |
| 273 |
< |
if (errno) |
| 273 |
> |
if ((errno == EDOM) | (errno == ERANGE)) |
| 274 |
|
objerror(m, WARNING, "compute error"); |
| 275 |
< |
else if (rayorigin(&sr, r, TRANS, bright(ctmp)) == 0) { |
| 276 |
< |
if (!(r->crtype & SHADOW) && |
| 277 |
< |
DOT(r->pert,r->pert) > FTINY*FTINY) { |
| 278 |
< |
for (i = 0; i < 3; i++) /* perturb direction */ |
| 315 |
< |
sr.rdir[i] = r->rdir[i] - .75*r->pert[i]; |
| 275 |
> |
else if (rayorigin(&sr, TRANS, r, ctmp) == 0) { |
| 276 |
> |
if (!(r->crtype & SHADOW) && hastexture) { |
| 277 |
> |
/* perturb direction */ |
| 278 |
> |
VSUM(sr.rdir, r->rdir, r->pert, -.75); |
| 279 |
|
if (normalize(sr.rdir) == 0.0) { |
| 280 |
|
objerror(m, WARNING, "illegal perturbation"); |
| 281 |
|
VCOPY(sr.rdir, r->rdir); |
| 282 |
|
} |
| 283 |
|
} else { |
| 284 |
|
VCOPY(sr.rdir, r->rdir); |
| 322 |
– |
transtest = 2; |
| 285 |
|
} |
| 286 |
|
rayvalue(&sr); |
| 287 |
< |
multcolor(sr.rcol, ctmp); |
| 287 |
> |
multcolor(sr.rcol, sr.rcoef); |
| 288 |
|
addcolor(r->rcol, sr.rcol); |
| 289 |
< |
transtest *= bright(sr.rcol); |
| 290 |
< |
transdist = r->rot + sr.rt; |
| 289 |
> |
if (!hastexture) { |
| 290 |
> |
transtest = 2.0*bright(sr.rcol); |
| 291 |
> |
transdist = r->rot + sr.rt; |
| 292 |
> |
} |
| 293 |
|
} |
| 294 |
|
if (r->crtype & SHADOW) /* the rest is shadow */ |
| 295 |
|
return(1); |
| 299 |
|
setcolor(ctmp, evalue(mf->ep[0]), |
| 300 |
|
evalue(mf->ep[1]), |
| 301 |
|
evalue(mf->ep[2])); |
| 302 |
< |
if (errno) |
| 302 |
> |
if ((errno == EDOM) | (errno == ERANGE)) |
| 303 |
|
objerror(m, WARNING, "compute error"); |
| 304 |
< |
else if (rayorigin(&sr, r, REFLECTED, bright(ctmp)) == 0) { |
| 305 |
< |
for (i = 0; i < 3; i++) |
| 306 |
< |
sr.rdir[i] = r->rdir[i] + 2.0*nd.pdot*nd.pnorm[i]; |
| 304 |
> |
else if (rayorigin(&sr, REFLECTED, r, ctmp) == 0) { |
| 305 |
> |
VSUM(sr.rdir, r->rdir, nd.pnorm, 2.*nd.pdot); |
| 306 |
> |
checknorm(sr.rdir); |
| 307 |
|
rayvalue(&sr); |
| 308 |
< |
multcolor(sr.rcol, ctmp); |
| 308 |
> |
multcolor(sr.rcol, sr.rcoef); |
| 309 |
|
addcolor(r->rcol, sr.rcol); |
| 310 |
+ |
if (!hastexture && r->ro != NULL && isflat(r->ro->otype)) { |
| 311 |
+ |
mirtest = 2.0*bright(sr.rcol); |
| 312 |
+ |
mirdist = r->rot + sr.rt; |
| 313 |
+ |
} |
| 314 |
|
} |
| 315 |
|
/* compute ambient */ |
| 316 |
|
if (hasrefl) { |
| 317 |
|
if (!hitfront) |
| 318 |
|
flipsurface(r); |
| 319 |
< |
ambient(ctmp, r, nd.pnorm); |
| 320 |
< |
multcolor(ctmp, nd.rdiff); |
| 319 |
> |
copycolor(ctmp, nd.rdiff); |
| 320 |
> |
multambient(ctmp, r, nd.pnorm); |
| 321 |
|
addcolor(r->rcol, ctmp); /* add to returned color */ |
| 322 |
|
if (!hitfront) |
| 323 |
|
flipsurface(r); |
| 328 |
|
vtmp[0] = -nd.pnorm[0]; |
| 329 |
|
vtmp[1] = -nd.pnorm[1]; |
| 330 |
|
vtmp[2] = -nd.pnorm[2]; |
| 331 |
< |
ambient(ctmp, r, vtmp); |
| 332 |
< |
multcolor(ctmp, nd.tdiff); |
| 331 |
> |
copycolor(ctmp, nd.tdiff); |
| 332 |
> |
multambient(ctmp, r, vtmp); |
| 333 |
|
addcolor(r->rcol, ctmp); |
| 334 |
|
if (hitfront) |
| 335 |
|
flipsurface(r); |
| 336 |
|
} |
| 337 |
|
if (hasrefl | hastrans || m->oargs.sarg[6][0] != '0') |
| 338 |
|
direct(r, dirbrdf, &nd); /* add direct component */ |
| 339 |
< |
/* check distance */ |
| 340 |
< |
if (transtest > bright(r->rcol)) |
| 339 |
> |
|
| 340 |
> |
d = bright(r->rcol); /* set effective distance */ |
| 341 |
> |
if (transtest > d) |
| 342 |
|
r->rt = transdist; |
| 343 |
+ |
else if (mirtest > d) |
| 344 |
+ |
r->rt = mirdist; |
| 345 |
|
|
| 346 |
|
return(1); |
| 347 |
|
} |
| 349 |
|
|
| 350 |
|
|
| 351 |
|
int |
| 352 |
< |
m_brdf2(m, r) /* color a ray that hit a BRDF material */ |
| 353 |
< |
register OBJREC *m; |
| 354 |
< |
register RAY *r; |
| 352 |
> |
m_brdf2( /* color a ray that hit a BRDF material */ |
| 353 |
> |
OBJREC *m, |
| 354 |
> |
RAY *r |
| 355 |
> |
) |
| 356 |
|
{ |
| 357 |
|
BRDFDAT nd; |
| 358 |
|
COLOR ctmp; |
| 362 |
|
if (r->crtype & SHADOW) |
| 363 |
|
return(1); |
| 364 |
|
/* check arguments */ |
| 365 |
< |
if (m->oargs.nsargs < (hasdata(m->otype)?4:2) | m->oargs.nfargs < |
| 366 |
< |
(m->otype==MAT_TFUNC|m->otype==MAT_TDATA?6:4)) |
| 365 |
> |
if ((m->oargs.nsargs < (hasdata(m->otype)?4:2)) | (m->oargs.nfargs < |
| 366 |
> |
((m->otype==MAT_TFUNC)|(m->otype==MAT_TDATA)?6:4))) |
| 367 |
|
objerror(m, USER, "bad # arguments"); |
| 368 |
+ |
/* check for back side */ |
| 369 |
+ |
if (r->rod < 0.0) { |
| 370 |
+ |
if (!backvis) { |
| 371 |
+ |
raytrans(r); |
| 372 |
+ |
return(1); |
| 373 |
+ |
} |
| 374 |
+ |
raytexture(r, m->omod); |
| 375 |
+ |
flipsurface(r); /* reorient if backvis */ |
| 376 |
+ |
} else |
| 377 |
+ |
raytexture(r, m->omod); |
| 378 |
+ |
|
| 379 |
|
nd.mp = m; |
| 380 |
|
nd.pr = r; |
| 381 |
|
/* get material color */ |
| 385 |
|
/* get specular component */ |
| 386 |
|
nd.rspec = m->oargs.farg[3]; |
| 387 |
|
/* compute transmittance */ |
| 388 |
< |
if (m->otype == MAT_TFUNC | m->otype == MAT_TDATA) { |
| 388 |
> |
if ((m->otype == MAT_TFUNC) | (m->otype == MAT_TDATA)) { |
| 389 |
|
nd.trans = m->oargs.farg[4]*(1.0 - nd.rspec); |
| 390 |
|
nd.tspec = nd.trans * m->oargs.farg[5]; |
| 391 |
|
dtmp = nd.trans - nd.tspec; |
| 397 |
|
/* compute reflectance */ |
| 398 |
|
dtmp = 1.0 - nd.trans - nd.rspec; |
| 399 |
|
setcolor(nd.rdiff, dtmp, dtmp, dtmp); |
| 417 |
– |
/* check for back side */ |
| 418 |
– |
if (r->rod < 0.0) { |
| 419 |
– |
if (!backvis && m->otype != MAT_TFUNC |
| 420 |
– |
&& m->otype != MAT_TDATA) { |
| 421 |
– |
raytrans(r); |
| 422 |
– |
return(1); |
| 423 |
– |
} |
| 424 |
– |
flipsurface(r); /* reorient if backvis */ |
| 425 |
– |
} |
| 426 |
– |
/* get modifiers */ |
| 427 |
– |
raytexture(r, m->omod); |
| 400 |
|
nd.pdot = raynormal(nd.pnorm, r); /* perturb normal */ |
| 401 |
|
multcolor(nd.mcolor, r->pcol); /* modify material color */ |
| 402 |
|
multcolor(nd.rdiff, nd.mcolor); |
| 411 |
|
} |
| 412 |
|
/* compute ambient */ |
| 413 |
|
if (nd.trans < 1.0-FTINY) { |
| 414 |
< |
ambient(ctmp, r, nd.pnorm); |
| 414 |
> |
copycolor(ctmp, nd.mcolor); /* modified by material color */ |
| 415 |
|
scalecolor(ctmp, 1.0-nd.trans); |
| 416 |
< |
multcolor(ctmp, nd.mcolor); /* modified by material color */ |
| 416 |
> |
multambient(ctmp, r, nd.pnorm); |
| 417 |
|
addcolor(r->rcol, ctmp); /* add to returned color */ |
| 418 |
|
} |
| 419 |
|
if (nd.trans > FTINY) { /* from other side */ |
| 421 |
|
vtmp[0] = -nd.pnorm[0]; |
| 422 |
|
vtmp[1] = -nd.pnorm[1]; |
| 423 |
|
vtmp[2] = -nd.pnorm[2]; |
| 424 |
< |
ambient(ctmp, r, vtmp); |
| 424 |
> |
copycolor(ctmp, nd.mcolor); |
| 425 |
|
scalecolor(ctmp, nd.trans); |
| 426 |
< |
multcolor(ctmp, nd.mcolor); |
| 426 |
> |
multambient(ctmp, r, vtmp); |
| 427 |
|
addcolor(r->rcol, ctmp); |
| 428 |
|
flipsurface(r); |
| 429 |
|
} |
| 434 |
|
} |
| 435 |
|
|
| 436 |
|
|
| 437 |
< |
int |
| 438 |
< |
setbrdfunc(np) /* set up brdf function and variables */ |
| 439 |
< |
register BRDFDAT *np; |
| 437 |
> |
static int |
| 438 |
> |
setbrdfunc( /* set up brdf function and variables */ |
| 439 |
> |
BRDFDAT *np |
| 440 |
> |
) |
| 441 |
|
{ |
| 442 |
|
FVECT vec; |
| 443 |
|
|
