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 |
134 |
|
|
135 |
|
|
136 |
|
|
136 |
– |
#ifdef RHAS_STAT |
137 |
– |
#include <sys/types.h> |
138 |
– |
#include <sys/stat.h> |
139 |
– |
int |
140 |
– |
file_exists(fname) /* ordinary file exists? */ |
141 |
– |
char *fname; |
142 |
– |
{ |
143 |
– |
struct stat sbuf; |
144 |
– |
if (stat(fname, &sbuf) < 0) return(0); |
145 |
– |
return((sbuf.st_mode & S_IFREG) != 0); |
146 |
– |
} |
147 |
– |
#else |
148 |
– |
#define file_exists(f) (access(f,F_OK)==0) |
149 |
– |
#endif |
150 |
– |
|
151 |
– |
|
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); |
190 |
– |
#else |
191 |
– |
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, |
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) { |
310 |
< |
sprintf(errmsg, |
311 |
< |
"cannot open output file \"%s\"", fbuf); |
312 |
< |
error(SYSTEM, errmsg); |
313 |
< |
} |
314 |
< |
SET_FILE_BINARY(stdout); |
305 |
> |
SET_FD_BINARY(1); |
306 |
|
dupheader(); |
307 |
|
} |
308 |
|
hres = hresolu; vres = vresolu; pa = pixaspect; |
728 |
|
|
729 |
|
copycolor(col, thisray.rcol); /* return color */ |
730 |
|
|
731 |
< |
return(thisray.rt); /* return distance */ |
731 |
> |
return(raydistance(&thisray)); /* return distance */ |
732 |
|
} |
733 |
|
|
734 |
|
|
793 |
|
} |
794 |
|
|
795 |
|
static int |
796 |
< |
pixnumber( /* compute pixel index (brushed) */ |
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 |
|
} |