7 |
|
|
8 |
|
#include "copyright.h" |
9 |
|
|
10 |
+ |
#include "platform.h" |
11 |
|
#include "ray.h" |
12 |
+ |
#include "paths.h" |
13 |
|
|
14 |
|
#include <sys/types.h> |
15 |
|
|
26 |
|
#include <time.h> |
27 |
|
#include <signal.h> |
28 |
|
|
27 |
– |
#include "platform.h" |
29 |
|
#include "view.h" |
30 |
|
#include "random.h" |
31 |
|
#include "paths.h" |
32 |
+ |
#include "rtmisc.h" /* myhostname() */ |
33 |
|
|
34 |
|
|
35 |
|
#define RFTEMPLATE "rfXXXXXX" |
83 |
|
|
84 |
|
int backvis = 1; /* back face visibility */ |
85 |
|
|
86 |
< |
int maxdepth = 6; /* maximum recursion depth */ |
87 |
< |
double minweight = 5e-3; /* minimum ray weight */ |
86 |
> |
int maxdepth = 7; /* maximum recursion depth */ |
87 |
> |
double minweight = 4e-3; /* minimum ray weight */ |
88 |
|
|
89 |
|
char *ambfile = NULL; /* ambient file name */ |
90 |
|
COLOR ambval = BLKCOLOR; /* ambient value */ |
91 |
|
int ambvwt = 0; /* initial weight for ambient value */ |
92 |
|
double ambacc = 0.2; /* ambient accuracy */ |
93 |
< |
int ambres = 32; /* ambient resolution */ |
94 |
< |
int ambdiv = 128; /* ambient divisions */ |
95 |
< |
int ambssamp = 0; /* ambient super-samples */ |
93 |
> |
int ambres = 64; /* ambient resolution */ |
94 |
> |
int ambdiv = 512; /* ambient divisions */ |
95 |
> |
int ambssamp = 128; /* ambient super-samples */ |
96 |
|
int ambounce = 0; /* ambient bounces */ |
97 |
|
char *amblist[128]; /* ambient include/exclude list */ |
98 |
|
int ambincl = -1; /* include == 1, exclude == 0 */ |
151 |
|
void |
152 |
|
report() /* report progress */ |
153 |
|
{ |
152 |
– |
extern char *myhostname(); |
154 |
|
double u, s; |
155 |
|
#ifdef BSD |
156 |
|
struct rusage rubuf; |
244 |
|
setview(&ourview); |
245 |
|
prvr = fbuf; /* mark for renaming */ |
246 |
|
} |
247 |
< |
if (pout != NULL & prvr != NULL) { |
247 |
> |
if ((pout != NULL) & (prvr != NULL)) { |
248 |
|
sprintf(fbuf, pout, seq); |
249 |
|
if (!strcmp(prvr, fbuf)) { /* rename */ |
250 |
|
strcpy(fbuf2, fbuf); |
254 |
|
cp--; |
255 |
|
strcpy(cp, RFTEMPLATE); |
256 |
|
prvr = mktemp(fbuf2); |
257 |
< |
if (rename(fbuf, prvr) < 0) |
257 |
> |
if (rename(fbuf, prvr) < 0) { |
258 |
|
if (errno == ENOENT) { /* ghost file */ |
259 |
|
sprintf(errmsg, |
260 |
|
"new output file \"%s\"", |
267 |
|
fbuf, prvr); |
268 |
|
error(SYSTEM, errmsg); |
269 |
|
} |
270 |
+ |
} |
271 |
|
} |
272 |
|
} |
273 |
|
npicts = 0; /* render sequence */ |
296 |
|
dupheader(); |
297 |
|
} |
298 |
|
hres = hresolu; vres = vresolu; pa = pixaspect; |
299 |
< |
if (prvr != NULL) |
300 |
< |
if (viewfile(prvr, &ourview, &rs) <= 0 |
299 |
< |
|| rs.rt != PIXSTANDARD) { |
299 |
> |
if (prvr != NULL) { |
300 |
> |
if (viewfile(prvr, &ourview, &rs) <= 0) { |
301 |
|
sprintf(errmsg, |
302 |
|
"cannot recover view parameters from \"%s\"", prvr); |
303 |
|
error(WARNING, errmsg); |
306 |
|
hres = scanlen(&rs); |
307 |
|
vres = numscans(&rs); |
308 |
|
} |
309 |
+ |
} |
310 |
|
if ((cp = setview(&ourview)) != NULL) |
311 |
|
error(USER, cp); |
312 |
|
normaspect(viewaspect(&ourview), &pa, &hres, &vres); |
324 |
|
putchar('\n'); |
325 |
|
if (pa < .99 || pa > 1.01) |
326 |
|
fputaspect(pa, stdout); |
327 |
< |
fputnow(); |
327 |
> |
fputnow(stdout); |
328 |
|
fputformat(COLRFMT, stdout); |
329 |
|
putchar('\n'); |
330 |
|
if (zout != NULL) |
346 |
|
{ |
347 |
|
char linebuf[256]; |
348 |
|
|
349 |
< |
copystruct(&lastview, &ourview); |
349 |
> |
lastview = ourview; |
350 |
|
while (fgets(linebuf, sizeof(linebuf), fp) != NULL) |
351 |
|
if (isview(linebuf) && sscanview(&ourview, linebuf) > 0) |
352 |
|
return(0); |
413 |
|
if (i >= vres) |
414 |
|
goto alldone; |
415 |
|
if (zfd != -1 && i > 0 && |
416 |
< |
lseek(zfd, (off_t)i*hres*sizeof(float), 0) < 0) |
416 |
> |
lseek(zfd, (off_t)i*hres*sizeof(float), SEEK_SET) < 0) |
417 |
|
error(SYSTEM, "z-file seek error in render"); |
418 |
|
pctdone = 100.0*i/vres; |
419 |
|
if (ralrm > 0) /* report init stats */ |