33 |
|
#include "view.h" |
34 |
|
#include "random.h" |
35 |
|
#include "paths.h" |
36 |
< |
#include "rtmisc.h" /* myhostname() */ |
36 |
> |
#include "hilbert.h" |
37 |
> |
#include "pmapbias.h" |
38 |
> |
#include "pmapdiag.h" |
39 |
|
|
38 |
– |
|
40 |
|
#define RFTEMPLATE "rfXXXXXX" |
41 |
|
|
42 |
|
#ifndef SIGCONT |
52 |
|
int ndims = 0; /* number of sampling dimensions */ |
53 |
|
int samplendx; /* sample index number */ |
54 |
|
|
54 |
– |
//extern void ambnotify(); |
55 |
|
void (*addobjnotify[])() = {ambnotify, NULL}; |
56 |
|
|
57 |
|
VIEW ourview = STDVIEW; /* view parameters */ |
92 |
|
int backvis = 1; /* back face visibility */ |
93 |
|
|
94 |
|
int maxdepth = 7; /* maximum recursion depth */ |
95 |
< |
double minweight = 4e-3; /* minimum ray weight */ |
95 |
> |
double minweight = 1e-3; /* minimum ray weight */ |
96 |
|
|
97 |
|
char *ambfile = NULL; /* ambient file name */ |
98 |
|
COLOR ambval = BLKCOLOR; /* ambient value */ |
119 |
|
|
120 |
|
static VIEW lastview; /* the previous view input */ |
121 |
|
|
122 |
– |
//extern char *mktemp(); /* XXX should be in stdlib.h or unistd.h */ |
123 |
– |
|
124 |
– |
//double pixvalue(); |
125 |
– |
|
122 |
|
static void report(int); |
123 |
|
static int nextview(FILE *fp); |
124 |
|
static void render(char *zfile, char *oldfile); |
134 |
|
|
135 |
|
|
136 |
|
|
141 |
– |
#ifdef RHAS_STAT |
142 |
– |
#include <sys/types.h> |
143 |
– |
#include <sys/stat.h> |
144 |
– |
int |
145 |
– |
file_exists(fname) /* ordinary file exists? */ |
146 |
– |
char *fname; |
147 |
– |
{ |
148 |
– |
struct stat sbuf; |
149 |
– |
if (stat(fname, &sbuf) < 0) return(0); |
150 |
– |
return((sbuf.st_mode & S_IFREG) != 0); |
151 |
– |
} |
152 |
– |
#else |
153 |
– |
#define file_exists(f) (access(f,F_OK)==0) |
154 |
– |
#endif |
155 |
– |
|
156 |
– |
|
137 |
|
void |
138 |
|
quit(code) /* quit program */ |
139 |
|
int code; |
152 |
|
static void |
153 |
|
report(int dummy) /* report progress */ |
154 |
|
{ |
155 |
< |
double u, s; |
155 |
> |
char bcStat [128]; |
156 |
> |
double u, s; |
157 |
|
#ifdef BSD |
158 |
< |
struct rusage rubuf; |
158 |
> |
struct rusage rubuf; |
159 |
|
#else |
160 |
< |
struct tms tbuf; |
161 |
< |
double period; |
160 |
> |
double period = 1.0 / 60.0; |
161 |
> |
struct tms tbuf; |
162 |
|
#endif |
163 |
|
|
164 |
|
tlastrept = time((time_t *)NULL); |
165 |
|
#ifdef BSD |
166 |
|
getrusage(RUSAGE_SELF, &rubuf); |
167 |
< |
u = rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6; |
168 |
< |
s = rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6; |
167 |
> |
u = rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec*1e-6; |
168 |
> |
s = rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec*1e-6; |
169 |
|
getrusage(RUSAGE_CHILDREN, &rubuf); |
170 |
< |
u += rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6; |
171 |
< |
s += rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6; |
170 |
> |
u += rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec*1e-6; |
171 |
> |
s += rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec*1e-6; |
172 |
|
#else |
173 |
|
times(&tbuf); |
174 |
|
#ifdef _SC_CLK_TCK |
175 |
|
period = 1.0 / sysconf(_SC_CLK_TCK); |
195 |
– |
#else |
196 |
– |
period = 1.0 / 60.0; |
176 |
|
#endif |
177 |
|
u = ( tbuf.tms_utime + tbuf.tms_cutime ) * period; |
178 |
|
s = ( tbuf.tms_stime + tbuf.tms_cstime ) * period; |
179 |
|
#endif |
180 |
|
|
181 |
+ |
/* PMAP: Get photon map bias compensation statistics */ |
182 |
+ |
pmapBiasCompReport(bcStat); |
183 |
+ |
|
184 |
|
sprintf(errmsg, |
185 |
< |
"%lu rays, %4.2f%% after %.3fu %.3fs %.3fr hours on %s\n", |
186 |
< |
nrays, pctdone, u/3600., s/3600., |
187 |
< |
(tlastrept-tstart)/3600., myhostname()); |
185 |
> |
"%lu rays, %s%4.2f%% after %.3fu %.3fs %.3fr hours on %s (PID %d)\n", |
186 |
> |
nrays, bcStat, pctdone, u*(1./3600.), s*(1./3600.), |
187 |
> |
(tlastrept-tstart)*(1./3600.), myhostname(), getpid()); |
188 |
|
eputs(errmsg); |
189 |
|
#ifdef SIGCONT |
190 |
|
signal(SIGCONT, report); |
194 |
|
static void |
195 |
|
report(int dummy) /* report progress */ |
196 |
|
{ |
197 |
+ |
char bcStat [128]; |
198 |
+ |
|
199 |
|
tlastrept = time((time_t *)NULL); |
200 |
< |
sprintf(errmsg, "%lu rays, %4.2f%% after %5.4f hours\n", |
201 |
< |
nrays, pctdone, (tlastrept-tstart)/3600.0); |
200 |
> |
|
201 |
> |
/* PMAP: Get photon map bias compensation statistics */ |
202 |
> |
pmapBiasCompReport(bcStat); |
203 |
> |
|
204 |
> |
sprintf(errmsg, "%lu rays, %s%4.2f%% after %5.4f hours\n", |
205 |
> |
nrays, bcStat, pctdone, (tlastrept-tstart)/3600.0); |
206 |
|
eputs(errmsg); |
207 |
|
} |
208 |
|
#endif |
209 |
|
|
210 |
|
|
211 |
< |
extern void |
211 |
> |
void |
212 |
|
rpict( /* generate image(s) */ |
213 |
|
int seq, |
214 |
|
char *pout, |
229 |
|
{ |
230 |
|
char fbuf[128], fbuf2[128]; |
231 |
|
int npicts; |
232 |
< |
register char *cp; |
232 |
> |
char *cp; |
233 |
|
RESOLU rs; |
234 |
|
double pa; |
235 |
|
/* check sampling */ |
245 |
|
if (seq <= 0) |
246 |
|
seq = 0; |
247 |
|
else if (prvr != NULL && isint(prvr)) { |
248 |
< |
register int rn; /* skip to specified view */ |
248 |
> |
int rn; /* skip to specified view */ |
249 |
|
if ((rn = atoi(prvr)) < seq) |
250 |
|
error(USER, "recover frame less than start frame"); |
251 |
|
if (pout == NULL) |
288 |
|
break; |
289 |
|
pctdone = 0.0; |
290 |
|
if (pout != NULL) { |
291 |
+ |
close(1); /* reassign stdout */ |
292 |
|
sprintf(fbuf, pout, seq); |
293 |
< |
if (file_exists(fbuf)) { |
294 |
< |
if (prvr != NULL || !strcmp(fbuf, pout)) { |
293 |
> |
errno = 0; /* exclusive open */ |
294 |
> |
if (open(fbuf, O_WRONLY|O_CREAT|O_EXCL, 0666) != 1) { |
295 |
> |
if ((errno != EEXIST) | (prvr != NULL) || |
296 |
> |
!strcmp(fbuf, pout)) { |
297 |
|
sprintf(errmsg, |
298 |
< |
"output file \"%s\" exists", |
298 |
> |
"cannot open output file \"%s\"", |
299 |
|
fbuf); |
300 |
< |
error(USER, errmsg); |
300 |
> |
error(SYSTEM, errmsg); |
301 |
|
} |
302 |
|
setview(&ourview); |
303 |
|
continue; /* don't clobber */ |
304 |
|
} |
305 |
< |
if (freopen(fbuf, "w", stdout) == NULL) { |
315 |
< |
sprintf(errmsg, |
316 |
< |
"cannot open output file \"%s\"", fbuf); |
317 |
< |
error(SYSTEM, errmsg); |
318 |
< |
} |
319 |
< |
SET_FILE_BINARY(stdout); |
305 |
> |
SET_FD_BINARY(1); |
306 |
|
dupheader(); |
307 |
|
} |
308 |
|
hres = hresolu; vres = vresolu; pa = pixaspect; |
332 |
|
fputs(VIEWSTR, stdout); |
333 |
|
fprintview(&ourview, stdout); |
334 |
|
putchar('\n'); |
335 |
< |
if (pa < .99 || pa > 1.01) |
335 |
> |
if ((pa < .99) | (pa > 1.01)) |
336 |
|
fputaspect(pa, stdout); |
337 |
|
fputnow(stdout); |
338 |
|
fputformat(COLRFMT, stdout); |
381 |
|
int zfd; |
382 |
|
COLOR *colptr; |
383 |
|
float *zptr; |
384 |
< |
register int i; |
384 |
> |
int i; |
385 |
|
/* check for empty image */ |
386 |
< |
if (hres <= 0 || vres <= 0) { |
386 |
> |
if ((hres <= 0) | (vres <= 0)) { |
387 |
|
error(WARNING, "empty output picture"); |
388 |
|
fprtresolu(0, 0, stdout); |
389 |
|
return; |
427 |
|
i = salvage(oldfile); |
428 |
|
if (i >= vres) |
429 |
|
goto alldone; |
430 |
< |
if (zfd != -1 && i > 0 && |
430 |
> |
if ((zfd != -1) & (i > 0) && |
431 |
|
lseek(zfd, (off_t)i*hres*sizeof(float), SEEK_SET) < 0) |
432 |
|
error(SYSTEM, "z-file seek error in render"); |
433 |
|
pctdone = 100.0*i/vres; |
521 |
|
|
522 |
|
static void |
523 |
|
fillscanline( /* fill scan at y */ |
524 |
< |
register COLOR *scanline, |
525 |
< |
register float *zline, |
526 |
< |
register char *sd, |
524 |
> |
COLOR *scanline, |
525 |
> |
float *zline, |
526 |
> |
char *sd, |
527 |
|
int xres, |
528 |
|
int y, |
529 |
|
int xstep |
532 |
|
static int nc = 0; /* number of calls */ |
533 |
|
int bl = xstep, b = xstep; |
534 |
|
double z; |
535 |
< |
register int i; |
535 |
> |
int i; |
536 |
|
|
537 |
|
z = pixvalue(scanline[0], 0, y); |
538 |
|
if (zline) zline[0] = z; |
560 |
|
|
561 |
|
static void |
562 |
|
fillscanbar( /* fill interior */ |
563 |
< |
register COLOR *scanbar[], |
564 |
< |
register float *zbar[], |
563 |
> |
COLOR *scanbar[], |
564 |
> |
float *zbar[], |
565 |
|
int xres, |
566 |
|
int y, |
567 |
|
int ysize |
570 |
|
COLOR vline[MAXDIV+1]; |
571 |
|
float zline[MAXDIV+1]; |
572 |
|
int b = ysize; |
573 |
< |
register int i, j; |
573 |
> |
int i, j; |
574 |
|
|
575 |
|
for (i = 0; i < xres; i++) { |
576 |
|
copycolor(vline[0], scanbar[0][i]); |
593 |
|
|
594 |
|
static int |
595 |
|
fillsample( /* fill interior points */ |
596 |
< |
register COLOR *colline, |
597 |
< |
register float *zline, |
596 |
> |
COLOR *colline, |
597 |
> |
float *zline, |
598 |
|
int x, |
599 |
|
int y, |
600 |
|
int xlen, |
606 |
|
double z; |
607 |
|
COLOR ctmp; |
608 |
|
int ncut; |
609 |
< |
register int len; |
609 |
> |
int len; |
610 |
|
|
611 |
|
if (xlen > 0) /* x or y length is zero */ |
612 |
|
len = xlen; |
654 |
|
int y |
655 |
|
) |
656 |
|
{ |
657 |
+ |
extern void SDsquare2disk(double ds[2], double seedx, double seedy); |
658 |
|
RAY thisray; |
659 |
|
FVECT lorg, ldir; |
660 |
|
double hpos, vpos, vdist, lmax; |
661 |
< |
register int i; |
661 |
> |
int i; |
662 |
|
/* compute view ray */ |
663 |
+ |
setcolor(col, 0.0, 0.0, 0.0); |
664 |
|
hpos = (x+pixjitter())/hres; |
665 |
|
vpos = (y+pixjitter())/vres; |
666 |
|
if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, |
667 |
< |
&ourview, hpos, vpos)) < -FTINY) { |
680 |
< |
setcolor(col, 0.0, 0.0, 0.0); |
667 |
> |
&ourview, hpos, vpos)) < -FTINY) |
668 |
|
return(0.0); |
669 |
< |
} |
669 |
> |
|
670 |
|
vdist = ourview.vdist; |
671 |
|
/* set pixel index */ |
672 |
|
samplendx = pixnumber(x,y,hres,vres); |
673 |
|
/* optional motion blur */ |
674 |
|
if (lastview.type && mblur > FTINY && (lmax = viewray(lorg, ldir, |
675 |
|
&lastview, hpos, vpos)) >= -FTINY) { |
676 |
< |
register double d = mblur*(.5-urand(281+samplendx)); |
676 |
> |
double d = mblur*(.5-urand(281+samplendx)); |
677 |
|
|
678 |
|
thisray.rmax = (1.-d)*thisray.rmax + d*lmax; |
679 |
|
for (i = 3; i--; ) { |
685 |
|
vdist = (1.-d)*vdist + d*lastview.vdist; |
686 |
|
} |
687 |
|
/* optional depth-of-field */ |
688 |
< |
if (dblur > FTINY && vdist > FTINY) { |
689 |
< |
double vc, dfh, dfv; |
690 |
< |
/* square/circle conv. */ |
691 |
< |
dfh = vc = frandom(); |
692 |
< |
dfv = frandom(); |
693 |
< |
dfh *= .5*dblur*sqrt(1. - .5*dfv*dfv); |
694 |
< |
dfv *= .5*dblur*sqrt(1. - .5*vc*vc); |
695 |
< |
if (ourview.type == VT_PER || ourview.type == VT_PAR) { |
696 |
< |
dfh /= sqrt(ourview.hn2); |
697 |
< |
dfv /= sqrt(ourview.vn2); |
688 |
> |
if (dblur > FTINY) { |
689 |
> |
double vc, df[2]; |
690 |
> |
/* random point on disk */ |
691 |
> |
SDsquare2disk(df, frandom(), frandom()); |
692 |
> |
df[0] *= .5*dblur; |
693 |
> |
df[1] *= .5*dblur; |
694 |
> |
if ((ourview.type == VT_PER) | (ourview.type == VT_PAR)) { |
695 |
> |
double adj = 1.0; |
696 |
> |
if (ourview.type == VT_PER) |
697 |
> |
adj /= DOT(thisray.rdir, ourview.vdir); |
698 |
> |
df[0] /= sqrt(ourview.hn2); |
699 |
> |
df[1] /= sqrt(ourview.vn2); |
700 |
|
for (i = 3; i--; ) { |
701 |
< |
vc = thisray.rorg[i] + vdist*thisray.rdir[i]; |
702 |
< |
thisray.rorg[i] += dfh*ourview.hvec[i] + |
703 |
< |
dfv*ourview.vvec[i] ; |
701 |
> |
vc = ourview.vp[i] + adj*vdist*thisray.rdir[i]; |
702 |
> |
thisray.rorg[i] += df[0]*ourview.hvec[i] + |
703 |
> |
df[1]*ourview.vvec[i] ; |
704 |
|
thisray.rdir[i] = vc - thisray.rorg[i]; |
705 |
|
} |
706 |
|
} else { /* non-standard view case */ |
707 |
|
double dfd = PI/4.*dblur*(.5 - frandom()); |
708 |
< |
if (ourview.type != VT_ANG && ourview.type != VT_PLS) { |
708 |
> |
if ((ourview.type != VT_ANG) & (ourview.type != VT_PLS)) { |
709 |
|
if (ourview.type != VT_CYL) |
710 |
< |
dfh /= sqrt(ourview.hn2); |
711 |
< |
dfv /= sqrt(ourview.vn2); |
710 |
> |
df[0] /= sqrt(ourview.hn2); |
711 |
> |
df[1] /= sqrt(ourview.vn2); |
712 |
|
} |
713 |
|
for (i = 3; i--; ) { |
714 |
< |
vc = thisray.rorg[i] + vdist*thisray.rdir[i]; |
715 |
< |
thisray.rorg[i] += dfh*ourview.hvec[i] + |
716 |
< |
dfv*ourview.vvec[i] + |
714 |
> |
vc = ourview.vp[i] + vdist*thisray.rdir[i]; |
715 |
> |
thisray.rorg[i] += df[0]*ourview.hvec[i] + |
716 |
> |
df[1]*ourview.vvec[i] + |
717 |
|
dfd*ourview.vdir[i] ; |
718 |
|
thisray.rdir[i] = vc - thisray.rorg[i]; |
719 |
|
} |
728 |
|
|
729 |
|
copycolor(col, thisray.rcol); /* return color */ |
730 |
|
|
731 |
< |
return(thisray.rt); /* return distance */ |
731 |
> |
return(raydistance(&thisray)); /* return distance */ |
732 |
|
} |
733 |
|
|
734 |
|
|
761 |
|
goto gotzip; |
762 |
|
} |
763 |
|
|
764 |
< |
if (x != hres || y != vres) { |
764 |
> |
if ((x != hres) | (y != vres)) { |
765 |
|
sprintf(errmsg, "resolution mismatch in recover file \"%s\"", |
766 |
|
oldfile); |
767 |
|
error(USER, errmsg); |
793 |
|
} |
794 |
|
|
795 |
|
static int |
796 |
< |
pixnumber( /* compute pixel index (brushed) */ |
797 |
< |
register int x, |
798 |
< |
register int y, |
796 |
> |
pixnumber( /* compute pixel index (screen door) */ |
797 |
> |
int x, |
798 |
> |
int y, |
799 |
|
int xres, |
800 |
|
int yres |
801 |
|
) |
802 |
|
{ |
803 |
< |
x -= y; |
804 |
< |
while (x < 0) |
805 |
< |
x += xres; |
806 |
< |
return((((x>>2)*yres + y) << 2) + (x & 3)); |
803 |
> |
unsigned nbits = 0; |
804 |
> |
bitmask_t coord[2]; |
805 |
> |
|
806 |
> |
if (xres < yres) xres = yres; |
807 |
> |
while (xres > 0) { |
808 |
> |
xres >>= 1; |
809 |
> |
++nbits; |
810 |
> |
} |
811 |
> |
coord[0] = x; coord[1] = y; |
812 |
> |
return ((int)hilbert_c2i(2, nbits, coord)); |
813 |
|
} |