1 |
– |
#ifndef lint |
1 |
|
static const char RCSid[] = "$Id$"; |
3 |
– |
#endif |
2 |
|
/* |
3 |
|
* ambient.c - routines dealing with ambient (inter-reflected) component. |
4 |
|
* |
12 |
|
#include "platform.h" |
13 |
|
#include "ray.h" |
14 |
|
#include "otypes.h" |
15 |
+ |
#include "otspecial.h" |
16 |
|
#include "resolu.h" |
17 |
|
#include "ambient.h" |
18 |
|
#include "random.h" |
19 |
+ |
#include "pmapamb.h" |
20 |
|
|
21 |
|
#ifndef OCTSCALE |
22 |
|
#define OCTSCALE 1.0 /* ceil((valid rad.)/(cube size)) */ |
23 |
|
#endif |
24 |
|
|
25 |
– |
extern char *shm_boundary; /* memory sharing boundary */ |
26 |
– |
|
25 |
|
#ifndef MAXASET |
26 |
< |
#define MAXASET 2047 /* maximum number of elements in ambient set */ |
26 |
> |
#define MAXASET 4095 /* maximum number of elements in ambient set */ |
27 |
|
#endif |
28 |
|
OBJECT ambset[MAXASET+1]={0}; /* ambient include/exclude set */ |
29 |
|
|
33 |
|
static AMBTREE atrunk; /* our ambient trunk node */ |
34 |
|
|
35 |
|
static FILE *ambfp = NULL; /* ambient file pointer */ |
36 |
< |
static int nunflshed = 0; /* number of unflushed ambient values */ |
36 |
> |
static int nunflshed; /* number of unflushed ambient values */ |
37 |
> |
static FILE *ambinp = NULL; /* input pointer for ambient i/o */ |
38 |
|
|
40 |
– |
#ifndef SORT_THRESH |
41 |
– |
#ifdef SMLMEM |
42 |
– |
#define SORT_THRESH ((3L<<20)/sizeof(AMBVAL)) |
43 |
– |
#else |
44 |
– |
#define SORT_THRESH ((9L<<20)/sizeof(AMBVAL)) |
45 |
– |
#endif |
46 |
– |
#endif |
47 |
– |
#ifndef SORT_INTVL |
48 |
– |
#define SORT_INTVL (SORT_THRESH<<1) |
49 |
– |
#endif |
50 |
– |
#ifndef MAX_SORT_INTVL |
51 |
– |
#define MAX_SORT_INTVL (SORT_INTVL<<6) |
52 |
– |
#endif |
53 |
– |
|
39 |
|
static double avsum = 0.; /* computed ambient value sum (log) */ |
40 |
|
static unsigned int navsum = 0; /* number of values in avsum */ |
41 |
|
static unsigned int nambvals = 0; /* total number of indirect values */ |
42 |
< |
static unsigned int nambshare = 0; /* number of values from file */ |
58 |
< |
static unsigned long ambclock = 0; /* ambient access clock */ |
59 |
< |
static unsigned long lastsort = 0; /* time of last value sort */ |
60 |
< |
static long sortintvl = SORT_INTVL; /* time until next sort */ |
61 |
< |
static FILE *ambinp = NULL; /* auxiliary file for input */ |
62 |
< |
static long lastpos = -1; /* last flush position */ |
42 |
> |
static off_t lastpos = -1; /* last flush position */ |
43 |
|
|
64 |
– |
#define MAXACLOCK (1L<<30) /* clock turnover value */ |
65 |
– |
/* |
66 |
– |
* Track access times unless we are sharing ambient values |
67 |
– |
* through memory on a multiprocessor, when we want to avoid |
68 |
– |
* claiming our own memory (copy on write). Go ahead anyway |
69 |
– |
* if more than two thirds of our values are unshared. |
70 |
– |
* Compile with -Dtracktime=0 to turn this code off. |
71 |
– |
*/ |
72 |
– |
#ifndef tracktime |
73 |
– |
#define tracktime (shm_boundary == NULL || nambvals > 3*nambshare) |
74 |
– |
#endif |
75 |
– |
|
44 |
|
#define AMBFLUSH (BUFSIZ/AMBVALSIZ) |
45 |
|
|
46 |
< |
#define newambval() (AMBVAL *)malloc(sizeof(AMBVAL)) |
47 |
< |
#define freeav(av) free((void *)av); |
46 |
> |
#define AVSIZE (sizeof(AMBVAL)-sizeof(SCOLOR)+sizeof(COLORV)*NCSAMP) |
47 |
> |
#define newambval() (AMBVAL *)malloc(AVSIZE) |
48 |
|
|
49 |
< |
static void initambfile(int creat); |
49 |
> |
#define tfunc(x0, x, x1) (((x)-(x0))/((x1)-(x0))) |
50 |
> |
|
51 |
> |
static void initambfile(int cre8); |
52 |
|
static void avsave(AMBVAL *av); |
53 |
|
static AMBVAL *avstore(AMBVAL *aval); |
54 |
|
static AMBTREE *newambtree(void); |
55 |
|
static void freeambtree(AMBTREE *atp); |
56 |
|
|
57 |
< |
typedef void unloadtf_t(void *); |
57 |
> |
typedef void unloadtf_t(AMBVAL *); |
58 |
|
static unloadtf_t avinsert; |
59 |
< |
static unloadtf_t av2list; |
59 |
> |
static unloadtf_t avfree; |
60 |
|
static void unloadatree(AMBTREE *at, unloadtf_t *f); |
61 |
|
|
62 |
< |
static int aposcmp(const void *avp1, const void *avp2); |
93 |
< |
static int avlmemi(AMBVAL *avaddr); |
94 |
< |
static void sortambvals(int always); |
62 |
> |
static void sortambvals(void); |
63 |
|
|
64 |
< |
#ifdef F_SETLKW |
65 |
< |
static void aflock(int typ); |
66 |
< |
#endif |
64 |
> |
static int plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, double ang); |
65 |
> |
static double sumambient(SCOLOR acol, RAY *r, FVECT rn, int al, |
66 |
> |
AMBTREE *at, FVECT c0, double s); |
67 |
> |
static int makeambient(SCOLOR acol, RAY *r, FVECT rn, int al); |
68 |
> |
static int extambient(SCOLOR cr, AMBVAL *ap, FVECT pv, FVECT nv, |
69 |
> |
FVECT uvw[3]); |
70 |
|
|
71 |
|
|
72 |
< |
extern void |
72 |
> |
void |
73 |
|
setambres( /* set ambient resolution */ |
74 |
|
int ar |
75 |
|
) |
78 |
|
/* set min & max radii */ |
79 |
|
if (ar <= 0) { |
80 |
|
minarad = 0; |
81 |
< |
maxarad = thescene.cusize / 2.0; |
81 |
> |
maxarad = thescene.cusize*0.2; |
82 |
|
} else { |
83 |
|
minarad = thescene.cusize / ar; |
84 |
< |
maxarad = 64 * minarad; /* heuristic */ |
85 |
< |
if (maxarad > thescene.cusize / 2.0) |
86 |
< |
maxarad = thescene.cusize / 2.0; |
84 |
> |
maxarad = 64.0 * minarad; /* heuristic */ |
85 |
> |
if (maxarad > thescene.cusize*0.2) |
86 |
> |
maxarad = thescene.cusize*0.2; |
87 |
|
} |
88 |
|
if (minarad <= FTINY) |
89 |
< |
minarad = 10*FTINY; |
89 |
> |
minarad = 10.0*FTINY; |
90 |
|
if (maxarad <= minarad) |
91 |
< |
maxarad = 64 * minarad; |
91 |
> |
maxarad = 64.0 * minarad; |
92 |
|
} |
93 |
|
|
94 |
|
|
95 |
< |
extern void |
95 |
> |
void |
96 |
|
setambacc( /* set ambient accuracy */ |
97 |
|
double newa |
98 |
|
) |
99 |
|
{ |
100 |
< |
double ambdiff; |
101 |
< |
|
102 |
< |
if (newa < 0.0) |
103 |
< |
newa = 0.0; |
104 |
< |
ambdiff = fabs(newa - ambacc); |
105 |
< |
if (ambdiff >= .01 && (ambacc = newa) > FTINY && nambvals > 0) |
106 |
< |
sortambvals(1); /* rebuild tree */ |
100 |
> |
static double olda; /* remember previous setting here */ |
101 |
> |
|
102 |
> |
newa *= (newa > 0); |
103 |
> |
if (fabs(newa - olda) >= .05*(newa + olda)) { |
104 |
> |
ambacc = newa; |
105 |
> |
if (ambacc > FTINY && nambvals > 0) |
106 |
> |
sortambvals(); /* rebuild tree */ |
107 |
> |
} |
108 |
|
} |
109 |
|
|
110 |
|
|
111 |
< |
extern void |
111 |
> |
void |
112 |
|
setambient(void) /* initialize calculation */ |
113 |
|
{ |
114 |
< |
int readonly = 0; |
115 |
< |
long pos, flen; |
114 |
> |
int exists; |
115 |
> |
off_t flen; |
116 |
|
AMBVAL amb; |
117 |
|
/* make sure we're fresh */ |
118 |
|
ambdone(); |
127 |
|
error(WARNING, errmsg); |
128 |
|
return; |
129 |
|
} |
130 |
< |
/* open ambient file */ |
131 |
< |
if ((ambfp = fopen(ambfile, "r+")) == NULL) |
132 |
< |
readonly = (ambfp = fopen(ambfile, "r")) != NULL; |
133 |
< |
if (ambfp != NULL) { |
134 |
< |
initambfile(0); /* file exists */ |
135 |
< |
pos = ftell(ambfp); |
130 |
> |
exists = access(ambfile, F_OK) == 0; /* check existence, first */ |
131 |
> |
ambfp = fopen(ambfile, "a+"); /* try read/append */ |
132 |
> |
if (!exists & (ambfp == NULL)) { |
133 |
> |
sprintf(errmsg, "cannot create ambient file \"%s\"", ambfile); |
134 |
> |
error(SYSTEM, errmsg); |
135 |
> |
} |
136 |
> |
if (ambfp == NULL) { /* try opening read-only? */ |
137 |
> |
if ((ambfp = fopen(ambfile, "r")) == NULL) { |
138 |
> |
sprintf(errmsg, |
139 |
> |
"cannot open ambient file \"%s\" for reading", |
140 |
> |
ambfile); |
141 |
> |
error(SYSTEM, errmsg); |
142 |
> |
} |
143 |
> |
exists = -1; /* flag read-only */ |
144 |
> |
} else if (exists) |
145 |
> |
rewind(ambfp); /* XXX not necessary? */ |
146 |
> |
|
147 |
> |
if (exists) { |
148 |
> |
initambfile(0); /* file already exists */ |
149 |
> |
lastpos = ftell(ambfp); |
150 |
|
while (readambval(&amb, ambfp)) |
151 |
< |
avinsert(avstore(&amb)); |
152 |
< |
nambshare = nambvals; /* share loaded values */ |
167 |
< |
if (readonly) { |
151 |
> |
avstore(&amb); /* load what we can */ |
152 |
> |
if (exists < 0) { /* read-only? */ |
153 |
|
sprintf(errmsg, |
154 |
|
"loaded %u values from read-only ambient file", |
155 |
|
nambvals); |
156 |
|
error(WARNING, errmsg); |
157 |
|
fclose(ambfp); /* close file so no writes */ |
158 |
|
ambfp = NULL; |
159 |
< |
return; /* avoid ambsync() */ |
159 |
> |
return; |
160 |
|
} |
161 |
|
/* align file pointer */ |
162 |
< |
pos += (long)nambvals*AMBVALSIZ; |
163 |
< |
flen = lseek(fileno(ambfp), (off_t)0, SEEK_END); |
164 |
< |
if (flen != pos) { |
162 |
> |
lastpos += (off_t)nambvals*AMBVALSIZ; |
163 |
> |
flen = lseek(fileno(ambfp), 0, SEEK_END); |
164 |
> |
if (flen != lastpos) { |
165 |
|
sprintf(errmsg, |
166 |
< |
"ignoring last %ld values in ambient file (corrupted)", |
167 |
< |
(flen - pos)/AMBVALSIZ); |
166 |
> |
"ignoring last %lu values in ambient file (corrupted)", |
167 |
> |
(unsigned long)((flen - lastpos)/AMBVALSIZ)); |
168 |
|
error(WARNING, errmsg); |
169 |
< |
fseek(ambfp, pos, 0); |
170 |
< |
#ifndef _WIN32 /* XXX we need a replacement for that one */ |
171 |
< |
ftruncate(fileno(ambfp), (off_t)pos); |
187 |
< |
#endif |
169 |
> |
/* fseek() not needed? */ |
170 |
> |
fseeko(ambfp, lastpos, SEEK_SET); |
171 |
> |
ftruncate(fileno(ambfp), lastpos); |
172 |
|
} |
189 |
– |
} else if ((ambfp = fopen(ambfile, "w+")) != NULL) { |
190 |
– |
initambfile(1); /* else create new file */ |
173 |
|
} else { |
174 |
< |
sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile); |
175 |
< |
error(SYSTEM, errmsg); |
174 |
> |
initambfile(1); /* else start new file */ |
175 |
> |
fflush(ambfp); |
176 |
> |
lastpos = ftell(ambfp); |
177 |
|
} |
195 |
– |
ambsync(); /* load previous values */ |
178 |
|
} |
179 |
|
|
180 |
|
|
181 |
< |
extern void |
181 |
> |
void |
182 |
|
ambdone(void) /* close ambient file and free memory */ |
183 |
|
{ |
184 |
|
if (ambfp != NULL) { /* close ambient file */ |
185 |
< |
ambsync(); |
204 |
< |
fclose(ambfp); |
185 |
> |
fclose(ambfp); /* don't call ambsync() */ |
186 |
|
ambfp = NULL; |
187 |
< |
if (ambinp != NULL) { |
187 |
> |
lastpos = -1; |
188 |
> |
if (ambinp != NULL) { |
189 |
|
fclose(ambinp); |
190 |
|
ambinp = NULL; |
191 |
|
} |
210 |
– |
lastpos = -1; |
192 |
|
} |
193 |
|
/* free ambient tree */ |
194 |
< |
unloadatree(&atrunk, free); |
194 |
> |
unloadatree(&atrunk, avfree); |
195 |
|
/* reset state variables */ |
196 |
|
avsum = 0.; |
197 |
|
navsum = 0; |
198 |
|
nambvals = 0; |
218 |
– |
nambshare = 0; |
219 |
– |
ambclock = 0; |
220 |
– |
lastsort = 0; |
221 |
– |
sortintvl = SORT_INTVL; |
199 |
|
} |
200 |
|
|
201 |
|
|
202 |
< |
extern void |
202 |
> |
void |
203 |
|
ambnotify( /* record new modifier */ |
204 |
|
OBJECT obj |
205 |
|
) |
206 |
|
{ |
207 |
|
static int hitlimit = 0; |
208 |
< |
register OBJREC *o; |
209 |
< |
register char **amblp; |
208 |
> |
OBJREC *o; |
209 |
> |
char **amblp; |
210 |
|
|
211 |
|
if (obj == OVOID) { /* starting over */ |
212 |
|
ambset[0] = 0; |
229 |
|
} |
230 |
|
|
231 |
|
|
232 |
< |
extern void |
232 |
> |
void |
233 |
|
multambient( /* compute ambient component & multiply by coef. */ |
234 |
< |
COLOR aval, |
235 |
< |
register RAY *r, |
234 |
> |
SCOLOR aval, |
235 |
> |
RAY *r, |
236 |
|
FVECT nrm |
237 |
|
) |
238 |
|
{ |
239 |
+ |
static double logAvgAbsorp = 1; |
240 |
|
static int rdepth = 0; /* ambient recursion */ |
241 |
< |
COLOR acol; |
241 |
> |
SCOLOR acol, caustic; |
242 |
> |
int i, ok; |
243 |
|
double d, l; |
244 |
|
|
245 |
+ |
/* PMAP: Factor in ambient from photon map, if enabled and ray is |
246 |
+ |
* ambient. Return as all ambient components accounted for, else |
247 |
+ |
* continue. */ |
248 |
+ |
if (ambPmap(aval, r, rdepth)) |
249 |
+ |
return; |
250 |
+ |
|
251 |
+ |
if (logAvgAbsorp > 0) /* exclude in -aw to avoid growth */ |
252 |
+ |
logAvgAbsorp = log(1.-AVGREFL); |
253 |
+ |
|
254 |
+ |
/* PMAP: Factor in specular-diffuse ambient (caustics) from photon |
255 |
+ |
* map, if enabled and ray is primary, else caustic is zero. Continue |
256 |
+ |
* with RADIANCE ambient calculation */ |
257 |
+ |
{/* XXX TEMPORARY */ |
258 |
+ |
COLOR pmc; |
259 |
+ |
scolor_color(pmc, aval); |
260 |
+ |
ambPmapCaustic(pmc, r, rdepth); |
261 |
+ |
setscolor(caustic, colval(pmc,RED), colval(pmc,GRN), colval(pmc,BLU)); |
262 |
+ |
} |
263 |
|
if (ambdiv <= 0) /* no ambient calculation */ |
264 |
|
goto dumbamb; |
265 |
|
/* check number of bounces */ |
270 |
|
ambincl != inset(ambset, r->ro->omod)) |
271 |
|
goto dumbamb; |
272 |
|
|
273 |
< |
if (ambacc <= FTINY) { /* no ambient storage */ |
274 |
< |
copycolor(acol, aval); |
273 |
> |
if (ambacc <= FTINY) { /* no ambient storage? */ |
274 |
> |
double rdot = DOT(nrm,r->ron); |
275 |
> |
int sgn = 1 - 2*(rdot < 0); |
276 |
> |
float dgrad[2], *dgp = NULL; |
277 |
> |
FVECT uvd[2]; |
278 |
> |
|
279 |
> |
if (sgn*rdot < 0.9999) |
280 |
> |
dgp = dgrad; /* compute rotational grad. */ |
281 |
> |
copyscolor(acol, aval); |
282 |
|
rdepth++; |
283 |
< |
d = doambient(acol, r, r->rweight, NULL, NULL); |
283 |
> |
ok = doambient(acol, r, r->rweight*sgn, |
284 |
> |
uvd, NULL, NULL, dgp, NULL); |
285 |
|
rdepth--; |
286 |
< |
if (d <= FTINY) |
286 |
> |
if (!ok) |
287 |
|
goto dumbamb; |
288 |
< |
copycolor(aval, acol); |
288 |
> |
if ((ok > 0) & (dgp != NULL)) { /* apply texture */ |
289 |
> |
FVECT v1; |
290 |
> |
VCROSS(v1, r->ron, nrm); |
291 |
> |
d = 1.0; |
292 |
> |
for (i = 3; i--; ) |
293 |
> |
d += sgn*v1[i] * (dgp[0]*uvd[0][i] + dgp[1]*uvd[1][i]); |
294 |
> |
if (d >= 0.05) |
295 |
> |
scalescolor(acol, d); |
296 |
> |
} |
297 |
> |
copyscolor(aval, acol); |
298 |
> |
|
299 |
> |
/* PMAP: add in caustic */ |
300 |
> |
saddscolor(aval, caustic); |
301 |
|
return; |
302 |
|
} |
286 |
– |
|
287 |
– |
if (tracktime) /* sort to minimize thrashing */ |
288 |
– |
sortambvals(0); |
303 |
|
/* interpolate ambient value */ |
304 |
< |
setcolor(acol, 0.0, 0.0, 0.0); |
304 |
> |
scolorblack(acol); |
305 |
|
d = sumambient(acol, r, nrm, rdepth, |
306 |
|
&atrunk, thescene.cuorg, thescene.cusize); |
307 |
+ |
|
308 |
|
if (d > FTINY) { |
309 |
< |
d = 1.0/d; |
310 |
< |
scalecolor(acol, d); |
311 |
< |
multcolor(aval, acol); |
309 |
> |
scalescolor(acol, 1.0/d); |
310 |
> |
smultscolor(aval, acol); |
311 |
> |
|
312 |
> |
/* PMAP: add in caustic */ |
313 |
> |
saddscolor(aval, caustic); |
314 |
|
return; |
315 |
|
} |
316 |
+ |
|
317 |
|
rdepth++; /* need to cache new value */ |
318 |
< |
d = makeambient(acol, r, nrm, rdepth-1); |
318 |
> |
ok = makeambient(acol, r, nrm, rdepth-1); |
319 |
|
rdepth--; |
320 |
< |
if (d > FTINY) { |
321 |
< |
multcolor(aval, acol); /* got new value */ |
320 |
> |
|
321 |
> |
if (ok) { |
322 |
> |
smultscolor(aval, acol); /* computed new value */ |
323 |
> |
|
324 |
> |
/* PMAP: add in caustic */ |
325 |
> |
saddscolor(aval, caustic); |
326 |
|
return; |
327 |
|
} |
328 |
+ |
|
329 |
|
dumbamb: /* return global value */ |
330 |
|
if ((ambvwt <= 0) | (navsum == 0)) { |
331 |
< |
multcolor(aval, ambval); |
331 |
> |
smultcolor(aval, ambval); |
332 |
> |
|
333 |
> |
/* PMAP: add in caustic */ |
334 |
> |
saddscolor(aval, caustic); |
335 |
|
return; |
336 |
|
} |
337 |
< |
l = bright(ambval); /* average in computations */ |
337 |
> |
|
338 |
> |
l = bright(ambval); /* average in computations */ |
339 |
|
if (l > FTINY) { |
340 |
< |
d = (log(l)*(double)ambvwt + avsum) / |
340 |
> |
d = (log(l)*(double)ambvwt + avsum + logAvgAbsorp*navsum) / |
341 |
|
(double)(ambvwt + navsum); |
342 |
|
d = exp(d) / l; |
343 |
< |
scalecolor(aval, d); |
344 |
< |
multcolor(aval, ambval); /* apply color of ambval */ |
343 |
> |
scalescolor(aval, d); |
344 |
> |
smultcolor(aval, ambval); /* apply color of ambval */ |
345 |
|
} else { |
346 |
< |
d = exp( avsum / (double)navsum ); |
347 |
< |
scalecolor(aval, d); /* neutral color */ |
346 |
> |
d = exp( avsum/(double)navsum + logAvgAbsorp ); |
347 |
> |
scalescolor(aval, d); /* neutral color */ |
348 |
|
} |
349 |
|
} |
350 |
|
|
351 |
|
|
352 |
< |
extern double |
353 |
< |
sumambient( /* get interpolated ambient value */ |
354 |
< |
COLOR acol, |
355 |
< |
register RAY *r, |
352 |
> |
/* Plug a potential leak where ambient cache value is occluded */ |
353 |
> |
static int |
354 |
> |
plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, double ang) |
355 |
> |
{ |
356 |
> |
const double cost70sq = 0.1169778; /* cos(70deg)^2 */ |
357 |
> |
RAY rtst; |
358 |
> |
FVECT vdif; |
359 |
> |
double normdot, ndotd, nadotd; |
360 |
> |
double a, b, c, t[2]; |
361 |
> |
|
362 |
> |
ang += 2.*PI*(ang < 0); /* check direction flags */ |
363 |
> |
if ( !(ap->corral>>(int)(ang*(16./PI)) & 1) ) |
364 |
> |
return(0); |
365 |
> |
/* |
366 |
> |
* Generate test ray, targeting 20 degrees above sample point plane |
367 |
> |
* along surface normal from cache position. This should be high |
368 |
> |
* enough to miss local geometry we don't really care about. |
369 |
> |
*/ |
370 |
> |
VSUB(vdif, ap->pos, r->rop); |
371 |
> |
normdot = DOT(anorm, r->ron); |
372 |
> |
ndotd = DOT(vdif, r->ron); |
373 |
> |
nadotd = DOT(vdif, anorm); |
374 |
> |
a = normdot*normdot - cost70sq; |
375 |
> |
b = 2.0*(normdot*ndotd - nadotd*cost70sq); |
376 |
> |
c = ndotd*ndotd - DOT(vdif,vdif)*cost70sq; |
377 |
> |
if (quadratic(t, a, b, c) != 2) |
378 |
> |
return(1); /* should rarely happen */ |
379 |
> |
if (t[1] <= FTINY) |
380 |
> |
return(0); /* should fail behind test */ |
381 |
> |
rayorigin(&rtst, SHADOW, r, NULL); |
382 |
> |
VSUM(rtst.rdir, vdif, anorm, t[1]); /* further dist. > plane */ |
383 |
> |
rtst.rmax = normalize(rtst.rdir); /* short ray test */ |
384 |
> |
while (localhit(&rtst, &thescene)) { /* check for occluder */ |
385 |
> |
OBJREC *m = findmaterial(rtst.ro); |
386 |
> |
if (m != NULL && !istransp(m) && !isBSDFproxy(m) && |
387 |
> |
(rtst.clipset == NULL || |
388 |
> |
!inset(rtst.clipset, rtst.ro->omod))) |
389 |
> |
return(1); /* plug light leak */ |
390 |
> |
VCOPY(rtst.rorg, rtst.rop); /* skip invisible surface */ |
391 |
> |
rtst.rmax -= rtst.rot; |
392 |
> |
rayclear(&rtst); |
393 |
> |
} |
394 |
> |
return(0); /* seems we're OK */ |
395 |
> |
} |
396 |
> |
|
397 |
> |
|
398 |
> |
static double |
399 |
> |
sumambient( /* get interpolated ambient value */ |
400 |
> |
SCOLOR acol, |
401 |
> |
RAY *r, |
402 |
|
FVECT rn, |
403 |
|
int al, |
404 |
|
AMBTREE *at, |
405 |
|
FVECT c0, |
406 |
|
double s |
407 |
|
) |
408 |
< |
{ |
409 |
< |
double d, e1, e2, wt, wsum; |
410 |
< |
COLOR ct; |
411 |
< |
FVECT ck0; |
412 |
< |
int i; |
413 |
< |
register int j; |
414 |
< |
register AMBVAL *av; |
408 |
> |
{ /* initial limit is 10 degrees plus ambacc radians */ |
409 |
> |
const double minangle = 10.0 * PI/180.; |
410 |
> |
const int sgn = 1 - 2*(DOT(r->ron,rn) < 0); |
411 |
> |
double maxangle = minangle + ambacc; |
412 |
> |
double wsum = 0.0; |
413 |
> |
FVECT ck0; |
414 |
> |
int i, j; |
415 |
> |
AMBVAL *av; |
416 |
|
|
417 |
< |
wsum = 0.0; |
418 |
< |
/* do this node */ |
417 |
> |
if (at->kid != NULL) { /* sum children first */ |
418 |
> |
s *= 0.5; |
419 |
> |
for (i = 0; i < 8; i++) { |
420 |
> |
for (j = 0; j < 3; j++) { |
421 |
> |
ck0[j] = c0[j]; |
422 |
> |
if (1<<j & i) |
423 |
> |
ck0[j] += s; |
424 |
> |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
425 |
> |
break; |
426 |
> |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
427 |
> |
break; |
428 |
> |
} |
429 |
> |
if (j == 3) |
430 |
> |
wsum += sumambient(acol, r, rn, al, |
431 |
> |
at->kid+i, ck0, s); |
432 |
> |
} |
433 |
> |
/* good enough? */ |
434 |
> |
if ((wsum >= 0.05) & (s*ambacc > minarad)) |
435 |
> |
return(wsum); |
436 |
> |
} |
437 |
> |
/* adjust maximum angle */ |
438 |
> |
if (at->alist != NULL && (at->alist->lvl <= al) & (r->rweight < 0.6)) |
439 |
> |
maxangle = (maxangle - PI/2.)*pow(r->rweight,0.13) + PI/2.; |
440 |
> |
/* sum this node */ |
441 |
|
for (av = at->alist; av != NULL; av = av->next) { |
442 |
< |
double rn_dot = -2.0; |
443 |
< |
if (tracktime) |
444 |
< |
av->latick = ambclock; |
442 |
> |
double u, v, d, delta_r2, delta_t2; |
443 |
> |
SCOLOR sct; |
444 |
> |
FVECT uvw[3]; |
445 |
|
/* |
446 |
< |
* Ambient level test. |
446 |
> |
* Ambient level test |
447 |
|
*/ |
448 |
< |
if (av->lvl > al) /* list sorted, so this works */ |
448 |
> |
if (av->lvl > al || /* list sorted, so this works */ |
449 |
> |
(av->lvl == al) & (av->weight < 0.9*r->rweight)) |
450 |
|
break; |
354 |
– |
if (av->weight < 0.9*r->rweight) |
355 |
– |
continue; |
451 |
|
/* |
452 |
< |
* Ambient radius test. |
452 |
> |
* Direction test using unperturbed normal |
453 |
|
*/ |
454 |
< |
d = av->pos[0] - r->rop[0]; |
455 |
< |
e1 = d * d; |
456 |
< |
d = av->pos[1] - r->rop[1]; |
362 |
< |
e1 += d * d; |
363 |
< |
d = av->pos[2] - r->rop[2]; |
364 |
< |
e1 += d * d; |
365 |
< |
e1 /= av->rad * av->rad; |
366 |
< |
if (e1 > ambacc*ambacc*1.21) |
454 |
> |
decodedir(uvw[2], av->ndir); |
455 |
> |
d = sgn * DOT(uvw[2], r->ron); |
456 |
> |
if (d <= 0.0) /* >= 90 degrees */ |
457 |
|
continue; |
458 |
+ |
delta_r2 = 2.0 - 2.0*d; /* approx. radians^2 */ |
459 |
+ |
if (delta_r2 >= maxangle*maxangle) |
460 |
+ |
continue; |
461 |
|
/* |
462 |
< |
* Direction test using closest normal. |
462 |
> |
* Modified ray behind test |
463 |
|
*/ |
464 |
< |
d = DOT(av->dir, r->ron); |
465 |
< |
if (rn != r->ron) { |
466 |
< |
rn_dot = DOT(av->dir, rn); |
374 |
< |
if (rn_dot > 1.0-FTINY) |
375 |
< |
rn_dot = 1.0-FTINY; |
376 |
< |
if (rn_dot >= d-FTINY) { |
377 |
< |
d = rn_dot; |
378 |
< |
rn_dot = -2.0; |
379 |
< |
} |
380 |
< |
} |
381 |
< |
e2 = (1.0 - d) * r->rweight; |
382 |
< |
if (e2 < 0.0) e2 = 0.0; |
383 |
< |
if (e1 + e2 > ambacc*ambacc*1.21) |
464 |
> |
VSUB(ck0, r->rop, av->pos); |
465 |
> |
d = DOT(ck0, uvw[2]); |
466 |
> |
if (d < -minarad*ambacc) |
467 |
|
continue; |
468 |
+ |
d /= av->rad[0]; |
469 |
+ |
delta_t2 = d*d; |
470 |
+ |
if (delta_t2 >= ambacc*ambacc) |
471 |
+ |
continue; |
472 |
|
/* |
473 |
< |
* Ray behind test. |
473 |
> |
* Elliptical radii test based on Hessian |
474 |
|
*/ |
475 |
< |
d = 0.0; |
476 |
< |
for (j = 0; j < 3; j++) |
477 |
< |
d += (r->rop[j] - av->pos[j]) * |
478 |
< |
(av->dir[j] + r->ron[j]); |
479 |
< |
if (d*0.5 < -minarad*ambacc-.001) |
475 |
> |
decodedir(uvw[0], av->udir); |
476 |
> |
VCROSS(uvw[1], uvw[2], uvw[0]); |
477 |
> |
d = (u = DOT(ck0, uvw[0])) / av->rad[0]; |
478 |
> |
delta_t2 += d*d; |
479 |
> |
d = (v = DOT(ck0, uvw[1])) / av->rad[1]; |
480 |
> |
delta_t2 += d*d; |
481 |
> |
if (delta_t2 >= ambacc*ambacc) |
482 |
|
continue; |
483 |
|
/* |
484 |
< |
* Jittering final test reduces image artifacts. |
484 |
> |
* Test for potential light leak |
485 |
|
*/ |
486 |
< |
e1 = sqrt(e1); |
398 |
< |
e2 = sqrt(e2); |
399 |
< |
wt = e1 + e2; |
400 |
< |
if (wt > ambacc*(.9+.2*urand(9015+samplendx))) |
486 |
> |
if (av->corral && plugaleak(r, av, uvw[2], atan2a(v,u))) |
487 |
|
continue; |
488 |
|
/* |
489 |
< |
* Recompute directional error using perturbed normal |
489 |
> |
* Extrapolate value and compute final weight (hat function) |
490 |
|
*/ |
491 |
< |
if (rn_dot > 0.0) { |
492 |
< |
e2 = sqrt((1.0 - rn_dot)*r->rweight); |
493 |
< |
wt = e1 + e2; |
494 |
< |
} |
495 |
< |
if (wt <= 1e-3) |
496 |
< |
wt = 1e3; |
497 |
< |
else |
412 |
< |
wt = 1.0 / wt; |
413 |
< |
wsum += wt; |
414 |
< |
extambient(ct, av, r->rop, rn); |
415 |
< |
scalecolor(ct, wt); |
416 |
< |
addcolor(acol, ct); |
491 |
> |
if (!extambient(sct, av, r->rop, rn, uvw)) |
492 |
> |
continue; |
493 |
> |
d = tfunc(maxangle, sqrt(delta_r2), 0.0) * |
494 |
> |
tfunc(ambacc, sqrt(delta_t2), 0.0); |
495 |
> |
scalescolor(sct, d); |
496 |
> |
saddscolor(acol, sct); |
497 |
> |
wsum += d; |
498 |
|
} |
418 |
– |
if (at->kid == NULL) |
419 |
– |
return(wsum); |
420 |
– |
/* do children */ |
421 |
– |
s *= 0.5; |
422 |
– |
for (i = 0; i < 8; i++) { |
423 |
– |
for (j = 0; j < 3; j++) { |
424 |
– |
ck0[j] = c0[j]; |
425 |
– |
if (1<<j & i) |
426 |
– |
ck0[j] += s; |
427 |
– |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
428 |
– |
break; |
429 |
– |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
430 |
– |
break; |
431 |
– |
} |
432 |
– |
if (j == 3) |
433 |
– |
wsum += sumambient(acol, r, rn, al, |
434 |
– |
at->kid+i, ck0, s); |
435 |
– |
} |
499 |
|
return(wsum); |
500 |
|
} |
501 |
|
|
502 |
|
|
503 |
< |
extern double |
503 |
> |
static int |
504 |
|
makeambient( /* make a new ambient value for storage */ |
505 |
< |
COLOR acol, |
505 |
> |
SCOLOR acol, |
506 |
|
RAY *r, |
507 |
|
FVECT rn, |
508 |
|
int al |
509 |
|
) |
510 |
|
{ |
511 |
+ |
int sgn = 1 - 2*(DOT(r->ron,rn) < 0); |
512 |
|
AMBVAL amb; |
513 |
< |
FVECT gp, gd; |
513 |
> |
FVECT uvw[3]; |
514 |
|
int i; |
515 |
|
|
516 |
|
amb.weight = 1.0; /* compute weight */ |
518 |
|
amb.weight *= AVGREFL; |
519 |
|
if (r->rweight < 0.1*amb.weight) /* heuristic override */ |
520 |
|
amb.weight = 1.25*r->rweight; |
521 |
< |
setcolor(acol, AVGREFL, AVGREFL, AVGREFL); |
521 |
> |
setscolor(acol, AVGREFL, AVGREFL, AVGREFL); |
522 |
|
/* compute ambient */ |
523 |
< |
amb.rad = doambient(acol, r, amb.weight, gp, gd); |
524 |
< |
if (amb.rad <= FTINY) { |
525 |
< |
setcolor(acol, 0.0, 0.0, 0.0); |
526 |
< |
return(0.0); |
527 |
< |
} |
528 |
< |
scalecolor(acol, 1./AVGREFL); /* undo assumed reflectance */ |
523 |
> |
i = doambient(acol, r, amb.weight*sgn, |
524 |
> |
uvw, amb.rad, amb.gpos, amb.gdir, &amb.corral); |
525 |
> |
scalescolor(acol, 1./AVGREFL); /* undo assumed reflectance */ |
526 |
> |
if (i <= 0 || amb.rad[0] <= FTINY) /* no Hessian or zero radius */ |
527 |
> |
return(i); |
528 |
> |
uvw[2][0] = sgn*r->ron[0]; /* orient unperturbed normal */ |
529 |
> |
uvw[2][1] = sgn*r->ron[1]; |
530 |
> |
uvw[2][2] = sgn*r->ron[2]; |
531 |
|
/* store value */ |
532 |
|
VCOPY(amb.pos, r->rop); |
533 |
< |
VCOPY(amb.dir, r->ron); |
533 |
> |
amb.ndir = encodedir(uvw[2]); |
534 |
> |
amb.udir = encodedir(uvw[0]); |
535 |
|
amb.lvl = al; |
536 |
< |
copycolor(amb.val, acol); |
537 |
< |
VCOPY(amb.gpos, gp); |
538 |
< |
VCOPY(amb.gdir, gd); |
539 |
< |
/* insert into tree */ |
540 |
< |
avsave(&amb); /* and save to file */ |
474 |
< |
if (rn != r->ron) |
475 |
< |
extambient(acol, &amb, r->rop, rn); /* texture */ |
476 |
< |
return(amb.rad); |
536 |
> |
copyscolor(amb.val, acol); |
537 |
> |
avsave(&amb); /* insert and save to file */ |
538 |
> |
if (DOT(uvw[2],rn) < 0.9999) /* texture? */ |
539 |
> |
extambient(acol, &amb, r->rop, rn, uvw); |
540 |
> |
return(1); |
541 |
|
} |
542 |
|
|
543 |
|
|
544 |
< |
extern void |
544 |
> |
static int |
545 |
|
extambient( /* extrapolate value at pv, nv */ |
546 |
< |
COLOR cr, |
547 |
< |
register AMBVAL *ap, |
546 |
> |
SCOLOR scr, |
547 |
> |
AMBVAL *ap, |
548 |
|
FVECT pv, |
549 |
< |
FVECT nv |
549 |
> |
FVECT nv, |
550 |
> |
FVECT uvw[3] |
551 |
|
) |
552 |
|
{ |
553 |
< |
FVECT v1; |
554 |
< |
register int i; |
555 |
< |
double d; |
553 |
> |
const double min_d = 0.05; |
554 |
> |
const double max_d = 20.; |
555 |
> |
static FVECT my_uvw[3]; |
556 |
> |
FVECT v1; |
557 |
> |
int i; |
558 |
> |
double d = 1.0; /* zeroeth order */ |
559 |
|
|
560 |
< |
d = 1.0; /* zeroeth order */ |
561 |
< |
/* gradient due to translation */ |
562 |
< |
for (i = 0; i < 3; i++) |
563 |
< |
d += ap->gpos[i]*(pv[i]-ap->pos[i]); |
564 |
< |
/* gradient due to rotation */ |
497 |
< |
VCROSS(v1, ap->dir, nv); |
498 |
< |
d += DOT(ap->gdir, v1); |
499 |
< |
if (d <= 0.0) { |
500 |
< |
setcolor(cr, 0.0, 0.0, 0.0); |
501 |
< |
return; |
560 |
> |
if (uvw == NULL) { /* need local coordinates? */ |
561 |
> |
decodedir(my_uvw[2], ap->ndir); |
562 |
> |
decodedir(my_uvw[0], ap->udir); |
563 |
> |
VCROSS(my_uvw[1], my_uvw[2], my_uvw[0]); |
564 |
> |
uvw = my_uvw; |
565 |
|
} |
566 |
< |
copycolor(cr, ap->val); |
567 |
< |
scalecolor(cr, d); |
566 |
> |
for (i = 3; i--; ) /* gradient due to translation */ |
567 |
> |
d += (pv[i] - ap->pos[i]) * |
568 |
> |
(ap->gpos[0]*uvw[0][i] + ap->gpos[1]*uvw[1][i]); |
569 |
> |
|
570 |
> |
VCROSS(v1, uvw[2], nv); /* gradient due to rotation */ |
571 |
> |
for (i = 3; i--; ) |
572 |
> |
d += v1[i] * (ap->gdir[0]*uvw[0][i] + ap->gdir[1]*uvw[1][i]); |
573 |
> |
|
574 |
> |
if (d < min_d) /* clamp min/max scaling */ |
575 |
> |
d = min_d; |
576 |
> |
else if (d > max_d) |
577 |
> |
d = max_d; |
578 |
> |
copyscolor(scr, ap->val); |
579 |
> |
scalescolor(scr, d); |
580 |
> |
return(d > min_d); |
581 |
|
} |
582 |
|
|
583 |
|
|
584 |
|
static void |
585 |
+ |
avinsert( /* insert ambient value in our tree */ |
586 |
+ |
AMBVAL *av |
587 |
+ |
) |
588 |
+ |
{ |
589 |
+ |
AMBTREE *at; |
590 |
+ |
AMBVAL *ap; |
591 |
+ |
AMBVAL avh; |
592 |
+ |
FVECT ck0; |
593 |
+ |
double s; |
594 |
+ |
int branch; |
595 |
+ |
int i; |
596 |
+ |
|
597 |
+ |
if (av->rad[0] <= FTINY) |
598 |
+ |
error(CONSISTENCY, "zero ambient radius in avinsert"); |
599 |
+ |
at = &atrunk; |
600 |
+ |
VCOPY(ck0, thescene.cuorg); |
601 |
+ |
s = thescene.cusize; |
602 |
+ |
while (s*(OCTSCALE/2) > av->rad[1]*ambacc) { |
603 |
+ |
if (at->kid == NULL) |
604 |
+ |
if ((at->kid = newambtree()) == NULL) |
605 |
+ |
error(SYSTEM, "out of memory in avinsert"); |
606 |
+ |
s *= 0.5; |
607 |
+ |
branch = 0; |
608 |
+ |
for (i = 0; i < 3; i++) |
609 |
+ |
if (av->pos[i] > ck0[i] + s) { |
610 |
+ |
ck0[i] += s; |
611 |
+ |
branch |= 1 << i; |
612 |
+ |
} |
613 |
+ |
at = at->kid + branch; |
614 |
+ |
} |
615 |
+ |
avh.next = at->alist; /* order by increasing level */ |
616 |
+ |
for (ap = &avh; ap->next != NULL; ap = ap->next) |
617 |
+ |
if ( ap->next->lvl > av->lvl || |
618 |
+ |
(ap->next->lvl == av->lvl) & |
619 |
+ |
(ap->next->weight <= av->weight) ) |
620 |
+ |
break; |
621 |
+ |
av->next = ap->next; |
622 |
+ |
ap->next = (AMBVAL*)av; |
623 |
+ |
at->alist = avh.next; |
624 |
+ |
} |
625 |
+ |
|
626 |
+ |
|
627 |
+ |
static void |
628 |
|
initambfile( /* initialize ambient file */ |
629 |
< |
int creat |
629 |
> |
int cre8 |
630 |
|
) |
631 |
|
{ |
632 |
|
extern char *progname, *octname; |
633 |
|
static char *mybuf = NULL; |
634 |
+ |
int ntries = 3; |
635 |
|
|
636 |
< |
#ifdef F_SETLKW |
637 |
< |
aflock(creat ? F_WRLCK : F_RDLCK); |
518 |
< |
#endif |
636 |
> |
if (!AMBFLUSH) |
637 |
> |
error(INTERNAL, "BUFSIZ too small in initambfile"); |
638 |
|
SET_FILE_BINARY(ambfp); |
639 |
|
if (mybuf == NULL) |
640 |
< |
mybuf = (char *)bmalloc(BUFSIZ+8); |
640 |
> |
mybuf = (char *)bmalloc(BUFSIZ); |
641 |
|
setbuf(ambfp, mybuf); |
642 |
< |
if (creat) { /* new file */ |
642 |
> |
nunflshed = 0; |
643 |
> |
retry: |
644 |
> |
if (cre8) { /* new file */ |
645 |
|
newheader("RADIANCE", ambfp); |
646 |
|
fprintf(ambfp, "%s -av %g %g %g -aw %d -ab %d -aa %g ", |
647 |
|
progname, colval(ambval,RED), |
649 |
|
ambvwt, ambounce, ambacc); |
650 |
|
fprintf(ambfp, "-ad %d -as %d -ar %d ", |
651 |
|
ambdiv, ambssamp, ambres); |
652 |
+ |
fprintf(ambfp, "-dr %d -ds %g -dt %g -dc %g ", directrelay, |
653 |
+ |
srcsizerat, shadthresh, shadcert); |
654 |
+ |
fprintf(ambfp, "-ss %g -st %g -lr %d -lw %g ", specjitter, |
655 |
+ |
specthresh, maxdepth, minweight); |
656 |
+ |
fprintf(ambfp, "-cw %g %g -cs %d ", WLPART[3], WLPART[0], NCSAMP); |
657 |
|
if (octname != NULL) |
658 |
< |
printargs(1, &octname, ambfp); |
659 |
< |
else |
534 |
< |
fputc('\n', ambfp); |
658 |
> |
fputs(octname, ambfp); |
659 |
> |
fputc('\n', ambfp); /* end of command line, not header! */ |
660 |
|
fprintf(ambfp, "SOFTWARE= %s\n", VersionID); |
661 |
|
fputnow(ambfp); |
662 |
+ |
AMB_CNDX = CNDX; /* use current spectral sampling */ |
663 |
+ |
AMB_WLPART = WLPART; |
664 |
+ |
fputwlsplit(WLPART, ambfp); |
665 |
+ |
fputncomp(NCSAMP, ambfp); |
666 |
|
fputformat(AMBFMT, ambfp); |
667 |
< |
putc('\n', ambfp); |
667 |
> |
fputc('\n', ambfp); |
668 |
|
putambmagic(ambfp); |
669 |
< |
} else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp)) |
670 |
< |
error(USER, "bad ambient file"); |
669 |
> |
} else if (getheader(ambfp, amb_headline, NULL) < 0 || !hasambmagic(ambfp)) { |
670 |
> |
if (--ntries > 0 && ftell(ambfp) == 0) { |
671 |
> |
clearerr(ambfp); |
672 |
> |
sleep(2); |
673 |
> |
goto retry; |
674 |
> |
} |
675 |
> |
error(USER, "bad/incompatible ambient file"); |
676 |
> |
} |
677 |
> |
if ((AMB_CNDX != CNDX) | (AMB_WLPART != WLPART)) { |
678 |
> |
if (setspectrsamp(AMB_CNDX, AMB_WLPART) < 0) |
679 |
> |
error(USER, "bad wavelength sampling in ambient file"); |
680 |
> |
if (AMB_CNDX[3] == CNDX[3] && FABSEQ(AMB_WLPART[0],WLPART[0]) && |
681 |
> |
FABSEQ(AMB_WLPART[3],WLPART[3])) { |
682 |
> |
AMB_CNDX = CNDX; |
683 |
> |
AMB_WLPART = WLPART; /* just the same */ |
684 |
> |
} else |
685 |
> |
error(WARNING, "different ambient file wavelength sampling"); |
686 |
> |
} |
687 |
|
} |
688 |
|
|
689 |
|
|
692 |
|
AMBVAL *av |
693 |
|
) |
694 |
|
{ |
695 |
< |
avinsert(avstore(av)); |
695 |
> |
avstore(av); |
696 |
|
if (ambfp == NULL) |
697 |
|
return; |
698 |
|
if (writambval(av, ambfp) < 0) |
707 |
|
|
708 |
|
|
709 |
|
static AMBVAL * |
710 |
< |
avstore( /* allocate memory and store aval */ |
711 |
< |
register AMBVAL *aval |
710 |
> |
avstore( /* allocate memory and save aval */ |
711 |
> |
AMBVAL *aval |
712 |
|
) |
713 |
|
{ |
714 |
< |
register AMBVAL *av; |
714 |
> |
AMBVAL *av; |
715 |
|
double d; |
716 |
|
|
717 |
|
if ((av = newambval()) == NULL) |
718 |
|
error(SYSTEM, "out of memory in avstore"); |
719 |
< |
*av = *aval; |
575 |
< |
av->latick = ambclock; |
719 |
> |
memcpy(av, aval, AVSIZE); /* AVSIZE <= sizeof(AMBVAL) */ |
720 |
|
av->next = NULL; |
721 |
|
nambvals++; |
722 |
< |
d = bright(av->val); |
722 |
> |
d = pbright(av->val); |
723 |
|
if (d > FTINY) { /* add to log sum for averaging */ |
724 |
|
avsum += log(d); |
725 |
|
navsum++; |
726 |
|
} |
727 |
+ |
avinsert(av); /* insert in our cache tree */ |
728 |
|
return(av); |
729 |
|
} |
730 |
|
|
737 |
|
static AMBTREE * |
738 |
|
newambtree(void) /* allocate 8 ambient tree structs */ |
739 |
|
{ |
740 |
< |
register AMBTREE *atp, *upperlim; |
740 |
> |
AMBTREE *atp, *upperlim; |
741 |
|
|
742 |
|
if (atfreelist == NULL) { /* get more nodes */ |
743 |
|
atfreelist = (AMBTREE *)malloc(ATALLOCSZ*8*sizeof(AMBTREE)); |
751 |
|
} |
752 |
|
atp = atfreelist; |
753 |
|
atfreelist = atp->kid; |
754 |
< |
memset((char *)atp, '\0', 8*sizeof(AMBTREE)); |
754 |
> |
memset(atp, 0, 8*sizeof(AMBTREE)); |
755 |
|
return(atp); |
756 |
|
} |
757 |
|
|
767 |
|
|
768 |
|
|
769 |
|
static void |
625 |
– |
avinsert( /* insert ambient value in our tree */ |
626 |
– |
void *av |
627 |
– |
) |
628 |
– |
{ |
629 |
– |
register AMBTREE *at; |
630 |
– |
register AMBVAL *ap; |
631 |
– |
AMBVAL avh; |
632 |
– |
FVECT ck0; |
633 |
– |
double s; |
634 |
– |
int branch; |
635 |
– |
register int i; |
636 |
– |
|
637 |
– |
if (((AMBVAL*)av)->rad <= FTINY) |
638 |
– |
error(CONSISTENCY, "zero ambient radius in avinsert"); |
639 |
– |
at = &atrunk; |
640 |
– |
VCOPY(ck0, thescene.cuorg); |
641 |
– |
s = thescene.cusize; |
642 |
– |
while (s*(OCTSCALE/2) > ((AMBVAL*)av)->rad*ambacc) { |
643 |
– |
if (at->kid == NULL) |
644 |
– |
if ((at->kid = newambtree()) == NULL) |
645 |
– |
error(SYSTEM, "out of memory in avinsert"); |
646 |
– |
s *= 0.5; |
647 |
– |
branch = 0; |
648 |
– |
for (i = 0; i < 3; i++) |
649 |
– |
if (((AMBVAL*)av)->pos[i] > ck0[i] + s) { |
650 |
– |
ck0[i] += s; |
651 |
– |
branch |= 1 << i; |
652 |
– |
} |
653 |
– |
at = at->kid + branch; |
654 |
– |
} |
655 |
– |
avh.next = at->alist; /* order by increasing level */ |
656 |
– |
for (ap = &avh; ap->next != NULL; ap = ap->next) |
657 |
– |
if (ap->next->lvl >= ((AMBVAL*)av)->lvl) |
658 |
– |
break; |
659 |
– |
((AMBVAL*)av)->next = ap->next; |
660 |
– |
ap->next = (AMBVAL*)av; |
661 |
– |
at->alist = avh.next; |
662 |
– |
} |
663 |
– |
|
664 |
– |
|
665 |
– |
static void |
770 |
|
unloadatree( /* unload an ambient value tree */ |
771 |
< |
register AMBTREE *at, |
771 |
> |
AMBTREE *at, |
772 |
|
unloadtf_t *f |
773 |
|
) |
774 |
|
{ |
775 |
< |
register AMBVAL *av; |
776 |
< |
register int i; |
775 |
> |
AMBVAL *av; |
776 |
> |
int i; |
777 |
|
/* transfer values at this node */ |
778 |
|
for (av = at->alist; av != NULL; av = at->alist) { |
779 |
|
at->alist = av->next; |
780 |
+ |
av->next = NULL; |
781 |
|
(*f)(av); |
782 |
|
} |
783 |
|
if (at->kid == NULL) |
789 |
|
} |
790 |
|
|
791 |
|
|
687 |
– |
static struct avl { |
688 |
– |
AMBVAL *p; |
689 |
– |
unsigned long t; |
690 |
– |
} *avlist1; /* ambient value list with ticks */ |
691 |
– |
static AMBVAL **avlist2; /* memory positions for sorting */ |
692 |
– |
static int i_avlist; /* index for lists */ |
693 |
– |
|
694 |
– |
static int alatcmp(const void *av1, const void *av2); |
695 |
– |
|
792 |
|
static void |
793 |
< |
av2list( |
698 |
< |
void *av |
699 |
< |
) |
793 |
> |
avfree(AMBVAL *av) |
794 |
|
{ |
795 |
< |
#ifdef DEBUG |
702 |
< |
if (i_avlist >= nambvals) |
703 |
< |
error(CONSISTENCY, "too many ambient values in av2list1"); |
704 |
< |
#endif |
705 |
< |
avlist1[i_avlist].p = avlist2[i_avlist] = (AMBVAL*)av; |
706 |
< |
avlist1[i_avlist++].t = ((AMBVAL*)av)->latick; |
795 |
> |
free(av); |
796 |
|
} |
797 |
|
|
798 |
|
|
710 |
– |
static int |
711 |
– |
alatcmp( /* compare ambient values for MRA */ |
712 |
– |
const void *av1, |
713 |
– |
const void *av2 |
714 |
– |
) |
715 |
– |
{ |
716 |
– |
register long lc = ((struct avl *)av2)->t - ((struct avl *)av1)->t; |
717 |
– |
return(lc<0 ? -1 : lc>0 ? 1 : 0); |
718 |
– |
} |
719 |
– |
|
720 |
– |
|
721 |
– |
/* GW NOTE 2002/10/3: |
722 |
– |
* I used to compare AMBVAL pointers, but found that this was the |
723 |
– |
* cause of a serious consistency error with gcc, since the optimizer |
724 |
– |
* uses some dangerous trick in pointer subtraction that |
725 |
– |
* assumes pointers differ by exact struct size increments. |
726 |
– |
*/ |
727 |
– |
static int |
728 |
– |
aposcmp( /* compare ambient value positions */ |
729 |
– |
const void *avp1, |
730 |
– |
const void *avp2 |
731 |
– |
) |
732 |
– |
{ |
733 |
– |
register long diff = *(char * const *)avp1 - *(char * const *)avp2; |
734 |
– |
if (diff < 0) |
735 |
– |
return(-1); |
736 |
– |
return(diff > 0); |
737 |
– |
} |
738 |
– |
|
739 |
– |
#if 1 |
740 |
– |
static int |
741 |
– |
avlmemi( /* find list position from address */ |
742 |
– |
AMBVAL *avaddr |
743 |
– |
) |
744 |
– |
{ |
745 |
– |
register AMBVAL **avlpp; |
746 |
– |
|
747 |
– |
avlpp = (AMBVAL **)bsearch((char *)&avaddr, (char *)avlist2, |
748 |
– |
nambvals, sizeof(AMBVAL *), aposcmp); |
749 |
– |
if (avlpp == NULL) |
750 |
– |
error(CONSISTENCY, "address not found in avlmemi"); |
751 |
– |
return(avlpp - avlist2); |
752 |
– |
} |
753 |
– |
#else |
754 |
– |
#define avlmemi(avaddr) ((AMBVAL **)bsearch((char *)&avaddr,(char *)avlist2, \ |
755 |
– |
nambvals,sizeof(AMBVAL *),aposcmp) - avlist2) |
756 |
– |
#endif |
757 |
– |
|
758 |
– |
|
799 |
|
static void |
800 |
< |
sortambvals( /* resort ambient values */ |
761 |
< |
int always |
762 |
< |
) |
800 |
> |
sortambvals(void) /* resort ambient values */ |
801 |
|
{ |
802 |
< |
AMBTREE oldatrunk; |
765 |
< |
AMBVAL tav, *tap, *pnext; |
766 |
< |
register int i, j; |
767 |
< |
/* see if it's time yet */ |
768 |
< |
if (!always && (ambclock++ < lastsort+sortintvl || |
769 |
< |
nambvals < SORT_THRESH)) |
770 |
< |
return; |
771 |
< |
/* |
772 |
< |
* The idea here is to minimize memory thrashing |
773 |
< |
* in VM systems by improving reference locality. |
774 |
< |
* We do this by periodically sorting our stored ambient |
775 |
< |
* values in memory in order of most recently to least |
776 |
< |
* recently accessed. This ordering was chosen so that new |
777 |
< |
* ambient values (which tend to be less important) go into |
778 |
< |
* higher memory with the infrequently accessed values. |
779 |
< |
* Since we expect our values to need sorting less |
780 |
< |
* frequently as the process continues, we double our |
781 |
< |
* waiting interval after each call. |
782 |
< |
* This routine is also called by setambacc() with |
783 |
< |
* the "always" parameter set to 1 so that the ambient |
784 |
< |
* tree will be rebuilt with the new accuracy parameter. |
785 |
< |
*/ |
786 |
< |
if (tracktime) { /* allocate pointer arrays to sort */ |
787 |
< |
avlist2 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *)); |
788 |
< |
avlist1 = (struct avl *)malloc(nambvals*sizeof(struct avl)); |
789 |
< |
} else { |
790 |
< |
avlist2 = NULL; |
791 |
< |
avlist1 = NULL; |
792 |
< |
} |
793 |
< |
if (avlist1 == NULL) { /* no time tracking -- rebuild tree? */ |
794 |
< |
if (avlist2 != NULL) |
795 |
< |
free((void *)avlist2); |
796 |
< |
if (always) { /* rebuild without sorting */ |
797 |
< |
oldatrunk = atrunk; |
798 |
< |
atrunk.alist = NULL; |
799 |
< |
atrunk.kid = NULL; |
800 |
< |
unloadatree(&oldatrunk, avinsert); |
801 |
< |
} |
802 |
< |
} else { /* sort memory by last access time */ |
803 |
< |
/* |
804 |
< |
* Sorting memory is tricky because it isn't contiguous. |
805 |
< |
* We have to sort an array of pointers by MRA and also |
806 |
< |
* by memory position. We then copy values in "loops" |
807 |
< |
* to minimize memory hits. Nevertheless, we will visit |
808 |
< |
* everyone at least twice, and this is an expensive process |
809 |
< |
* when we're thrashing, which is when we need to do it. |
810 |
< |
*/ |
811 |
< |
#ifdef DEBUG |
812 |
< |
sprintf(errmsg, "sorting %u ambient values at ambclock=%lu...", |
813 |
< |
nambvals, ambclock); |
814 |
< |
eputs(errmsg); |
815 |
< |
#endif |
816 |
< |
i_avlist = 0; |
817 |
< |
unloadatree(&atrunk, av2list); /* empty current tree */ |
818 |
< |
#ifdef DEBUG |
819 |
< |
if (i_avlist < nambvals) |
820 |
< |
error(CONSISTENCY, "missing ambient values in sortambvals"); |
821 |
< |
#endif |
822 |
< |
qsort((char *)avlist1, nambvals, sizeof(struct avl), alatcmp); |
823 |
< |
qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), aposcmp); |
824 |
< |
for (i = 0; i < nambvals; i++) { |
825 |
< |
if (avlist1[i].p == NULL) |
826 |
< |
continue; |
827 |
< |
tap = avlist2[i]; |
828 |
< |
tav = *tap; |
829 |
< |
for (j = i; (pnext = avlist1[j].p) != tap; |
830 |
< |
j = avlmemi(pnext)) { |
831 |
< |
*(avlist2[j]) = *pnext; |
832 |
< |
avinsert(avlist2[j]); |
833 |
< |
avlist1[j].p = NULL; |
834 |
< |
} |
835 |
< |
*(avlist2[j]) = tav; |
836 |
< |
avinsert(avlist2[j]); |
837 |
< |
avlist1[j].p = NULL; |
838 |
< |
} |
839 |
< |
free((void *)avlist1); |
840 |
< |
free((void *)avlist2); |
841 |
< |
/* compute new sort interval */ |
842 |
< |
sortintvl = ambclock - lastsort; |
843 |
< |
if (sortintvl >= MAX_SORT_INTVL/2) |
844 |
< |
sortintvl = MAX_SORT_INTVL; |
845 |
< |
else |
846 |
< |
sortintvl <<= 1; /* wait twice as long next */ |
847 |
< |
#ifdef DEBUG |
848 |
< |
eputs("done\n"); |
849 |
< |
#endif |
850 |
< |
} |
851 |
< |
if (ambclock >= MAXACLOCK) |
852 |
< |
ambclock = MAXACLOCK/2; |
853 |
< |
lastsort = ambclock; |
854 |
< |
} |
802 |
> |
AMBTREE oldatrunk = atrunk; |
803 |
|
|
804 |
< |
|
805 |
< |
#ifdef F_SETLKW |
806 |
< |
|
859 |
< |
static void |
860 |
< |
aflock( /* lock/unlock ambient file */ |
861 |
< |
int typ |
862 |
< |
) |
863 |
< |
{ |
864 |
< |
static struct flock fls; /* static so initialized to zeroes */ |
865 |
< |
|
866 |
< |
fls.l_type = typ; |
867 |
< |
if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0) |
868 |
< |
error(SYSTEM, "cannot (un)lock ambient file"); |
804 |
> |
atrunk.alist = NULL; |
805 |
> |
atrunk.kid = NULL; |
806 |
> |
unloadatree(&oldatrunk, avinsert); |
807 |
|
} |
808 |
|
|
809 |
|
|
810 |
< |
extern int |
810 |
> |
int |
811 |
|
ambsync(void) /* synchronize ambient file */ |
812 |
|
{ |
813 |
< |
long flen; |
813 |
> |
off_t newpos; |
814 |
> |
int n; |
815 |
|
AMBVAL avs; |
877 |
– |
register int n; |
816 |
|
|
817 |
|
if (ambfp == NULL) /* no ambient file? */ |
818 |
|
return(0); |
819 |
< |
if (lastpos < 0) /* initializing (locked in initambfile) */ |
820 |
< |
goto syncend; |
821 |
< |
/* gain appropriate access */ |
822 |
< |
aflock(nunflshed ? F_WRLCK : F_RDLCK); |
823 |
< |
/* see if file has grown */ |
824 |
< |
if ((flen = lseek(fileno(ambfp), (off_t)0, SEEK_END)) < 0) |
819 |
> |
|
820 |
> |
if (nunflshed > 0) { /* append new values? */ |
821 |
> |
if (fflush(ambfp) < 0) |
822 |
> |
return(EOF); |
823 |
> |
newpos = lseek(fileno(ambfp), 0, SEEK_CUR); |
824 |
> |
} else |
825 |
> |
newpos = lseek(fileno(ambfp), 0, SEEK_END); |
826 |
> |
|
827 |
> |
if (newpos < 0) |
828 |
|
goto seekerr; |
829 |
< |
if ( (n = flen - lastpos) ) { /* file has grown */ |
830 |
< |
if (ambinp == NULL) { /* use duplicate filedes */ |
831 |
< |
ambinp = fdopen(dup(fileno(ambfp)), "r"); |
832 |
< |
if (ambinp == NULL) |
833 |
< |
error(SYSTEM, "fdopen failed in ambsync"); |
829 |
> |
/* how many others added? */ |
830 |
> |
n = (newpos - lastpos)/AMBVALSIZ - nunflshed; |
831 |
> |
nunflshed = 0; |
832 |
> |
if (n <= 0) { /* no one helping this time? */ |
833 |
> |
lastpos = newpos; |
834 |
> |
return(0); |
835 |
> |
} |
836 |
> |
if (ambinp == NULL) { /* else need to open for input? */ |
837 |
> |
ambinp = fopen(ambfile, "r"); |
838 |
> |
if (ambinp == NULL) { |
839 |
> |
sprintf(errmsg, "cannot reopen ambient file \"%s\"", |
840 |
> |
ambfile); |
841 |
> |
error(SYSTEM, errmsg); |
842 |
|
} |
843 |
< |
if (fseek(ambinp, lastpos, 0) < 0) |
844 |
< |
goto seekerr; |
845 |
< |
while (n >= AMBVALSIZ) { /* load contributed values */ |
846 |
< |
if (!readambval(&avs, ambinp)) { |
847 |
< |
sprintf(errmsg, |
848 |
< |
"ambient file \"%s\" corrupted near character %ld", |
849 |
< |
ambfile, flen - n); |
850 |
< |
error(WARNING, errmsg); |
851 |
< |
break; |
852 |
< |
} |
853 |
< |
avinsert(avstore(&avs)); |
905 |
< |
n -= AMBVALSIZ; |
843 |
> |
SET_FILE_BINARY(ambinp); |
844 |
> |
} |
845 |
> |
/* read from last endpoint */ |
846 |
> |
if (fseeko(ambinp, lastpos, SEEK_SET) < 0) |
847 |
> |
goto seekerr; |
848 |
> |
while (n-- > 0) { /* load new contributed values */ |
849 |
> |
if (!readambval(&avs, ambinp)) { |
850 |
> |
sprintf(errmsg, "ambient file \"%s\" corrupted", |
851 |
> |
ambfile); |
852 |
> |
error(WARNING, errmsg); |
853 |
> |
break; |
854 |
|
} |
855 |
< |
lastpos = flen - n; |
908 |
< |
/*** seek always as safety measure |
909 |
< |
if (n) ***/ /* alignment */ |
910 |
< |
if (lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0) |
911 |
< |
goto seekerr; |
855 |
> |
avstore(&avs); |
856 |
|
} |
857 |
< |
#ifdef DEBUG |
858 |
< |
if (ambfp->_ptr - ambfp->_base != nunflshed*AMBVALSIZ) { |
915 |
< |
sprintf(errmsg, "ambient file buffer at %d rather than %d", |
916 |
< |
ambfp->_ptr - ambfp->_base, |
917 |
< |
nunflshed*AMBVALSIZ); |
918 |
< |
error(CONSISTENCY, errmsg); |
919 |
< |
} |
920 |
< |
#endif |
921 |
< |
syncend: |
922 |
< |
n = fflush(ambfp); /* calls write() at last */ |
923 |
< |
if ((n == EOF) | (lastpos < 0)) { |
924 |
< |
if ((lastpos = lseek(fileno(ambfp), (off_t)0, SEEK_CUR)) < 0) |
925 |
< |
goto seekerr; |
926 |
< |
} else |
927 |
< |
lastpos += (long)nunflshed*AMBVALSIZ; |
928 |
< |
aflock(F_UNLCK); /* release file */ |
929 |
< |
nunflshed = 0; |
930 |
< |
return(n); |
857 |
> |
lastpos = newpos; /* update endpoint */ |
858 |
> |
return(0); |
859 |
|
seekerr: |
860 |
|
error(SYSTEM, "seek failed in ambsync"); |
861 |
< |
return -1; /* pro forma return */ |
861 |
> |
return(EOF); /* pro forma return */ |
862 |
|
} |
935 |
– |
|
936 |
– |
#else |
937 |
– |
|
938 |
– |
extern int |
939 |
– |
ambsync(void) /* flush ambient file */ |
940 |
– |
{ |
941 |
– |
if (ambfp == NULL) |
942 |
– |
return(0); |
943 |
– |
nunflshed = 0; |
944 |
– |
return(fflush(ambfp)); |
945 |
– |
} |
946 |
– |
|
947 |
– |
#endif |