| 1 |
– |
/* Copyright (c) 1991 Regents of the University of California */ |
| 2 |
– |
|
| 1 |
|
#ifndef lint |
| 2 |
< |
static char SCCSid[] = "$SunId$ LBL"; |
| 2 |
> |
static const char RCSid[] = "$Id$"; |
| 3 |
|
#endif |
| 6 |
– |
|
| 4 |
|
/* |
| 5 |
|
* rpict.c - routines and variables for picture generation. |
| 9 |
– |
* |
| 10 |
– |
* 8/14/85 |
| 6 |
|
*/ |
| 7 |
|
|
| 8 |
< |
#include "ray.h" |
| 8 |
> |
#include "copyright.h" |
| 9 |
|
|
| 10 |
< |
#ifdef BSD |
| 11 |
< |
#include <sys/time.h> |
| 12 |
< |
#include <sys/resource.h> |
| 10 |
> |
#include <sys/types.h> |
| 11 |
> |
|
| 12 |
> |
#include "platform.h" |
| 13 |
> |
#ifdef NON_POSIX |
| 14 |
> |
#ifdef MINGW |
| 15 |
> |
#include <sys/time.h> |
| 16 |
> |
#endif |
| 17 |
> |
#else |
| 18 |
> |
#ifdef BSD |
| 19 |
> |
#include <sys/time.h> |
| 20 |
> |
#include <sys/resource.h> |
| 21 |
> |
#else |
| 22 |
> |
#include <sys/times.h> |
| 23 |
> |
#include <unistd.h> |
| 24 |
> |
#endif |
| 25 |
|
#endif |
| 26 |
|
|
| 27 |
+ |
#include <time.h> |
| 28 |
|
#include <signal.h> |
| 21 |
– |
#include <fcntl.h> |
| 29 |
|
|
| 30 |
+ |
#include "ray.h" |
| 31 |
+ |
#include "paths.h" |
| 32 |
+ |
#include "ambient.h" |
| 33 |
|
#include "view.h" |
| 34 |
+ |
#include "random.h" |
| 35 |
+ |
#include "paths.h" |
| 36 |
+ |
#include "hilbert.h" |
| 37 |
+ |
#include "pmapbias.h" |
| 38 |
+ |
#include "pmapdiag.h" |
| 39 |
|
|
| 40 |
< |
#include "resolu.h" |
| 40 |
> |
#define RFTEMPLATE "rfXXXXXX" |
| 41 |
|
|
| 42 |
< |
#include "random.h" |
| 42 |
> |
#ifndef SIGCONT |
| 43 |
> |
#ifdef SIGIO /* XXX can we live without this? */ |
| 44 |
> |
#define SIGCONT SIGIO |
| 45 |
> |
#endif |
| 46 |
> |
#endif |
| 47 |
|
|
| 48 |
+ |
CUBE thescene; /* our scene */ |
| 49 |
+ |
OBJECT nsceneobjs; /* number of objects in our scene */ |
| 50 |
+ |
|
| 51 |
+ |
extern RGBPRIMP out_prims; /* output color primitives (NULL if spectral) */ |
| 52 |
+ |
|
| 53 |
|
int dimlist[MAXDIM]; /* sampling dimensions */ |
| 54 |
|
int ndims = 0; /* number of sampling dimensions */ |
| 55 |
|
int samplendx; /* sample index number */ |
| 56 |
|
|
| 57 |
+ |
void (*addobjnotify[])() = {ambnotify, NULL}; |
| 58 |
+ |
|
| 59 |
|
VIEW ourview = STDVIEW; /* view parameters */ |
| 60 |
|
int hresolu = 512; /* horizontal resolution */ |
| 61 |
|
int vresolu = 512; /* vertical resolution */ |
| 62 |
< |
double pixaspect = 1.0; /* pixel aspect ratio */ |
| 62 |
> |
double pixaspect = 1.0; /* pixel aspect ratio */ |
| 63 |
|
|
| 64 |
|
int psample = 4; /* pixel sample size */ |
| 65 |
< |
double maxdiff = .05; /* max. difference for interpolation */ |
| 66 |
< |
double dstrpix = 0.67; /* square pixel distribution */ |
| 65 |
> |
double maxdiff = .05; /* max. difference for interpolation */ |
| 66 |
> |
double dstrpix = 0.67; /* square pixel distribution */ |
| 67 |
|
|
| 68 |
< |
double dstrsrc = 0.0; /* square source distribution */ |
| 69 |
< |
double shadthresh = .05; /* shadow threshold */ |
| 70 |
< |
double shadcert = .5; /* shadow certainty */ |
| 68 |
> |
double mblur = 0.; /* motion blur parameter */ |
| 69 |
> |
|
| 70 |
> |
double dblur = 0.; /* depth-of-field blur parameter */ |
| 71 |
> |
|
| 72 |
> |
void (*trace)() = NULL; /* trace call */ |
| 73 |
> |
|
| 74 |
> |
int do_irrad = 0; /* compute irradiance? */ |
| 75 |
> |
|
| 76 |
> |
int rand_samp = 0; /* pure Monte Carlo sampling? */ |
| 77 |
> |
|
| 78 |
> |
double dstrsrc = 0.0; /* square source distribution */ |
| 79 |
> |
double shadthresh = .05; /* shadow threshold */ |
| 80 |
> |
double shadcert = .5; /* shadow certainty */ |
| 81 |
|
int directrelay = 1; /* number of source relays */ |
| 82 |
|
int vspretest = 512; /* virtual source pretest density */ |
| 83 |
< |
int directinvis = 0; /* sources invisible? */ |
| 84 |
< |
double srcsizerat = .25; /* maximum ratio source size/dist. */ |
| 83 |
> |
int directvis = 1; /* sources visible? */ |
| 84 |
> |
double srcsizerat = .25; /* maximum ratio source size/dist. */ |
| 85 |
|
|
| 86 |
< |
double specthresh = .15; /* specular sampling threshold */ |
| 87 |
< |
double specjitter = 1.; /* specular sampling jitter */ |
| 86 |
> |
COLOR cextinction = BLKCOLOR; /* global extinction coefficient */ |
| 87 |
> |
COLOR salbedo = BLKCOLOR; /* global scattering albedo */ |
| 88 |
> |
double seccg = 0.; /* global scattering eccentricity */ |
| 89 |
> |
double ssampdist = 0.; /* scatter sampling distance */ |
| 90 |
|
|
| 91 |
< |
int maxdepth = 6; /* maximum recursion depth */ |
| 92 |
< |
double minweight = 5e-3; /* minimum ray weight */ |
| 91 |
> |
double specthresh = .15; /* specular sampling threshold */ |
| 92 |
> |
double specjitter = 1.; /* specular sampling jitter */ |
| 93 |
|
|
| 94 |
+ |
int backvis = 1; /* back face visibility */ |
| 95 |
+ |
|
| 96 |
+ |
int maxdepth = 7; /* maximum recursion depth */ |
| 97 |
+ |
double minweight = 1e-4; /* minimum ray weight */ |
| 98 |
+ |
|
| 99 |
+ |
char *ambfile = NULL; /* ambient file name */ |
| 100 |
|
COLOR ambval = BLKCOLOR; /* ambient value */ |
| 101 |
< |
double ambacc = 0.2; /* ambient accuracy */ |
| 102 |
< |
int ambres = 32; /* ambient resolution */ |
| 103 |
< |
int ambdiv = 128; /* ambient divisions */ |
| 104 |
< |
int ambssamp = 0; /* ambient super-samples */ |
| 101 |
> |
int ambvwt = 0; /* initial weight for ambient value */ |
| 102 |
> |
double ambacc = 0.2; /* ambient accuracy */ |
| 103 |
> |
int ambres = 64; /* ambient resolution */ |
| 104 |
> |
int ambdiv = 512; /* ambient divisions */ |
| 105 |
> |
int ambssamp = 128; /* ambient super-samples */ |
| 106 |
|
int ambounce = 0; /* ambient bounces */ |
| 107 |
< |
char *amblist[128]; /* ambient include/exclude list */ |
| 107 |
> |
char *amblist[AMBLLEN]; /* ambient include/exclude list */ |
| 108 |
|
int ambincl = -1; /* include == 1, exclude == 0 */ |
| 109 |
|
|
| 110 |
|
int ralrm = 0; /* seconds between reports */ |
| 111 |
|
|
| 112 |
< |
double pctdone = 0.0; /* percentage done */ |
| 112 |
> |
double pctdone = 0.0; /* percentage done */ |
| 113 |
> |
time_t tlastrept = 0L; /* time at last report */ |
| 114 |
> |
time_t tstart; /* starting time */ |
| 115 |
|
|
| 116 |
< |
long tlastrept = 0L; /* time at last report */ |
| 116 |
> |
#define MAXDIV 16 /* maximum sample size */ |
| 117 |
|
|
| 118 |
< |
extern long time(); |
| 72 |
< |
extern long tstart; /* starting time */ |
| 118 |
> |
#define pixjitter() (.5+dstrpix*(.5-frandom())) |
| 119 |
|
|
| 120 |
< |
extern long nrays; /* number of rays traced */ |
| 120 |
> |
int hres, vres; /* resolution for this frame */ |
| 121 |
|
|
| 122 |
< |
#define MAXDIV 16 /* maximum sample size */ |
| 122 |
> |
static VIEW lastview; /* the previous view input */ |
| 123 |
|
|
| 124 |
< |
#define pixjitter() (.5+dstrpix*(.5-frandom())) |
| 124 |
> |
static void report(int); |
| 125 |
> |
static int nextview(FILE *fp); |
| 126 |
> |
static void render(char *zfile, char *oldfile); |
| 127 |
> |
static void fillscanline(COLOR *scanline, float *zline, char *sd, int xres, |
| 128 |
> |
int y, int xstep); |
| 129 |
> |
static void fillscanbar(COLOR *scanbar[], float *zbar[], int xres, |
| 130 |
> |
int y, int ysize); |
| 131 |
> |
static int fillsample(COLOR *colline, float *zline, int x, int y, |
| 132 |
> |
int xlen, int ylen, int b); |
| 133 |
> |
static double pixvalue(COLOR col, int x, int y); |
| 134 |
> |
static int salvage(char *oldfile); |
| 135 |
> |
static int pixnumber(int x, int y, int xres, int yres); |
| 136 |
|
|
| 80 |
– |
double pixvalue(); |
| 137 |
|
|
| 138 |
|
|
| 139 |
< |
quit(code) /* quit program */ |
| 140 |
< |
int code; |
| 139 |
> |
void |
| 140 |
> |
quit(int code) /* quit program */ |
| 141 |
|
{ |
| 142 |
< |
if (code || ralrm > 0) /* report status */ |
| 143 |
< |
report(); |
| 144 |
< |
|
| 142 |
> |
if (code) /* report status */ |
| 143 |
> |
report(0); |
| 144 |
> |
#ifndef NON_POSIX |
| 145 |
> |
headclean(); /* delete header file */ |
| 146 |
> |
pfclean(); /* clean up persist files */ |
| 147 |
> |
#endif |
| 148 |
|
exit(code); |
| 149 |
|
} |
| 150 |
|
|
| 151 |
|
|
| 152 |
< |
#ifdef BSD |
| 153 |
< |
report() /* report progress */ |
| 152 |
> |
#ifndef NON_POSIX |
| 153 |
> |
static void |
| 154 |
> |
report(int dummy) /* report progress */ |
| 155 |
|
{ |
| 156 |
< |
struct rusage rubuf; |
| 157 |
< |
double t; |
| 156 |
> |
char bcStat [128]; |
| 157 |
> |
double u, s; |
| 158 |
> |
#ifdef BSD |
| 159 |
> |
struct rusage rubuf; |
| 160 |
> |
#else |
| 161 |
> |
double period = 1.0 / 60.0; |
| 162 |
> |
struct tms tbuf; |
| 163 |
> |
#endif |
| 164 |
|
|
| 165 |
+ |
tlastrept = time((time_t *)NULL); |
| 166 |
+ |
#ifdef BSD |
| 167 |
|
getrusage(RUSAGE_SELF, &rubuf); |
| 168 |
< |
t = (rubuf.ru_utime.tv_usec + rubuf.ru_stime.tv_usec) / 1e6; |
| 169 |
< |
t += rubuf.ru_utime.tv_sec + rubuf.ru_stime.tv_sec; |
| 168 |
> |
u = rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec*1e-6; |
| 169 |
> |
s = rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec*1e-6; |
| 170 |
|
getrusage(RUSAGE_CHILDREN, &rubuf); |
| 171 |
< |
t += (rubuf.ru_utime.tv_usec + rubuf.ru_stime.tv_usec) / 1e6; |
| 172 |
< |
t += rubuf.ru_utime.tv_sec + rubuf.ru_stime.tv_sec; |
| 171 |
> |
u += rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec*1e-6; |
| 172 |
> |
s += rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec*1e-6; |
| 173 |
> |
#else |
| 174 |
> |
times(&tbuf); |
| 175 |
> |
#ifdef _SC_CLK_TCK |
| 176 |
> |
period = 1.0 / sysconf(_SC_CLK_TCK); |
| 177 |
> |
#endif |
| 178 |
> |
u = ( tbuf.tms_utime + tbuf.tms_cutime ) * period; |
| 179 |
> |
s = ( tbuf.tms_stime + tbuf.tms_cstime ) * period; |
| 180 |
> |
#endif |
| 181 |
|
|
| 182 |
< |
sprintf(errmsg, "%ld rays, %4.2f%% done after %5.4f CPU hours\n", |
| 183 |
< |
nrays, pctdone, t/3600.0); |
| 182 |
> |
/* PMAP: Get photon map bias compensation statistics */ |
| 183 |
> |
pmapBiasCompReport(bcStat); |
| 184 |
> |
|
| 185 |
> |
sprintf(errmsg, |
| 186 |
> |
"%lu rays, %s%4.2f%% after %.3fu %.3fs %.3fr hours on %s (PID %d)\n", |
| 187 |
> |
nrays, bcStat, pctdone, u*(1./3600.), s*(1./3600.), |
| 188 |
> |
(tlastrept-tstart)*(1./3600.), myhostname(), getpid()); |
| 189 |
|
eputs(errmsg); |
| 190 |
< |
tlastrept = time((long *)0); |
| 190 |
> |
#ifdef SIGCONT |
| 191 |
> |
signal(SIGCONT, report); |
| 192 |
> |
#endif |
| 193 |
|
} |
| 194 |
|
#else |
| 195 |
< |
report() /* report progress */ |
| 195 |
> |
static void |
| 196 |
> |
report(int dummy) /* report progress */ |
| 197 |
|
{ |
| 198 |
< |
tlastrept = time((long *)0); |
| 199 |
< |
sprintf(errmsg, "%ld rays, %4.2f%% done after %5.4f hours\n", |
| 200 |
< |
nrays, pctdone, (tlastrept-tstart)/3600.0); |
| 198 |
> |
char bcStat [128]; |
| 199 |
> |
|
| 200 |
> |
tlastrept = time((time_t *)NULL); |
| 201 |
> |
|
| 202 |
> |
/* PMAP: Get photon map bias compensation statistics */ |
| 203 |
> |
pmapBiasCompReport(bcStat); |
| 204 |
> |
|
| 205 |
> |
sprintf(errmsg, "%lu rays, %s%4.2f%% after %5.4f hours\n", |
| 206 |
> |
nrays, bcStat, pctdone, (tlastrept-tstart)/3600.0); |
| 207 |
|
eputs(errmsg); |
| 118 |
– |
signal(SIGALRM, report); |
| 208 |
|
} |
| 209 |
|
#endif |
| 210 |
|
|
| 211 |
|
|
| 212 |
< |
render(zfile, oldfile) /* render the scene */ |
| 213 |
< |
char *zfile, *oldfile; |
| 212 |
> |
void |
| 213 |
> |
rpict( /* generate image(s) */ |
| 214 |
> |
int seq, |
| 215 |
> |
char *pout, |
| 216 |
> |
char *zout, |
| 217 |
> |
char *prvr |
| 218 |
> |
) |
| 219 |
> |
/* |
| 220 |
> |
* If seq is greater than zero, then we will render a sequence of |
| 221 |
> |
* images based on view parameter strings read from the standard input. |
| 222 |
> |
* If pout is NULL, then all images will be sent to the standard ouput. |
| 223 |
> |
* If seq is greater than zero and prvr is an integer, then it is the |
| 224 |
> |
* frame number at which rendering should begin. Preceeding view parameter |
| 225 |
> |
* strings will be skipped in the input. |
| 226 |
> |
* If pout and prvr are the same, prvr is renamed to avoid overwriting. |
| 227 |
> |
* Note that pout and zout should contain %d format specifications for |
| 228 |
> |
* sequenced file naming. |
| 229 |
> |
*/ |
| 230 |
|
{ |
| 231 |
< |
extern long lseek(); |
| 231 |
> |
char fbuf[128], fbuf2[128]; |
| 232 |
> |
int npicts; |
| 233 |
> |
char *cp; |
| 234 |
> |
RESOLU rs; |
| 235 |
> |
double pa; |
| 236 |
> |
/* check sampling */ |
| 237 |
> |
if (psample < 1) |
| 238 |
> |
psample = 1; |
| 239 |
> |
else if (psample > MAXDIV) { |
| 240 |
> |
sprintf(errmsg, "pixel sampling reduced from %d to %d", |
| 241 |
> |
psample, MAXDIV); |
| 242 |
> |
error(WARNING, errmsg); |
| 243 |
> |
psample = MAXDIV; |
| 244 |
> |
} |
| 245 |
> |
/* get starting frame */ |
| 246 |
> |
if (seq <= 0) |
| 247 |
> |
seq = 0; |
| 248 |
> |
else if (prvr != NULL && isint(prvr)) { |
| 249 |
> |
int rn; /* skip to specified view */ |
| 250 |
> |
if ((rn = atoi(prvr)) < seq) |
| 251 |
> |
error(USER, "recover frame less than start frame"); |
| 252 |
> |
if (pout == NULL) |
| 253 |
> |
error(USER, "missing output file specification"); |
| 254 |
> |
for ( ; seq < rn; seq++) |
| 255 |
> |
if (nextview(stdin) == EOF) |
| 256 |
> |
error(USER, "unexpected EOF on view input"); |
| 257 |
> |
setview(&ourview); |
| 258 |
> |
prvr = fbuf; /* mark for renaming */ |
| 259 |
> |
} |
| 260 |
> |
if ((pout != NULL) & (prvr != NULL)) { |
| 261 |
> |
sprintf(fbuf, pout, seq); |
| 262 |
> |
if (!strcmp(prvr, fbuf)) { /* rename */ |
| 263 |
> |
strcpy(fbuf2, fbuf); |
| 264 |
> |
for (cp = fbuf2; *cp; cp++) |
| 265 |
> |
; |
| 266 |
> |
while (cp > fbuf2 && !ISDIRSEP(cp[-1])) |
| 267 |
> |
cp--; |
| 268 |
> |
strcpy(cp, RFTEMPLATE); |
| 269 |
> |
prvr = mktemp(fbuf2); |
| 270 |
> |
if (rename(fbuf, prvr) < 0) { |
| 271 |
> |
if (errno == ENOENT) { /* ghost file */ |
| 272 |
> |
sprintf(errmsg, |
| 273 |
> |
"new output file \"%s\"", |
| 274 |
> |
fbuf); |
| 275 |
> |
error(WARNING, errmsg); |
| 276 |
> |
prvr = NULL; |
| 277 |
> |
} else { /* serious error */ |
| 278 |
> |
sprintf(errmsg, |
| 279 |
> |
"cannot rename \"%s\" to \"%s\"", |
| 280 |
> |
fbuf, prvr); |
| 281 |
> |
error(SYSTEM, errmsg); |
| 282 |
> |
} |
| 283 |
> |
} |
| 284 |
> |
} |
| 285 |
> |
} |
| 286 |
> |
npicts = 0; /* render sequence */ |
| 287 |
> |
do { |
| 288 |
> |
if (seq && nextview(stdin) == EOF) |
| 289 |
> |
break; |
| 290 |
> |
pctdone = 0.0; |
| 291 |
> |
if (pout != NULL) { |
| 292 |
> |
int myfd; |
| 293 |
> |
close(1); /* reassign stdout */ |
| 294 |
> |
sprintf(fbuf, pout, seq); |
| 295 |
> |
tryagain: |
| 296 |
> |
errno = 0; /* exclusive open */ |
| 297 |
> |
if ((myfd = open(fbuf, O_WRONLY|O_CREAT|O_EXCL, 0666)) < 0) { |
| 298 |
> |
if ((errno != EEXIST) | (prvr != NULL) || |
| 299 |
> |
!strcmp(fbuf, pout)) { |
| 300 |
> |
sprintf(errmsg, |
| 301 |
> |
"cannot open output file \"%s\"", |
| 302 |
> |
fbuf); |
| 303 |
> |
error(SYSTEM, errmsg); |
| 304 |
> |
} |
| 305 |
> |
setview(&ourview); |
| 306 |
> |
continue; /* don't clobber */ |
| 307 |
> |
} |
| 308 |
> |
if (myfd != 1) { |
| 309 |
> |
unlink(fbuf); |
| 310 |
> |
goto tryagain; /* leave it open */ |
| 311 |
> |
} |
| 312 |
> |
SET_FD_BINARY(1); |
| 313 |
> |
dupheader(); |
| 314 |
> |
} |
| 315 |
> |
hres = hresolu; vres = vresolu; pa = pixaspect; |
| 316 |
> |
if (prvr != NULL) { |
| 317 |
> |
if (viewfile(prvr, &ourview, &rs) <= 0) { |
| 318 |
> |
sprintf(errmsg, |
| 319 |
> |
"cannot recover view parameters from \"%s\"", prvr); |
| 320 |
> |
error(WARNING, errmsg); |
| 321 |
> |
} else { |
| 322 |
> |
pa = 0.0; |
| 323 |
> |
hres = scanlen(&rs); |
| 324 |
> |
vres = numscans(&rs); |
| 325 |
> |
} |
| 326 |
> |
} |
| 327 |
> |
if ((cp = setview(&ourview)) != NULL) |
| 328 |
> |
error(USER, cp); |
| 329 |
> |
normaspect(viewaspect(&ourview), &pa, &hres, &vres); |
| 330 |
> |
if (seq) { |
| 331 |
> |
if (ralrm > 0) { |
| 332 |
> |
fprintf(stderr, "FRAME %d:", seq); |
| 333 |
> |
fprintview(&ourview, stderr); |
| 334 |
> |
putc('\n', stderr); |
| 335 |
> |
fflush(stderr); |
| 336 |
> |
} |
| 337 |
> |
printf("FRAME=%d\n", seq); |
| 338 |
> |
} |
| 339 |
> |
fputs(VIEWSTR, stdout); |
| 340 |
> |
fprintview(&ourview, stdout); |
| 341 |
> |
putchar('\n'); |
| 342 |
> |
if ((pa < .99) | (pa > 1.01)) |
| 343 |
> |
fputaspect(pa, stdout); |
| 344 |
> |
fputnow(stdout); |
| 345 |
> |
if (out_prims == xyzprims) { |
| 346 |
> |
fputformat(CIEFMT, stdout); |
| 347 |
> |
} else { |
| 348 |
> |
fputprims(out_prims, stdout); |
| 349 |
> |
fputformat(COLRFMT, stdout); |
| 350 |
> |
} |
| 351 |
> |
putchar('\n'); /* close header */ |
| 352 |
> |
if (zout != NULL) |
| 353 |
> |
sprintf(cp=fbuf, zout, seq); |
| 354 |
> |
else |
| 355 |
> |
cp = NULL; |
| 356 |
> |
render(cp, prvr); |
| 357 |
> |
prvr = NULL; |
| 358 |
> |
npicts++; |
| 359 |
> |
} while (seq++); |
| 360 |
> |
/* check that we did something */ |
| 361 |
> |
if (npicts == 0) |
| 362 |
> |
error(WARNING, "no output produced"); |
| 363 |
> |
} |
| 364 |
> |
|
| 365 |
> |
|
| 366 |
> |
static int |
| 367 |
> |
nextview( /* get next view from fp */ |
| 368 |
> |
FILE *fp |
| 369 |
> |
) |
| 370 |
> |
{ |
| 371 |
> |
char linebuf[256]; |
| 372 |
> |
|
| 373 |
> |
lastview = ourview; |
| 374 |
> |
while (fgets(linebuf, sizeof(linebuf), fp) != NULL) |
| 375 |
> |
if (isview(linebuf) && sscanview(&ourview, linebuf) > 0) |
| 376 |
> |
return(0); |
| 377 |
> |
return(EOF); |
| 378 |
> |
} |
| 379 |
> |
|
| 380 |
> |
|
| 381 |
> |
static void |
| 382 |
> |
render( /* render the scene */ |
| 383 |
> |
char *zfile, |
| 384 |
> |
char *oldfile |
| 385 |
> |
) |
| 386 |
> |
{ |
| 387 |
|
COLOR *scanbar[MAXDIV+1]; /* scanline arrays of pixel values */ |
| 388 |
|
float *zbar[MAXDIV+1]; /* z values */ |
| 389 |
|
char *sampdens; /* previous sample density */ |
| 393 |
|
int zfd; |
| 394 |
|
COLOR *colptr; |
| 395 |
|
float *zptr; |
| 396 |
< |
register int i; |
| 397 |
< |
/* check sampling */ |
| 398 |
< |
if (psample < 1) |
| 399 |
< |
psample = 1; |
| 400 |
< |
else if (psample > MAXDIV) { |
| 401 |
< |
sprintf(errmsg, "pixel sampling reduced from %d to %d", |
| 142 |
< |
psample, MAXDIV); |
| 143 |
< |
error(WARNING, errmsg); |
| 144 |
< |
psample = MAXDIV; |
| 396 |
> |
int i; |
| 397 |
> |
/* check for empty image */ |
| 398 |
> |
if ((hres <= 0) | (vres <= 0)) { |
| 399 |
> |
error(WARNING, "empty output picture"); |
| 400 |
> |
fprtresolu(0, 0, stdout); |
| 401 |
> |
return; |
| 402 |
|
} |
| 403 |
|
/* allocate scanlines */ |
| 404 |
|
for (i = 0; i <= psample; i++) { |
| 405 |
< |
scanbar[i] = (COLOR *)malloc(hresolu*sizeof(COLOR)); |
| 405 |
> |
scanbar[i] = (COLOR *)malloc(hres*sizeof(COLOR)); |
| 406 |
|
if (scanbar[i] == NULL) |
| 407 |
|
goto memerr; |
| 408 |
|
} |
| 409 |
|
hstep = (psample*140+49)/99; /* quincunx sampling */ |
| 410 |
|
ystep = (psample*99+70)/140; |
| 411 |
|
if (hstep > 2) { |
| 412 |
< |
i = hresolu/hstep + 2; |
| 413 |
< |
if ((sampdens = malloc(i)) == NULL) |
| 412 |
> |
i = hres/hstep + 2; |
| 413 |
> |
if ((sampdens = (char *)malloc(i)) == NULL) |
| 414 |
|
goto memerr; |
| 415 |
|
while (i--) |
| 416 |
|
sampdens[i] = hstep; |
| 417 |
|
} else |
| 418 |
|
sampdens = NULL; |
| 419 |
< |
/* open z file */ |
| 419 |
> |
/* open z-file */ |
| 420 |
|
if (zfile != NULL) { |
| 421 |
|
if ((zfd = open(zfile, O_WRONLY|O_CREAT, 0666)) == -1) { |
| 422 |
< |
sprintf(errmsg, "cannot open z file \"%s\"", zfile); |
| 422 |
> |
sprintf(errmsg, "cannot open z-file \"%s\"", zfile); |
| 423 |
|
error(SYSTEM, errmsg); |
| 424 |
|
} |
| 425 |
+ |
SET_FD_BINARY(zfd); |
| 426 |
|
for (i = 0; i <= psample; i++) { |
| 427 |
< |
zbar[i] = (float *)malloc(hresolu*sizeof(float)); |
| 427 |
> |
zbar[i] = (float *)malloc(hres*sizeof(float)); |
| 428 |
|
if (zbar[i] == NULL) |
| 429 |
|
goto memerr; |
| 430 |
|
} |
| 434 |
|
zbar[i] = NULL; |
| 435 |
|
} |
| 436 |
|
/* write out boundaries */ |
| 437 |
< |
fprtresolu(hresolu, vresolu, stdout); |
| 437 |
> |
fprtresolu(hres, vres, stdout); |
| 438 |
|
/* recover file and compute first */ |
| 439 |
|
i = salvage(oldfile); |
| 440 |
< |
if (zfd != -1 && i > 0 && |
| 441 |
< |
lseek(zfd, (long)i*hresolu*sizeof(float), 0) == -1) |
| 442 |
< |
error(SYSTEM, "z file seek error in render"); |
| 443 |
< |
pctdone = 100.0*i/vresolu; |
| 440 |
> |
if (i >= vres) |
| 441 |
> |
goto alldone; |
| 442 |
> |
if ((zfd != -1) & (i > 0) && |
| 443 |
> |
lseek(zfd, (off_t)i*hres*sizeof(float), SEEK_SET) < 0) |
| 444 |
> |
error(SYSTEM, "z-file seek error in render"); |
| 445 |
> |
pctdone = 100.0*i/vres; |
| 446 |
|
if (ralrm > 0) /* report init stats */ |
| 447 |
< |
report(); |
| 448 |
< |
#ifndef BSD |
| 447 |
> |
report(0); |
| 448 |
> |
#ifdef SIGCONT |
| 449 |
|
else |
| 450 |
+ |
signal(SIGCONT, report); |
| 451 |
|
#endif |
| 452 |
< |
signal(SIGALRM, report); |
| 453 |
< |
ypos = vresolu-1 - i; |
| 454 |
< |
fillscanline(scanbar[0], zbar[0], sampdens, hresolu, ypos, hstep); |
| 452 |
> |
ypos = vres-1 - i; /* initialize sampling */ |
| 453 |
> |
if (directvis) |
| 454 |
> |
init_drawsources(psample); |
| 455 |
> |
fillscanline(scanbar[0], zbar[0], sampdens, hres, ypos, hstep); |
| 456 |
|
/* compute scanlines */ |
| 457 |
|
for (ypos -= ystep; ypos > -ystep; ypos -= ystep) { |
| 458 |
|
/* bottom adjust? */ |
| 468 |
|
zbar[0] = zptr; |
| 469 |
|
/* fill base line */ |
| 470 |
|
fillscanline(scanbar[0], zbar[0], sampdens, |
| 471 |
< |
hresolu, ypos, hstep); |
| 471 |
> |
hres, ypos, hstep); |
| 472 |
|
/* fill bar */ |
| 473 |
< |
fillscanbar(scanbar, zbar, hresolu, ypos, ystep); |
| 473 |
> |
fillscanbar(scanbar, zbar, hres, ypos, ystep); |
| 474 |
> |
if (directvis) /* add bitty sources */ |
| 475 |
> |
drawsources(scanbar, zbar, 0, hres, ypos, ystep); |
| 476 |
|
/* write it out */ |
| 477 |
< |
#ifndef BSD |
| 478 |
< |
signal(SIGALRM, SIG_IGN); /* don't interrupt writes */ |
| 477 |
> |
#ifdef SIGCONT |
| 478 |
> |
signal(SIGCONT, SIG_IGN); /* don't interrupt writes */ |
| 479 |
|
#endif |
| 480 |
|
for (i = ystep; i > 0; i--) { |
| 481 |
|
if (zfd != -1 && write(zfd, (char *)zbar[i], |
| 482 |
< |
hresolu*sizeof(float)) |
| 483 |
< |
< hresolu*sizeof(float)) |
| 482 |
> |
hres*sizeof(float)) |
| 483 |
> |
< hres*sizeof(float)) |
| 484 |
|
goto writerr; |
| 485 |
< |
if (fwritescan(scanbar[i], hresolu, stdout) < 0) |
| 485 |
> |
if (fwritescan(scanbar[i], hres, stdout) < 0) |
| 486 |
|
goto writerr; |
| 487 |
|
} |
| 488 |
|
if (fflush(stdout) == EOF) |
| 489 |
|
goto writerr; |
| 490 |
|
/* record progress */ |
| 491 |
< |
pctdone = 100.0*(vresolu-1-ypos)/vresolu; |
| 492 |
< |
if (ralrm > 0 && time((long *)0) >= tlastrept+ralrm) |
| 493 |
< |
report(); |
| 494 |
< |
#ifndef BSD |
| 491 |
> |
pctdone = 100.0*(vres-1-ypos)/vres; |
| 492 |
> |
if (ralrm > 0 && time((time_t *)NULL) >= tlastrept+ralrm) |
| 493 |
> |
report(0); |
| 494 |
> |
#ifdef SIGCONT |
| 495 |
|
else |
| 496 |
< |
signal(SIGALRM, report); |
| 496 |
> |
signal(SIGCONT, report); |
| 497 |
|
#endif |
| 498 |
|
} |
| 499 |
|
/* clean up */ |
| 500 |
+ |
#ifdef SIGCONT |
| 501 |
+ |
signal(SIGCONT, SIG_IGN); |
| 502 |
+ |
#endif |
| 503 |
+ |
if (zfd != -1 && write(zfd, (char *)zbar[0], hres*sizeof(float)) |
| 504 |
+ |
< hres*sizeof(float)) |
| 505 |
+ |
goto writerr; |
| 506 |
+ |
fwritescan(scanbar[0], hres, stdout); |
| 507 |
+ |
if (fflush(stdout) == EOF) |
| 508 |
+ |
goto writerr; |
| 509 |
+ |
alldone: |
| 510 |
|
if (zfd != -1) { |
| 237 |
– |
if (write(zfd, (char *)zbar[0], hresolu*sizeof(float)) |
| 238 |
– |
< hresolu*sizeof(float)) |
| 239 |
– |
goto writerr; |
| 511 |
|
if (close(zfd) == -1) |
| 512 |
|
goto writerr; |
| 513 |
|
for (i = 0; i <= psample; i++) |
| 514 |
< |
free((char *)zbar[i]); |
| 514 |
> |
free((void *)zbar[i]); |
| 515 |
|
} |
| 245 |
– |
fwritescan(scanbar[0], hresolu, stdout); |
| 246 |
– |
if (fflush(stdout) == EOF) |
| 247 |
– |
goto writerr; |
| 516 |
|
for (i = 0; i <= psample; i++) |
| 517 |
< |
free((char *)scanbar[i]); |
| 517 |
> |
free((void *)scanbar[i]); |
| 518 |
|
if (sampdens != NULL) |
| 519 |
|
free(sampdens); |
| 520 |
|
pctdone = 100.0; |
| 521 |
+ |
if (ralrm > 0) |
| 522 |
+ |
report(0); |
| 523 |
+ |
#ifdef SIGCONT |
| 524 |
+ |
signal(SIGCONT, SIG_DFL); |
| 525 |
+ |
#endif |
| 526 |
|
return; |
| 527 |
|
writerr: |
| 528 |
|
error(SYSTEM, "write error in render"); |
| 531 |
|
} |
| 532 |
|
|
| 533 |
|
|
| 534 |
< |
fillscanline(scanline, zline, sd, xres, y, xstep) /* fill scan at y */ |
| 535 |
< |
register COLOR *scanline; |
| 536 |
< |
register float *zline; |
| 537 |
< |
register char *sd; |
| 538 |
< |
int xres, y, xstep; |
| 534 |
> |
static void |
| 535 |
> |
fillscanline( /* fill scan at y */ |
| 536 |
> |
COLOR *scanline, |
| 537 |
> |
float *zline, |
| 538 |
> |
char *sd, |
| 539 |
> |
int xres, |
| 540 |
> |
int y, |
| 541 |
> |
int xstep |
| 542 |
> |
) |
| 543 |
|
{ |
| 544 |
|
static int nc = 0; /* number of calls */ |
| 545 |
|
int bl = xstep, b = xstep; |
| 546 |
< |
double z; |
| 547 |
< |
register int i; |
| 548 |
< |
|
| 546 |
> |
double z; |
| 547 |
> |
int i; |
| 548 |
> |
|
| 549 |
|
z = pixvalue(scanline[0], 0, y); |
| 550 |
|
if (zline) zline[0] = z; |
| 551 |
|
/* zig-zag start for quincunx pattern */ |
| 561 |
|
b = fillsample(scanline, zline, 0, y, i, 0, b/2); |
| 562 |
|
else |
| 563 |
|
b = fillsample(scanline+i-xstep, |
| 564 |
< |
zline ? zline+i-xstep : NULL, |
| 564 |
> |
zline ? zline+i-xstep : (float *)NULL, |
| 565 |
|
i-xstep, y, xstep, 0, b/2); |
| 566 |
|
if (sd) *sd++ = nc & 1 ? bl : b; |
| 567 |
|
bl = b; |
| 570 |
|
} |
| 571 |
|
|
| 572 |
|
|
| 573 |
< |
fillscanbar(scanbar, zbar, xres, y, ysize) /* fill interior */ |
| 574 |
< |
register COLOR *scanbar[]; |
| 575 |
< |
register float *zbar[]; |
| 576 |
< |
int xres, y, ysize; |
| 573 |
> |
static void |
| 574 |
> |
fillscanbar( /* fill interior */ |
| 575 |
> |
COLOR *scanbar[], |
| 576 |
> |
float *zbar[], |
| 577 |
> |
int xres, |
| 578 |
> |
int y, |
| 579 |
> |
int ysize |
| 580 |
> |
) |
| 581 |
|
{ |
| 582 |
|
COLOR vline[MAXDIV+1]; |
| 583 |
|
float zline[MAXDIV+1]; |
| 584 |
|
int b = ysize; |
| 585 |
< |
register int i, j; |
| 586 |
< |
|
| 585 |
> |
int i, j; |
| 586 |
> |
|
| 587 |
|
for (i = 0; i < xres; i++) { |
| 307 |
– |
|
| 588 |
|
copycolor(vline[0], scanbar[0][i]); |
| 589 |
|
copycolor(vline[ysize], scanbar[ysize][i]); |
| 590 |
|
if (zbar[0]) { |
| 591 |
|
zline[0] = zbar[0][i]; |
| 592 |
|
zline[ysize] = zbar[ysize][i]; |
| 593 |
|
} |
| 594 |
< |
|
| 315 |
< |
b = fillsample(vline, zbar[0] ? zline : NULL, |
| 594 |
> |
b = fillsample(vline, zbar[0] ? zline : (float *)NULL, |
| 595 |
|
i, y, 0, ysize, b/2); |
| 596 |
< |
|
| 596 |
> |
|
| 597 |
|
for (j = 1; j < ysize; j++) |
| 598 |
|
copycolor(scanbar[j][i], vline[j]); |
| 599 |
|
if (zbar[0]) |
| 603 |
|
} |
| 604 |
|
|
| 605 |
|
|
| 606 |
< |
int |
| 607 |
< |
fillsample(colline, zline, x, y, xlen, ylen, b) /* fill interior points */ |
| 608 |
< |
register COLOR *colline; |
| 609 |
< |
register float *zline; |
| 610 |
< |
int x, y; |
| 611 |
< |
int xlen, ylen; |
| 612 |
< |
int b; |
| 606 |
> |
static int |
| 607 |
> |
fillsample( /* fill interior points */ |
| 608 |
> |
COLOR *colline, |
| 609 |
> |
float *zline, |
| 610 |
> |
int x, |
| 611 |
> |
int y, |
| 612 |
> |
int xlen, |
| 613 |
> |
int ylen, |
| 614 |
> |
int b |
| 615 |
> |
) |
| 616 |
|
{ |
| 617 |
< |
extern double fabs(); |
| 618 |
< |
double ratio; |
| 337 |
< |
double z; |
| 617 |
> |
double ratio; |
| 618 |
> |
double z; |
| 619 |
|
COLOR ctmp; |
| 620 |
|
int ncut; |
| 621 |
< |
register int len; |
| 622 |
< |
|
| 621 |
> |
int len; |
| 622 |
> |
|
| 623 |
|
if (xlen > 0) /* x or y length is zero */ |
| 624 |
|
len = xlen; |
| 625 |
|
else |
| 626 |
|
len = ylen; |
| 627 |
< |
|
| 627 |
> |
|
| 628 |
|
if (len <= 1) /* limit recursion */ |
| 629 |
|
return(0); |
| 630 |
< |
|
| 631 |
< |
if (b > 0 |
| 632 |
< |
|| (zline && 2.*fabs(zline[0]-zline[len]) > maxdiff*(zline[0]+zline[len])) |
| 630 |
> |
|
| 631 |
> |
if (b > 0 || |
| 632 |
> |
(zline && 2.*fabs(zline[0]-zline[len]) > maxdiff*(zline[0]+zline[len])) |
| 633 |
|
|| bigdiff(colline[0], colline[len], maxdiff)) { |
| 634 |
< |
|
| 634 |
> |
|
| 635 |
|
z = pixvalue(colline[len>>1], x + (xlen>>1), y + (ylen>>1)); |
| 636 |
|
if (zline) zline[len>>1] = z; |
| 637 |
|
ncut = 1; |
| 357 |
– |
|
| 638 |
|
} else { /* interpolate */ |
| 359 |
– |
|
| 639 |
|
copycolor(colline[len>>1], colline[len]); |
| 640 |
|
ratio = (double)(len>>1) / len; |
| 641 |
|
scalecolor(colline[len>>1], ratio); |
| 649 |
|
} |
| 650 |
|
/* recurse */ |
| 651 |
|
ncut += fillsample(colline, zline, x, y, xlen>>1, ylen>>1, (b-1)/2); |
| 652 |
< |
|
| 653 |
< |
ncut += fillsample(colline+(len>>1), zline ? zline+(len>>1) : NULL, |
| 652 |
> |
|
| 653 |
> |
ncut += fillsample(colline+(len>>1), |
| 654 |
> |
zline ? zline+(len>>1) : (float *)NULL, |
| 655 |
|
x+(xlen>>1), y+(ylen>>1), |
| 656 |
|
xlen-(xlen>>1), ylen-(ylen>>1), b/2); |
| 657 |
|
|
| 659 |
|
} |
| 660 |
|
|
| 661 |
|
|
| 662 |
< |
double |
| 663 |
< |
pixvalue(col, x, y) /* compute pixel value */ |
| 664 |
< |
COLOR col; /* returned color */ |
| 665 |
< |
int x, y; /* pixel position */ |
| 662 |
> |
static double |
| 663 |
> |
pixvalue( /* compute pixel value */ |
| 664 |
> |
COLOR col, /* returned color */ |
| 665 |
> |
int x, /* pixel position */ |
| 666 |
> |
int y |
| 667 |
> |
) |
| 668 |
|
{ |
| 669 |
< |
static RAY thisray; |
| 670 |
< |
|
| 671 |
< |
if (viewray(thisray.rorg, thisray.rdir, &ourview, |
| 672 |
< |
(x+pixjitter())/hresolu, (y+pixjitter())/vresolu) < 0) { |
| 673 |
< |
setcolor(col, 0.0, 0.0, 0.0); |
| 669 |
> |
static COLORMAT xyz2myrgbmat; |
| 670 |
> |
RAY thisray; |
| 671 |
> |
FVECT lorg, ldir; |
| 672 |
> |
double hpos, vpos, lmax; |
| 673 |
> |
int i; |
| 674 |
> |
/* compute view ray */ |
| 675 |
> |
setcolor(col, 0.0, 0.0, 0.0); |
| 676 |
> |
hpos = (x+pixjitter())/hres; |
| 677 |
> |
vpos = (y+pixjitter())/vres; |
| 678 |
> |
if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, |
| 679 |
> |
&ourview, hpos, vpos)) < -FTINY) |
| 680 |
|
return(0.0); |
| 681 |
+ |
/* set pixel index */ |
| 682 |
+ |
samplendx = pixnumber(x,y,hres,vres); |
| 683 |
+ |
/* optional motion blur */ |
| 684 |
+ |
if (lastview.type && mblur > FTINY && (lmax = viewray(lorg, ldir, |
| 685 |
+ |
&lastview, hpos, vpos)) >= -FTINY) { |
| 686 |
+ |
double d = mblur*(.5-urand(281+samplendx)); |
| 687 |
+ |
|
| 688 |
+ |
thisray.rmax = (1.-d)*thisray.rmax + d*lmax; |
| 689 |
+ |
for (i = 3; i--; ) { |
| 690 |
+ |
thisray.rorg[i] = (1.-d)*thisray.rorg[i] + d*lorg[i]; |
| 691 |
+ |
thisray.rdir[i] = (1.-d)*thisray.rdir[i] + d*ldir[i]; |
| 692 |
+ |
} |
| 693 |
+ |
if (normalize(thisray.rdir) == 0.0) |
| 694 |
+ |
return(0.0); |
| 695 |
|
} |
| 696 |
+ |
/* depth-of-field */ |
| 697 |
+ |
if (!jitteraperture(thisray.rorg, thisray.rdir, &ourview, dblur)) |
| 698 |
+ |
return(0.0); |
| 699 |
|
|
| 700 |
< |
rayorigin(&thisray, NULL, PRIMARY, 1.0); |
| 700 |
> |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
| 701 |
|
|
| 397 |
– |
samplendx = pixnumber(x,y,hresolu,vresolu); /* set pixel index */ |
| 398 |
– |
|
| 702 |
|
rayvalue(&thisray); /* trace ray */ |
| 703 |
|
|
| 704 |
< |
copycolor(col, thisray.rcol); /* return color */ |
| 705 |
< |
|
| 706 |
< |
return(thisray.rt); /* return distance */ |
| 704 |
> |
if (out_prims == stdprims) { /* return color */ |
| 705 |
> |
scolor_rgb(col, thisray.rcol); |
| 706 |
> |
} else if (out_prims == xyzprims) { |
| 707 |
> |
scolor_cie(col, thisray.rcol); |
| 708 |
> |
scalecolor(col, WHTEFFICACY); |
| 709 |
> |
} else if (NCSAMP > 3) { |
| 710 |
> |
COLOR xyz; |
| 711 |
> |
if (xyz2myrgbmat[0][0] == 0) |
| 712 |
> |
compxyz2rgbWBmat(xyz2myrgbmat, out_prims); |
| 713 |
> |
scolor_cie(xyz, thisray.rcol); |
| 714 |
> |
colortrans(col, xyz2myrgbmat, xyz); |
| 715 |
> |
clipgamut(col, xyz[CIEY], CGAMUT_LOWER, cblack, cwhite); |
| 716 |
> |
} else |
| 717 |
> |
copycolor(col, thisray.rcol); |
| 718 |
> |
|
| 719 |
> |
return(raydistance(&thisray)); /* return distance */ |
| 720 |
|
} |
| 721 |
|
|
| 722 |
|
|
| 723 |
< |
int |
| 724 |
< |
salvage(oldfile) /* salvage scanlines from killed program */ |
| 725 |
< |
char *oldfile; |
| 723 |
> |
static int |
| 724 |
> |
salvage( /* salvage scanlines from killed program */ |
| 725 |
> |
char *oldfile |
| 726 |
> |
) |
| 727 |
|
{ |
| 728 |
|
COLR *scanline; |
| 729 |
|
FILE *fp; |
| 730 |
|
int x, y; |
| 731 |
|
|
| 732 |
|
if (oldfile == NULL) |
| 733 |
< |
return(0); |
| 734 |
< |
|
| 733 |
> |
goto gotzip; |
| 734 |
> |
|
| 735 |
|
if ((fp = fopen(oldfile, "r")) == NULL) { |
| 736 |
|
sprintf(errmsg, "cannot open recover file \"%s\"", oldfile); |
| 737 |
|
error(WARNING, errmsg); |
| 738 |
< |
return(0); |
| 738 |
> |
goto gotzip; |
| 739 |
|
} |
| 740 |
+ |
SET_FILE_BINARY(fp); |
| 741 |
|
/* discard header */ |
| 742 |
< |
getheader(fp, NULL); |
| 742 |
> |
getheader(fp, NULL, NULL); |
| 743 |
|
/* get picture size */ |
| 744 |
|
if (!fscnresolu(&x, &y, fp)) { |
| 745 |
< |
sprintf(errmsg, "bad recover file \"%s\"", oldfile); |
| 745 |
> |
sprintf(errmsg, "bad recover file \"%s\" - not removed", |
| 746 |
> |
oldfile); |
| 747 |
|
error(WARNING, errmsg); |
| 748 |
|
fclose(fp); |
| 749 |
< |
return(0); |
| 749 |
> |
goto gotzip; |
| 750 |
|
} |
| 751 |
|
|
| 752 |
< |
if (x != hresolu || y != vresolu) { |
| 752 |
> |
if ((x != hres) | (y != vres)) { |
| 753 |
|
sprintf(errmsg, "resolution mismatch in recover file \"%s\"", |
| 754 |
|
oldfile); |
| 755 |
|
error(USER, errmsg); |
| 756 |
|
} |
| 757 |
|
|
| 758 |
< |
scanline = (COLR *)malloc(hresolu*sizeof(COLR)); |
| 758 |
> |
scanline = (COLR *)malloc(hres*sizeof(COLR)); |
| 759 |
|
if (scanline == NULL) |
| 760 |
|
error(SYSTEM, "out of memory in salvage"); |
| 761 |
< |
for (y = 0; y < vresolu; y++) { |
| 762 |
< |
if (freadcolrs(scanline, hresolu, fp) < 0) |
| 761 |
> |
for (y = 0; y < vres; y++) { |
| 762 |
> |
if (freadcolrs(scanline, hres, fp) < 0) |
| 763 |
|
break; |
| 764 |
< |
if (fwritecolrs(scanline, hresolu, stdout) < 0) |
| 764 |
> |
if (fwritecolrs(scanline, hres, stdout) < 0) |
| 765 |
|
goto writerr; |
| 766 |
|
} |
| 767 |
|
if (fflush(stdout) == EOF) |
| 768 |
|
goto writerr; |
| 769 |
< |
free((char *)scanline); |
| 769 |
> |
free((void *)scanline); |
| 770 |
|
fclose(fp); |
| 771 |
|
unlink(oldfile); |
| 772 |
|
return(y); |
| 773 |
+ |
gotzip: |
| 774 |
+ |
if (fflush(stdout) == EOF) |
| 775 |
+ |
error(SYSTEM, "error writing picture header"); |
| 776 |
+ |
return(0); |
| 777 |
|
writerr: |
| 778 |
< |
error(SYSTEM, "write error in salvage"); |
| 778 |
> |
sprintf(errmsg, "write error during recovery of \"%s\"", oldfile); |
| 779 |
> |
error(SYSTEM, errmsg); |
| 780 |
> |
return -1; /* pro forma return */ |
| 781 |
|
} |
| 782 |
|
|
| 783 |
< |
|
| 784 |
< |
int |
| 785 |
< |
pixnumber(x, y, xres, yres) /* compute pixel index (brushed) */ |
| 786 |
< |
register int x, y; |
| 787 |
< |
int xres, yres; |
| 783 |
> |
static int |
| 784 |
> |
pixnumber( /* compute pixel index (screen door) */ |
| 785 |
> |
int x, |
| 786 |
> |
int y, |
| 787 |
> |
int xres, |
| 788 |
> |
int yres |
| 789 |
> |
) |
| 790 |
|
{ |
| 791 |
< |
x -= y; |
| 792 |
< |
while (x < 0) |
| 793 |
< |
x += xres; |
| 794 |
< |
return((((x>>2)*yres + y) << 2) + (x & 3)); |
| 791 |
> |
unsigned nbits = 0; |
| 792 |
> |
bitmask_t coord[2]; |
| 793 |
> |
|
| 794 |
> |
if (xres < yres) xres = yres; |
| 795 |
> |
while (xres > 0) { |
| 796 |
> |
xres >>= 1; |
| 797 |
> |
++nbits; |
| 798 |
> |
} |
| 799 |
> |
coord[0] = x; coord[1] = y; |
| 800 |
> |
return ((int)hilbert_c2i(2, nbits, coord)); |
| 801 |
|
} |
