1 |
< |
/* Copyright (c) 1986 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1991 Regents of the University of California */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
17 |
|
|
18 |
|
#include "octree.h" |
19 |
|
|
20 |
+ |
#include "otypes.h" |
21 |
+ |
|
22 |
+ |
#include "ambient.h" |
23 |
+ |
|
24 |
|
#include "random.h" |
25 |
|
|
26 |
|
#define OCTSCALE 0.5 /* ceil((valid rad.)/(cube size)) */ |
27 |
|
|
28 |
< |
#define WDONE 4 /* stop if wsum/wmin is at or above */ |
28 |
> |
typedef struct ambtree { |
29 |
> |
AMBVAL *alist; /* ambient value list */ |
30 |
> |
struct ambtree *kid; /* 8 child nodes */ |
31 |
> |
} AMBTREE; /* ambient octree */ |
32 |
|
|
33 |
|
extern CUBE thescene; /* contains space boundaries */ |
34 |
|
|
35 |
< |
extern COLOR ambval; /* global ambient component */ |
36 |
< |
extern double ambacc; /* ambient accuracy */ |
30 |
< |
extern int ambres; /* ambient resolution */ |
31 |
< |
extern int ambdiv; /* number of divisions for calculation */ |
32 |
< |
extern int ambssamp; /* number of super-samples */ |
33 |
< |
extern int ambounce; /* number of ambient bounces */ |
34 |
< |
extern char *amblist[]; /* ambient include/exclude list */ |
35 |
< |
extern int ambincl; /* include == 1, exclude == 0 */ |
35 |
> |
#define MAXASET 511 /* maximum number of elements in ambient set */ |
36 |
> |
OBJECT ambset[MAXASET+1]={0}; /* ambient include/exclude set */ |
37 |
|
|
37 |
– |
OBJECT ambset[128]; /* ambient include/exclude set */ |
38 |
– |
|
38 |
|
double maxarad; /* maximum ambient radius */ |
39 |
|
double minarad; /* minimum ambient radius */ |
40 |
|
|
42 |
– |
typedef struct ambval { |
43 |
– |
FVECT pos; /* position in space */ |
44 |
– |
FVECT dir; /* normal direction */ |
45 |
– |
int lvl; /* recursion level of parent ray */ |
46 |
– |
float weight; /* weight of parent ray */ |
47 |
– |
COLOR val; /* computed ambient value */ |
48 |
– |
float rad; /* validity radius */ |
49 |
– |
struct ambval *next; /* next in list */ |
50 |
– |
} AMBVAL; /* ambient value */ |
51 |
– |
|
52 |
– |
typedef struct ambtree { |
53 |
– |
AMBVAL *alist; /* ambient value list */ |
54 |
– |
struct ambtree *kid; /* 8 child nodes */ |
55 |
– |
} AMBTREE; /* ambient octree */ |
56 |
– |
|
57 |
– |
typedef struct { |
58 |
– |
float k; /* error contribution per sample */ |
59 |
– |
COLOR v; /* ray sum */ |
60 |
– |
int n; /* number of samples */ |
61 |
– |
short t, p; /* theta, phi indices */ |
62 |
– |
} AMBSAMP; /* ambient sample */ |
63 |
– |
|
41 |
|
static AMBTREE atrunk; /* our ambient trunk node */ |
42 |
|
|
43 |
|
static FILE *ambfp = NULL; /* ambient file pointer */ |
46 |
|
|
47 |
|
#define newambtree() (AMBTREE *)calloc(8, sizeof(AMBTREE)) |
48 |
|
|
72 |
– |
double sumambient(), doambient(), makeambient(); |
49 |
|
|
74 |
– |
|
50 |
|
setambient(afile) /* initialize calculation */ |
51 |
|
char *afile; |
52 |
|
{ |
53 |
|
long ftell(); |
79 |
– |
char **amblp; |
80 |
– |
OBJECT obj; |
54 |
|
AMBVAL amb; |
55 |
< |
/* set up ambient set */ |
83 |
< |
ambset[0] = 0; |
84 |
< |
for (amblp = amblist; *amblp != NULL; amblp++) { |
85 |
< |
if ((obj = modifier(*amblp)) == OVOID) { |
86 |
< |
sprintf(errmsg, "unknown %s modifier \"%s\"", |
87 |
< |
ambincl ? "include" : "exclude", *amblp); |
88 |
< |
error(WARNING, errmsg); |
89 |
< |
continue; |
90 |
< |
} |
91 |
< |
if (!inset(ambset, obj)) |
92 |
< |
insertelem(ambset, obj); |
93 |
< |
} |
55 |
> |
|
56 |
|
maxarad = thescene.cusize / 2.0; /* maximum radius */ |
57 |
|
/* minimum radius */ |
58 |
|
minarad = ambres > 0 ? thescene.cusize/ambres : 0.0; |
60 |
|
/* open ambient file */ |
61 |
|
if (afile != NULL) |
62 |
|
if ((ambfp = fopen(afile, "r+")) != NULL) { |
63 |
< |
while (fread(&amb, sizeof(AMBVAL), 1, ambfp) == 1) |
63 |
> |
while (fread((char *)&amb,sizeof(AMBVAL),1,ambfp) == 1) |
64 |
|
avinsert(&amb, &atrunk, thescene.cuorg, |
65 |
|
thescene.cusize); |
66 |
|
/* align */ |
73 |
|
} |
74 |
|
|
75 |
|
|
76 |
+ |
ambnotify(obj) /* record new modifier */ |
77 |
+ |
OBJECT obj; |
78 |
+ |
{ |
79 |
+ |
static int hitlimit = 0; |
80 |
+ |
register OBJREC *o = objptr(obj); |
81 |
+ |
register char **amblp; |
82 |
+ |
|
83 |
+ |
if (hitlimit || !ismodifier(o->otype)) |
84 |
+ |
return; |
85 |
+ |
for (amblp = amblist; *amblp != NULL; amblp++) |
86 |
+ |
if (!strcmp(o->oname, *amblp)) { |
87 |
+ |
if (ambset[0] >= MAXASET) { |
88 |
+ |
error(WARNING, "too many modifiers in ambient list"); |
89 |
+ |
hitlimit++; |
90 |
+ |
return; /* should this be fatal? */ |
91 |
+ |
} |
92 |
+ |
insertelem(ambset, obj); |
93 |
+ |
return; |
94 |
+ |
} |
95 |
+ |
} |
96 |
+ |
|
97 |
+ |
|
98 |
|
ambient(acol, r) /* compute ambient component for ray */ |
99 |
|
COLOR acol; |
100 |
|
register RAY *r; |
101 |
|
{ |
102 |
|
static int rdepth = 0; /* ambient recursion */ |
103 |
< |
double wsum; |
103 |
> |
double d; |
104 |
|
|
121 |
– |
rdepth++; /* increment level */ |
122 |
– |
|
105 |
|
if (ambdiv <= 0) /* no ambient calculation */ |
106 |
|
goto dumbamb; |
107 |
|
/* check number of bounces */ |
108 |
< |
if (rdepth > ambounce) |
108 |
> |
if (rdepth >= ambounce) |
109 |
|
goto dumbamb; |
110 |
|
/* check ambient list */ |
111 |
|
if (ambincl != -1 && r->ro != NULL && |
113 |
|
goto dumbamb; |
114 |
|
|
115 |
|
if (ambacc <= FTINY) { /* no ambient storage */ |
116 |
< |
if (doambient(acol, r) == 0.0) |
116 |
> |
rdepth++; |
117 |
> |
d = doambient(acol, r, r->rweight, NULL, NULL); |
118 |
> |
rdepth--; |
119 |
> |
if (d == 0.0) |
120 |
|
goto dumbamb; |
121 |
< |
goto done; |
121 |
> |
return; |
122 |
|
} |
123 |
|
/* get ambient value */ |
124 |
|
setcolor(acol, 0.0, 0.0, 0.0); |
125 |
< |
wsum = sumambient(acol, r, &atrunk, thescene.cuorg, thescene.cusize); |
126 |
< |
if (wsum > FTINY) |
127 |
< |
scalecolor(acol, 1.0/wsum); |
128 |
< |
else if (makeambient(acol, r) == 0.0) |
129 |
< |
goto dumbamb; |
130 |
< |
goto done; |
131 |
< |
|
125 |
> |
d = sumambient(acol, r, rdepth, |
126 |
> |
&atrunk, thescene.cuorg, thescene.cusize); |
127 |
> |
if (d > FTINY) |
128 |
> |
scalecolor(acol, 1.0/d); |
129 |
> |
else { |
130 |
> |
d = makeambient(acol, r, rdepth++); |
131 |
> |
rdepth--; |
132 |
> |
} |
133 |
> |
if (d > FTINY) |
134 |
> |
return; |
135 |
|
dumbamb: /* return global value */ |
136 |
|
copycolor(acol, ambval); |
149 |
– |
done: /* must finish here! */ |
150 |
– |
rdepth--; |
137 |
|
} |
138 |
|
|
139 |
|
|
140 |
|
double |
141 |
< |
sumambient(acol, r, at, c0, s) /* get interpolated ambient value */ |
141 |
> |
sumambient(acol, r, al, at, c0, s) /* get interpolated ambient value */ |
142 |
|
COLOR acol; |
143 |
|
register RAY *r; |
144 |
+ |
int al; |
145 |
|
AMBTREE *at; |
146 |
|
FVECT c0; |
147 |
|
double s; |
153 |
|
int i; |
154 |
|
register int j; |
155 |
|
register AMBVAL *av; |
156 |
< |
|
156 |
> |
/* do this node */ |
157 |
|
wsum = 0.0; |
171 |
– |
/* check children first */ |
172 |
– |
if (at->kid != NULL) { |
173 |
– |
s *= 0.5; |
174 |
– |
for (i = 0; i < 8; i++) { |
175 |
– |
for (j = 0; j < 3; j++) { |
176 |
– |
ck0[j] = c0[j]; |
177 |
– |
if (1<<j & i) |
178 |
– |
ck0[j] += s; |
179 |
– |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
180 |
– |
break; |
181 |
– |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
182 |
– |
break; |
183 |
– |
} |
184 |
– |
if (j == 3) |
185 |
– |
wsum += sumambient(acol, r, at->kid+i, ck0, s); |
186 |
– |
} |
187 |
– |
if (wsum*ambacc >= WDONE) |
188 |
– |
return(wsum); /* close enough */ |
189 |
– |
} |
190 |
– |
/* check this node */ |
158 |
|
for (av = at->alist; av != NULL; av = av->next) { |
159 |
|
/* |
160 |
< |
* Ray strength test. |
160 |
> |
* Ambient level test. |
161 |
|
*/ |
162 |
< |
if (av->lvl > r->rlvl || av->weight < r->rweight-FTINY) |
162 |
> |
if (av->lvl > al || av->weight < r->rweight-FTINY) |
163 |
|
continue; |
164 |
|
/* |
165 |
|
* Ambient radius test. |
186 |
|
for (j = 0; j < 3; j++) |
187 |
|
d += (r->rop[j] - av->pos[j]) * |
188 |
|
(av->dir[j] + r->ron[j]); |
189 |
< |
if (d < -minarad) |
189 |
> |
if (d*0.5 < -minarad*ambacc-.001) |
190 |
|
continue; |
191 |
|
/* |
192 |
|
* Jittering final test reduces image artifacts. |
193 |
|
*/ |
194 |
|
wt = sqrt(e1) + sqrt(e2); |
195 |
< |
wt *= 0.9 + 0.2*frandom(); |
195 |
> |
wt *= .9 + .2*urand(9015+samplendx); |
196 |
|
if (wt > ambacc) |
197 |
|
continue; |
198 |
|
if (wt <= 1e-3) |
200 |
|
else |
201 |
|
wt = 1.0 / wt; |
202 |
|
wsum += wt; |
203 |
< |
copycolor(ct, av->val); |
203 |
> |
extambient(ct, av, r->rop, r->ron); |
204 |
|
scalecolor(ct, wt); |
205 |
|
addcolor(acol, ct); |
206 |
|
} |
207 |
+ |
if (at->kid == NULL) |
208 |
+ |
return(wsum); |
209 |
+ |
/* do children */ |
210 |
+ |
s *= 0.5; |
211 |
+ |
for (i = 0; i < 8; i++) { |
212 |
+ |
for (j = 0; j < 3; j++) { |
213 |
+ |
ck0[j] = c0[j]; |
214 |
+ |
if (1<<j & i) |
215 |
+ |
ck0[j] += s; |
216 |
+ |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
217 |
+ |
break; |
218 |
+ |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
219 |
+ |
break; |
220 |
+ |
} |
221 |
+ |
if (j == 3) |
222 |
+ |
wsum += sumambient(acol, r, al, at->kid+i, ck0, s); |
223 |
+ |
} |
224 |
|
return(wsum); |
225 |
|
} |
226 |
|
|
227 |
|
|
228 |
|
double |
229 |
< |
makeambient(acol, r) /* make a new ambient value */ |
229 |
> |
makeambient(acol, r, al) /* make a new ambient value */ |
230 |
|
COLOR acol; |
231 |
|
register RAY *r; |
232 |
+ |
int al; |
233 |
|
{ |
234 |
|
AMBVAL amb; |
235 |
< |
|
236 |
< |
amb.rad = doambient(acol, r); /* compute ambient */ |
235 |
> |
FVECT gp, gd; |
236 |
> |
/* compute weight */ |
237 |
> |
amb.weight = pow(AVGREFL, (double)al); |
238 |
> |
if (r->rweight < 0.2*amb.weight) /* heuristic */ |
239 |
> |
amb.weight = r->rweight; |
240 |
> |
/* compute ambient */ |
241 |
> |
amb.rad = doambient(acol, r, amb.weight, gp, gd); |
242 |
|
if (amb.rad == 0.0) |
243 |
|
return(0.0); |
244 |
|
/* store it */ |
245 |
|
VCOPY(amb.pos, r->rop); |
246 |
|
VCOPY(amb.dir, r->ron); |
247 |
< |
amb.lvl = r->rlvl; |
258 |
< |
amb.weight = r->rweight; |
247 |
> |
amb.lvl = al; |
248 |
|
copycolor(amb.val, acol); |
249 |
+ |
VCOPY(amb.gpos, gp); |
250 |
+ |
VCOPY(amb.gdir, gd); |
251 |
|
/* insert into tree */ |
252 |
|
avinsert(&amb, &atrunk, thescene.cuorg, thescene.cusize); |
253 |
|
avsave(&amb); /* write to file */ |
255 |
|
} |
256 |
|
|
257 |
|
|
258 |
< |
double |
259 |
< |
doambient(acol, r) /* compute ambient component */ |
260 |
< |
COLOR acol; |
261 |
< |
register RAY *r; |
258 |
> |
extambient(cr, ap, pv, nv) /* extrapolate value at pv, nv */ |
259 |
> |
COLOR cr; |
260 |
> |
register AMBVAL *ap; |
261 |
> |
FVECT pv, nv; |
262 |
|
{ |
263 |
< |
extern int ambcmp(); |
264 |
< |
extern double sin(), cos(), sqrt(); |
265 |
< |
double phi, xd, yd, zd; |
275 |
< |
double b, b2; |
276 |
< |
register AMBSAMP *div; |
277 |
< |
AMBSAMP dnew; |
278 |
< |
RAY ar; |
279 |
< |
FVECT ux, uy; |
280 |
< |
double arad; |
281 |
< |
int ndivs, nt, np, ns, ne, i, j; |
282 |
< |
register int k; |
263 |
> |
FVECT v1, v2; |
264 |
> |
register int i; |
265 |
> |
double d; |
266 |
|
|
267 |
< |
setcolor(acol, 0.0, 0.0, 0.0); |
268 |
< |
/* set number of divisions */ |
269 |
< |
nt = sqrt(ambdiv * r->rweight * 0.5) + 0.5; |
270 |
< |
np = 2 * nt; |
271 |
< |
ndivs = nt * np; |
272 |
< |
/* check first */ |
273 |
< |
if (ndivs == 0 || rayorigin(&ar, r, AMBIENT, 0.5) < 0) |
274 |
< |
return(0.0); |
275 |
< |
/* set number of super-samples */ |
276 |
< |
ns = ambssamp * r->rweight + 0.5; |
277 |
< |
if (ns > 0) { |
295 |
< |
div = (AMBSAMP *)malloc(ndivs*sizeof(AMBSAMP)); |
296 |
< |
if (div == NULL) |
297 |
< |
error(SYSTEM, "out of memory in doambient"); |
267 |
> |
d = 1.0; /* zeroeth order */ |
268 |
> |
/* gradient due to translation */ |
269 |
> |
for (i = 0; i < 3; i++) |
270 |
> |
d += ap->gpos[i]*(pv[i]-ap->pos[i]); |
271 |
> |
/* gradient due to rotation */ |
272 |
> |
VCOPY(v1, ap->dir); |
273 |
> |
fcross(v2, v1, nv); |
274 |
> |
d += DOT(ap->gdir, v2); |
275 |
> |
if (d <= 0.0) { |
276 |
> |
setcolor(cr, 0.0, 0.0, 0.0); |
277 |
> |
return; |
278 |
|
} |
279 |
< |
/* make axes */ |
280 |
< |
uy[0] = uy[1] = uy[2] = 0.0; |
301 |
< |
for (k = 0; k < 3; k++) |
302 |
< |
if (r->ron[k] < 0.6 && r->ron[k] > -0.6) |
303 |
< |
break; |
304 |
< |
uy[k] = 1.0; |
305 |
< |
fcross(ux, r->ron, uy); |
306 |
< |
normalize(ux); |
307 |
< |
fcross(uy, ux, r->ron); |
308 |
< |
/* sample divisions */ |
309 |
< |
arad = 0.0; |
310 |
< |
ne = 0; |
311 |
< |
for (i = 0; i < nt; i++) |
312 |
< |
for (j = 0; j < np; j++) { |
313 |
< |
rayorigin(&ar, r, AMBIENT, 0.5); /* pretested */ |
314 |
< |
zd = sqrt((i+frandom())/nt); |
315 |
< |
phi = 2.0*PI * (j+frandom())/np; |
316 |
< |
xd = cos(phi) * zd; |
317 |
< |
yd = sin(phi) * zd; |
318 |
< |
zd = sqrt(1.0 - zd*zd); |
319 |
< |
for (k = 0; k < 3; k++) |
320 |
< |
ar.rdir[k] = xd*ux[k]+yd*uy[k]+zd*r->ron[k]; |
321 |
< |
rayvalue(&ar); |
322 |
< |
if (ar.rot < FHUGE) |
323 |
< |
arad += 1.0 / ar.rot; |
324 |
< |
if (ns > 0) { /* save division */ |
325 |
< |
div[ne].k = 0.0; |
326 |
< |
copycolor(div[ne].v, ar.rcol); |
327 |
< |
div[ne].n = 0; |
328 |
< |
div[ne].t = i; div[ne].p = j; |
329 |
< |
/* sum errors */ |
330 |
< |
b = bright(ar.rcol); |
331 |
< |
if (i > 0) { /* from above */ |
332 |
< |
b2 = bright(div[ne-np].v) - b; |
333 |
< |
b2 *= b2 * 0.25; |
334 |
< |
div[ne].k += b2; |
335 |
< |
div[ne].n++; |
336 |
< |
div[ne-np].k += b2; |
337 |
< |
div[ne-np].n++; |
338 |
< |
} |
339 |
< |
if (j > 0) { /* from behind */ |
340 |
< |
b2 = bright(div[ne-1].v) - b; |
341 |
< |
b2 *= b2 * 0.25; |
342 |
< |
div[ne].k += b2; |
343 |
< |
div[ne].n++; |
344 |
< |
div[ne-1].k += b2; |
345 |
< |
div[ne-1].n++; |
346 |
< |
} |
347 |
< |
if (j == np-1) { /* around */ |
348 |
< |
b2 = bright(div[ne-(np-1)].v) - b; |
349 |
< |
b2 *= b2 * 0.25; |
350 |
< |
div[ne].k += b2; |
351 |
< |
div[ne].n++; |
352 |
< |
div[ne-(np-1)].k += b2; |
353 |
< |
div[ne-(np-1)].n++; |
354 |
< |
} |
355 |
< |
ne++; |
356 |
< |
} else |
357 |
< |
addcolor(acol, ar.rcol); |
358 |
< |
} |
359 |
< |
for (k = 0; k < ne; k++) { /* compute errors */ |
360 |
< |
if (div[k].n > 1) |
361 |
< |
div[k].k /= div[k].n; |
362 |
< |
div[k].n = 1; |
363 |
< |
} |
364 |
< |
/* sort the divisions */ |
365 |
< |
qsort(div, ne, sizeof(AMBSAMP), ambcmp); |
366 |
< |
/* skim excess */ |
367 |
< |
while (ne > ns) { |
368 |
< |
ne--; |
369 |
< |
addcolor(acol, div[ne].v); |
370 |
< |
} |
371 |
< |
/* super-sample */ |
372 |
< |
for (i = ns; i > 0; i--) { |
373 |
< |
rayorigin(&ar, r, AMBIENT, 0.5); /* pretested */ |
374 |
< |
zd = sqrt((div[0].t+frandom())/nt); |
375 |
< |
phi = 2.0*PI * (div[0].p+frandom())/np; |
376 |
< |
xd = cos(phi) * zd; |
377 |
< |
yd = sin(phi) * zd; |
378 |
< |
zd = sqrt(1.0 - zd*zd); |
379 |
< |
for (k = 0; k < 3; k++) |
380 |
< |
ar.rdir[k] = xd*ux[k]+yd*uy[k]+zd*r->ron[k]; |
381 |
< |
rayvalue(&ar); |
382 |
< |
if (ar.rot < FHUGE) |
383 |
< |
arad += 1.0 / ar.rot; |
384 |
< |
/* recompute error */ |
385 |
< |
copycolor(dnew.v, div[0].v); |
386 |
< |
addcolor(dnew.v, ar.rcol); |
387 |
< |
dnew.n = div[0].n + 1; |
388 |
< |
dnew.t = div[0].t; dnew.p = div[0].p; |
389 |
< |
b2 = bright(dnew.v)/dnew.n - bright(ar.rcol); |
390 |
< |
b2 = b2*b2 + div[0].k*(div[0].n*div[0].n); |
391 |
< |
dnew.k = b2/(dnew.n*dnew.n); |
392 |
< |
/* reinsert */ |
393 |
< |
for (k = 0; k < ne-1 && dnew.k < div[k+1].k; k++) |
394 |
< |
bcopy(&div[k+1], &div[k], sizeof(AMBSAMP)); |
395 |
< |
bcopy(&dnew, &div[k], sizeof(AMBSAMP)); |
396 |
< |
|
397 |
< |
if (ne >= i) { /* extract darkest division */ |
398 |
< |
ne--; |
399 |
< |
if (div[ne].n > 1) |
400 |
< |
scalecolor(div[ne].v, 1.0/div[ne].n); |
401 |
< |
addcolor(acol, div[ne].v); |
402 |
< |
} |
403 |
< |
} |
404 |
< |
scalecolor(acol, 1.0/ndivs); |
405 |
< |
if (arad <= FTINY) |
406 |
< |
arad = FHUGE; |
407 |
< |
else |
408 |
< |
arad = (ndivs+ns) / arad / sqrt(r->rweight); |
409 |
< |
if (arad > maxarad) |
410 |
< |
arad = maxarad; |
411 |
< |
else if (arad < minarad) |
412 |
< |
arad = minarad; |
413 |
< |
if (ns > 0) |
414 |
< |
free((char *)div); |
415 |
< |
return(arad); |
279 |
> |
copycolor(cr, ap->val); |
280 |
> |
scalecolor(cr, d); |
281 |
|
} |
282 |
|
|
283 |
|
|
419 |
– |
static int |
420 |
– |
ambcmp(d1, d2) /* decreasing order */ |
421 |
– |
AMBSAMP *d1, *d2; |
422 |
– |
{ |
423 |
– |
if (d1->k < d2->k) |
424 |
– |
return(1); |
425 |
– |
if (d1->k > d2->k) |
426 |
– |
return(-1); |
427 |
– |
return(0); |
428 |
– |
} |
429 |
– |
|
430 |
– |
|
284 |
|
static |
285 |
|
avsave(av) /* save an ambient value */ |
286 |
|
AMBVAL *av; |
290 |
|
#endif |
291 |
|
if (ambfp == NULL) |
292 |
|
return; |
293 |
< |
if (fwrite(av, sizeof(AMBVAL), 1, ambfp) != 1) |
293 |
> |
if (fwrite((char *)av, sizeof(AMBVAL), 1, ambfp) != 1) |
294 |
|
goto writerr; |
295 |
|
#ifdef AMBFLUSH |
296 |
|
if (++nunflshed >= AMBFLUSH) { |
319 |
|
|
320 |
|
if ((av = newambval()) == NULL) |
321 |
|
goto memerr; |
322 |
< |
bcopy(aval, av, sizeof(AMBVAL)); |
322 |
> |
copystruct(av, aval); |
323 |
|
VCOPY(ck0, c0); |
324 |
|
while (s*(OCTSCALE/2) > av->rad*ambacc) { |
325 |
|
if (at->kid == NULL) |