| 22 |
|
|
| 23 |
|
#include "view.h" |
| 24 |
|
|
| 25 |
+ |
#include "resolu.h" |
| 26 |
+ |
|
| 27 |
|
#include "random.h" |
| 28 |
|
|
| 29 |
|
int dimlist[MAXDIM]; /* sampling dimensions */ |
| 47 |
|
int directinvis = 0; /* sources invisible? */ |
| 48 |
|
double srcsizerat = .25; /* maximum ratio source size/dist. */ |
| 49 |
|
|
| 50 |
+ |
double specthresh = .5; /* specular sampling threshold */ |
| 51 |
+ |
double specjitter = 1.; /* specular sampling jitter */ |
| 52 |
+ |
|
| 53 |
|
int maxdepth = 6; /* maximum recursion depth */ |
| 54 |
|
double minweight = 5e-3; /* minimum ray weight */ |
| 55 |
|
|
| 73 |
|
|
| 74 |
|
extern long nrays; /* number of rays traced */ |
| 75 |
|
|
| 76 |
< |
#define MAXDIV 15 /* maximum sample size */ |
| 76 |
> |
#define MAXDIV 16 /* maximum sample size */ |
| 77 |
|
|
| 78 |
|
#define pixjitter() (.5+dstrpix*(.5-frandom())) |
| 79 |
|
|
| 111 |
|
#else |
| 112 |
|
report() /* report progress */ |
| 113 |
|
{ |
| 109 |
– |
signal(SIGALRM, report); |
| 114 |
|
tlastrept = time((long *)0); |
| 115 |
|
sprintf(errmsg, "%ld rays, %4.2f%% done after %5.4f hours\n", |
| 116 |
|
nrays, pctdone, (tlastrept-tstart)/3600.0); |
| 117 |
|
eputs(errmsg); |
| 118 |
+ |
signal(SIGALRM, report); |
| 119 |
|
} |
| 120 |
|
#endif |
| 121 |
|
|
| 126 |
|
extern long lseek(); |
| 127 |
|
COLOR *scanbar[MAXDIV+1]; /* scanline arrays of pixel values */ |
| 128 |
|
float *zbar[MAXDIV+1]; /* z values */ |
| 129 |
+ |
char *sampdens; /* previous sample density */ |
| 130 |
|
int ypos; /* current scanline */ |
| 131 |
|
int ystep; /* current y step size */ |
| 132 |
|
int hstep; /* h step size */ |
| 149 |
|
if (scanbar[i] == NULL) |
| 150 |
|
goto memerr; |
| 151 |
|
} |
| 152 |
+ |
hstep = (psample*140+49)/99; /* quincunx sampling */ |
| 153 |
+ |
ystep = (psample*99+70)/140; |
| 154 |
+ |
if (hstep > 2) { |
| 155 |
+ |
i = hresolu/hstep + 2; |
| 156 |
+ |
if ((sampdens = malloc(i)) == NULL) |
| 157 |
+ |
goto memerr; |
| 158 |
+ |
while (i--) |
| 159 |
+ |
sampdens[i] = hstep; |
| 160 |
+ |
} else |
| 161 |
+ |
sampdens = NULL; |
| 162 |
|
/* open z file */ |
| 163 |
|
if (zfile != NULL) { |
| 164 |
|
if ((zfd = open(zfile, O_WRONLY|O_CREAT, 0666)) == -1) { |
| 176 |
|
zbar[i] = NULL; |
| 177 |
|
} |
| 178 |
|
/* write out boundaries */ |
| 179 |
< |
fputresolu(YMAJOR|YDECR, hresolu, vresolu, stdout); |
| 179 |
> |
fprtresolu(hresolu, vresolu, stdout); |
| 180 |
|
/* recover file and compute first */ |
| 181 |
|
i = salvage(oldfile); |
| 182 |
|
if (zfd != -1 && i > 0 && |
| 190 |
|
#endif |
| 191 |
|
signal(SIGALRM, report); |
| 192 |
|
ypos = vresolu-1 - i; |
| 193 |
< |
hstep = (psample*140+49)/99; /* quincunx sampling */ |
| 178 |
< |
ystep = (psample*99+70)/140; |
| 179 |
< |
fillscanline(scanbar[0], zbar[0], hresolu, ypos, hstep); |
| 193 |
> |
fillscanline(scanbar[0], zbar[0], sampdens, hresolu, ypos, hstep); |
| 194 |
|
/* compute scanlines */ |
| 195 |
|
for (ypos -= ystep; ypos > -ystep; ypos -= ystep) { |
| 196 |
|
/* bottom adjust? */ |
| 205 |
|
zbar[ystep] = zbar[0]; |
| 206 |
|
zbar[0] = zptr; |
| 207 |
|
/* fill base line */ |
| 208 |
< |
fillscanline(scanbar[0], zbar[0], hresolu, ypos, hstep); |
| 208 |
> |
fillscanline(scanbar[0], zbar[0], sampdens, |
| 209 |
> |
hresolu, ypos, hstep); |
| 210 |
|
/* fill bar */ |
| 211 |
|
fillscanbar(scanbar, zbar, hresolu, ypos, ystep); |
| 212 |
|
/* write it out */ |
| 247 |
|
goto writerr; |
| 248 |
|
for (i = 0; i <= psample; i++) |
| 249 |
|
free((char *)scanbar[i]); |
| 250 |
+ |
if (sampdens != NULL) |
| 251 |
+ |
free(sampdens); |
| 252 |
|
pctdone = 100.0; |
| 253 |
|
return; |
| 254 |
|
writerr: |
| 258 |
|
} |
| 259 |
|
|
| 260 |
|
|
| 261 |
< |
fillscanline(scanline, zline, xres, y, xstep) /* fill scan line at y */ |
| 261 |
> |
fillscanline(scanline, zline, sd, xres, y, xstep) /* fill scan at y */ |
| 262 |
|
register COLOR *scanline; |
| 263 |
|
register float *zline; |
| 264 |
+ |
register char *sd; |
| 265 |
|
int xres, y, xstep; |
| 266 |
|
{ |
| 267 |
|
static int nc = 0; /* number of calls */ |
| 268 |
< |
int b = xstep; |
| 268 |
> |
int bl = xstep, b = xstep; |
| 269 |
|
double z; |
| 270 |
|
register int i; |
| 271 |
|
|
| 272 |
|
z = pixvalue(scanline[0], 0, y); |
| 273 |
|
if (zline) zline[0] = z; |
| 274 |
|
/* zig-zag start for quincunx pattern */ |
| 275 |
< |
for (i = nc++ & 1 ? xstep/2 : xstep; i < xres-1+xstep; i += xstep) { |
| 275 |
> |
for (i = ++nc & 1 ? xstep : xstep/2; i < xres-1+xstep; i += xstep) { |
| 276 |
|
if (i >= xres) { |
| 277 |
|
xstep += xres-1-i; |
| 278 |
|
i = xres-1; |
| 279 |
|
} |
| 280 |
|
z = pixvalue(scanline[i], i, y); |
| 281 |
|
if (zline) zline[i] = z; |
| 282 |
< |
|
| 283 |
< |
b = fillsample(scanline+i-xstep, zline ? zline+i-xstep : NULL, |
| 284 |
< |
i-xstep, y, xstep, 0, b/2); |
| 282 |
> |
if (sd) b = sd[0] > sd[1] ? sd[0] : sd[1]; |
| 283 |
> |
if (i <= xstep) |
| 284 |
> |
b = fillsample(scanline, zline, 0, y, i, 0, b/2); |
| 285 |
> |
else |
| 286 |
> |
b = fillsample(scanline+i-xstep, |
| 287 |
> |
zline ? zline+i-xstep : NULL, |
| 288 |
> |
i-xstep, y, xstep, 0, b/2); |
| 289 |
> |
if (sd) *sd++ = nc & 1 ? bl : b; |
| 290 |
> |
bl = b; |
| 291 |
|
} |
| 292 |
+ |
if (sd && nc & 1) *sd = bl; |
| 293 |
|
} |
| 294 |
|
|
| 295 |
|
|
| 423 |
|
/* discard header */ |
| 424 |
|
getheader(fp, NULL); |
| 425 |
|
/* get picture size */ |
| 426 |
< |
if (fgetresolu(&x, &y, fp) != (YMAJOR|YDECR)) { |
| 426 |
> |
if (!fscnresolu(&x, &y, fp)) { |
| 427 |
|
sprintf(errmsg, "bad recover file \"%s\"", oldfile); |
| 428 |
|
error(WARNING, errmsg); |
| 429 |
|
fclose(fp); |
