82 |
|
|
83 |
|
/* Jitter ray sample according to projected solid angle and specjitter */ |
84 |
|
static void |
85 |
< |
bsdf_jitter(FVECT vres, BSDFDAT *ndp, int domax) |
85 |
> |
bsdf_jitter(FVECT vres, BSDFDAT *ndp, double sr_psa) |
86 |
|
{ |
87 |
– |
double sr_psa = ndp->sr_vpsa[domax]; |
88 |
– |
|
87 |
|
VCOPY(vres, ndp->vray); |
88 |
|
if (specjitter < 1.) |
89 |
|
sr_psa *= specjitter; |
101 |
|
int nsamp, ok = 0; |
102 |
|
FVECT vsrc, vsmp, vjit; |
103 |
|
double tomega; |
104 |
< |
double sf, sd[2]; |
104 |
> |
double sf, tsr, sd[2]; |
105 |
|
COLOR csmp; |
106 |
|
SDValue sv; |
107 |
|
SDError ec; |
109 |
|
/* transform source direction */ |
110 |
|
if (SDmapDir(vsrc, ndp->toloc, ldir) != SDEnone) |
111 |
|
return(0); |
112 |
+ |
/* assign number of samples */ |
113 |
+ |
ec = SDsizeBSDF(&tomega, ndp->vray, vsrc, SDqueryMin, ndp->sd); |
114 |
+ |
if (ec) |
115 |
+ |
goto baderror; |
116 |
|
/* check indirect over-counting */ |
117 |
|
if (ndp->thick != 0 && ndp->pr->crtype & (SPECULAR|AMBIENT) |
118 |
|
&& vsrc[2] > 0 ^ ndp->vray[2] > 0) { |
119 |
|
double dx = vsrc[0] + ndp->vray[0]; |
120 |
|
double dy = vsrc[1] + ndp->vray[1]; |
121 |
< |
if (dx*dx + dy*dy <= omega*(1./PI)) |
121 |
> |
if (dx*dx + dy*dy <= omega+tomega) |
122 |
|
return(0); |
123 |
|
} |
124 |
< |
/* get local BSDF resolution */ |
125 |
< |
ec = SDsizeBSDF(&tomega, ndp->vray, vsrc, SDqueryMin, ndp->sd); |
126 |
< |
if (ec) |
125 |
< |
goto baderror; |
126 |
< |
/* assign number of samples */ |
127 |
< |
if (tomega <= omega*.02) |
128 |
< |
nsamp = 50; |
124 |
> |
sf = specjitter * ndp->pr->rweight; |
125 |
> |
if (25.*tomega <= omega) |
126 |
> |
nsamp = 100.*sf + .5; |
127 |
|
else |
128 |
< |
nsamp = 2.*omega/tomega + 1.; |
129 |
< |
sf = sqrt(omega); |
128 |
> |
nsamp = 4.*sf*omega/tomega + .5; |
129 |
> |
nsamp += !nsamp; |
130 |
|
setcolor(cval, .0, .0, .0); /* sample our source area */ |
131 |
+ |
sf = sqrt(omega); |
132 |
+ |
tsr = sqrt(tomega); |
133 |
|
for (i = nsamp; i--; ) { |
134 |
|
VCOPY(vsmp, vsrc); /* jitter query directions */ |
135 |
|
if (nsamp > 1) { |
141 |
|
continue; |
142 |
|
} |
143 |
|
} |
144 |
< |
bsdf_jitter(vjit, ndp, 0); |
144 |
> |
bsdf_jitter(vjit, ndp, tsr); |
145 |
|
/* compute BSDF */ |
146 |
|
ec = SDevalBSDF(&sv, vjit, vsmp, ndp->sd); |
147 |
|
if (ec) |
157 |
|
return(ok); |
158 |
|
baderror: |
159 |
|
objerror(ndp->mp, USER, transSDError(ec)); |
160 |
+ |
return(0); /* gratis return */ |
161 |
|
} |
162 |
|
|
163 |
|
/* Compute source contribution for BSDF (reflected & transmitted) */ |
328 |
|
/* multiple samples? */ |
329 |
|
if (specjitter > 1.5) { |
330 |
|
nstarget = specjitter*ndp->pr->rweight + .5; |
331 |
< |
if (nstarget < 1) |
331 |
< |
nstarget = 1; |
331 |
> |
nstarget += !nstarget; |
332 |
|
} |
333 |
|
/* run through our samples */ |
334 |
|
for (nsent = 0; nsent < nstarget; nsent++) { |
335 |
< |
if (nstarget == 1) /* stratify random variable */ |
335 |
> |
if (nstarget == 1) { /* stratify random variable */ |
336 |
|
xrand = urand(ilhash(dimlist,ndims)+samplendx); |
337 |
< |
else |
337 |
> |
if (specjitter < 1.) |
338 |
> |
xrand = .5 + specjitter*(xrand-.5); |
339 |
> |
} else { |
340 |
|
xrand = (nsent + frandom())/(double)nstarget; |
341 |
+ |
} |
342 |
|
SDerrorDetail[0] = '\0'; /* sample direction & coef. */ |
343 |
< |
bsdf_jitter(vsmp, ndp, 0); |
343 |
> |
bsdf_jitter(vsmp, ndp, ndp->sr_vpsa[0]); |
344 |
|
ec = SDsampComponent(&bsv, vsmp, xrand, dcp); |
345 |
|
if (ec) |
346 |
|
objerror(ndp->mp, USER, transSDError(ec)); |
401 |
|
FVECT vjit; |
402 |
|
double d; |
403 |
|
COLOR ctmp; |
404 |
< |
bsdf_jitter(vjit, ndp, 1); |
404 |
> |
bsdf_jitter(vjit, ndp, ndp->sr_vpsa[1]); |
405 |
|
d = SDdirectHemi(vjit, sflags, ndp->sd); |
406 |
|
if (sflags == SDsampSpT) { |
407 |
|
copycolor(ctmp, ndp->pr->pcol); |