| 45 |
|
extern int hresolu; /* horizontal resolution */ |
| 46 |
|
extern int vresolu; /* vertical resolution */ |
| 47 |
|
|
| 48 |
< |
static int castonly = 0; |
| 48 |
> |
extern int castonly; /* only doing ray-casting? */ |
| 49 |
|
|
| 50 |
+ |
extern double (*sens_curve)(SCOLOR scol); /* spectral conversion for 1-channel */ |
| 51 |
+ |
extern double out_scalefactor; /* output calibration scale factor */ |
| 52 |
+ |
extern RGBPRIMP out_prims; /* output color primitives (NULL if spectral) */ |
| 53 |
+ |
|
| 54 |
|
#ifndef MAXTSET |
| 55 |
|
#define MAXTSET 8191 /* maximum number in trace set */ |
| 56 |
|
#endif |
| 57 |
|
OBJECT traset[MAXTSET+1]={0}; /* trace include/exclude set */ |
| 58 |
|
|
| 59 |
+ |
static int Tflag = 0; /* source tracing enabled? */ |
| 60 |
+ |
|
| 61 |
|
static RAY thisray; /* for our convenience */ |
| 62 |
|
|
| 63 |
+ |
static FILE *inpfp = NULL; /* input stream pointer */ |
| 64 |
+ |
|
| 65 |
+ |
static FVECT *inp_queue = NULL; /* ray input queue if flushing */ |
| 66 |
+ |
static int inp_qpos = 0; /* next ray to return */ |
| 67 |
+ |
static int inp_qend = 0; /* number of rays in this work group */ |
| 68 |
+ |
|
| 69 |
|
typedef void putf_t(RREAL *v, int n); |
| 70 |
< |
static putf_t puta, putd, putf, putrgbe; |
| 70 |
> |
static putf_t puta, putd, putf; |
| 71 |
|
|
| 72 |
|
typedef void oputf_t(RAY *r); |
| 73 |
|
static oputf_t oputo, oputd, oputv, oputV, oputl, oputL, oputc, oputp, |
| 74 |
|
oputr, oputR, oputx, oputX, oputn, oputN, oputs, |
| 75 |
|
oputw, oputW, oputm, oputM, oputtilde; |
| 76 |
|
|
| 65 |
– |
static void setoutput(char *vs); |
| 77 |
|
extern void tranotify(OBJECT obj); |
| 78 |
+ |
static int is_fifo(FILE *fp); |
| 79 |
|
static void bogusray(void); |
| 80 |
|
static void raycast(RAY *r); |
| 81 |
|
static void rayirrad(RAY *r); |
| 82 |
|
static void rtcompute(FVECT org, FVECT dir, double dmax); |
| 83 |
|
static int printvals(RAY *r); |
| 84 |
|
static int getvec(FVECT vec, int fmt, FILE *fp); |
| 85 |
+ |
static int iszerovec(const FVECT vec); |
| 86 |
+ |
static double nextray(FVECT org, FVECT dir); |
| 87 |
|
static void tabin(RAY *r); |
| 88 |
|
static void ourtrace(RAY *r); |
| 89 |
|
|
| 90 |
+ |
static void putscolor(COLORV *scol); |
| 91 |
+ |
|
| 92 |
|
static oputf_t *ray_out[32], *every_out[32]; |
| 93 |
|
static putf_t *putreal; |
| 94 |
|
|
| 100 |
|
{ |
| 101 |
|
if (ray_pnprocs > 0) /* close children if any */ |
| 102 |
|
ray_pclose(0); |
| 103 |
+ |
else if (ray_pnprocs < 0) |
| 104 |
+ |
_exit(code); /* avoid flush() in child */ |
| 105 |
|
#ifndef NON_POSIX |
| 106 |
< |
else if (!ray_pnprocs) { |
| 106 |
> |
else { |
| 107 |
|
headclean(); /* delete header file */ |
| 108 |
|
pfclean(); /* clean up persist files */ |
| 109 |
|
} |
| 112 |
|
} |
| 113 |
|
|
| 114 |
|
|
| 115 |
< |
char * |
| 115 |
> |
const char * |
| 116 |
|
formstr( /* return format identifier */ |
| 117 |
|
int f |
| 118 |
|
) |
| 121 |
|
case 'a': return("ascii"); |
| 122 |
|
case 'f': return("float"); |
| 123 |
|
case 'd': return("double"); |
| 124 |
< |
case 'c': return(COLRFMT); |
| 124 |
> |
case 'c': |
| 125 |
> |
if (out_prims == NULL) |
| 126 |
> |
return(SPECFMT); |
| 127 |
> |
if (out_prims == xyzprims) |
| 128 |
> |
return(CIEFMT); |
| 129 |
> |
return(COLRFMT); |
| 130 |
|
} |
| 131 |
|
return("unknown"); |
| 132 |
|
} |
| 133 |
|
|
| 134 |
|
|
| 135 |
< |
extern void |
| 135 |
> |
static void |
| 136 |
> |
trace_sources(void) /* trace rays to light sources, also */ |
| 137 |
> |
{ |
| 138 |
> |
int sn; |
| 139 |
> |
|
| 140 |
> |
for (sn = 0; sn < nsources; sn++) |
| 141 |
> |
source[sn].sflags |= SFOLLOW; |
| 142 |
> |
} |
| 143 |
> |
|
| 144 |
> |
|
| 145 |
> |
void |
| 146 |
|
rtrace( /* trace rays from file */ |
| 147 |
|
char *fname, |
| 148 |
|
int nproc |
| 150 |
|
{ |
| 151 |
|
unsigned long vcount = (hresolu > 1) ? (unsigned long)hresolu*vresolu |
| 152 |
|
: (unsigned long)vresolu; |
| 153 |
< |
long nextflush = (vresolu > 0) & (hresolu > 1) ? 0 : hresolu; |
| 153 |
> |
long nextflush = (!vresolu | (hresolu <= 1)) * hresolu; |
| 154 |
|
int something2flush = 0; |
| 155 |
|
FILE *fp; |
| 156 |
|
double d; |
| 157 |
|
FVECT orig, direc; |
| 158 |
|
/* set up input */ |
| 159 |
|
if (fname == NULL) |
| 160 |
< |
fp = stdin; |
| 161 |
< |
else if ((fp = fopen(fname, "r")) == NULL) { |
| 160 |
> |
inpfp = stdin; |
| 161 |
> |
else if ((inpfp = fopen(fname, "r")) == NULL) { |
| 162 |
|
sprintf(errmsg, "cannot open input file \"%s\"", fname); |
| 163 |
|
error(SYSTEM, errmsg); |
| 164 |
|
} |
| 165 |
+ |
#ifdef getc_unlocked |
| 166 |
+ |
flockfile(inpfp); /* avoid lock/unlock overhead */ |
| 167 |
+ |
flockfile(stdout); |
| 168 |
+ |
#endif |
| 169 |
|
if (inform != 'a') |
| 170 |
< |
SET_FILE_BINARY(fp); |
| 170 |
> |
SET_FILE_BINARY(inpfp); |
| 171 |
|
/* set up output */ |
| 172 |
< |
setoutput(outvals); |
| 136 |
< |
if (imm_irrad) |
| 137 |
< |
castonly = 0; |
| 138 |
< |
else if (castonly) |
| 172 |
> |
if (castonly || every_out[0] != NULL) |
| 173 |
|
nproc = 1; /* don't bother multiprocessing */ |
| 174 |
+ |
if (every_out[0] != NULL) { |
| 175 |
+ |
trace = ourtrace; /* enable full tree tracing */ |
| 176 |
+ |
if (Tflag) /* light sources, too? */ |
| 177 |
+ |
trace_sources(); |
| 178 |
+ |
} |
| 179 |
|
if ((nextflush > 0) & (nproc > nextflush)) { |
| 180 |
|
error(WARNING, "reducing number of processes to match flush interval"); |
| 181 |
|
nproc = nextflush; |
| 182 |
|
} |
| 144 |
– |
switch (outform) { |
| 145 |
– |
case 'a': putreal = puta; break; |
| 146 |
– |
case 'f': putreal = putf; break; |
| 147 |
– |
case 'd': putreal = putd; break; |
| 148 |
– |
case 'c': |
| 149 |
– |
if (outvals[0] && (outvals[1] || !strchr("vrx", outvals[0]))) |
| 150 |
– |
error(USER, "color format only with -ov, -or, -ox"); |
| 151 |
– |
putreal = putrgbe; break; |
| 152 |
– |
default: |
| 153 |
– |
error(CONSISTENCY, "botched output format"); |
| 154 |
– |
} |
| 183 |
|
if (nproc > 1) { /* start multiprocessing */ |
| 184 |
|
ray_popen(nproc); |
| 185 |
|
ray_fifo_out = printvals; |
| 190 |
|
else |
| 191 |
|
fflush(stdout); |
| 192 |
|
} |
| 193 |
< |
/* process file */ |
| 194 |
< |
while (getvec(orig, inform, fp) == 0 && |
| 195 |
< |
getvec(direc, inform, fp) == 0) { |
| 196 |
< |
|
| 169 |
< |
d = normalize(direc); |
| 170 |
< |
if (d == 0.0) { /* zero ==> flush */ |
| 171 |
< |
if ((--nextflush <= 0) | !vcount && something2flush) { |
| 193 |
> |
/* process input rays */ |
| 194 |
> |
while ((d = nextray(orig, direc)) >= 0.0) { |
| 195 |
> |
if (d == 0.0) { /* flush request? */ |
| 196 |
> |
if (something2flush) { |
| 197 |
|
if (ray_pnprocs > 1 && ray_fifo_flush() < 0) |
| 198 |
|
error(USER, "child(ren) died"); |
| 199 |
|
bogusray(); |
| 200 |
|
fflush(stdout); |
| 201 |
+ |
nextflush = (!vresolu | (hresolu <= 1)) * hresolu; |
| 202 |
|
something2flush = 0; |
| 177 |
– |
nextflush = (vresolu > 0) & (hresolu > 1) ? 0 : |
| 178 |
– |
hresolu; |
| 203 |
|
} else |
| 204 |
|
bogusray(); |
| 205 |
|
} else { /* compute and print */ |
| 206 |
|
rtcompute(orig, direc, lim_dist ? d : 0.0); |
| 207 |
< |
/* flush if time */ |
| 184 |
< |
if (!--nextflush) { |
| 207 |
> |
if (!--nextflush) { /* flush if time */ |
| 208 |
|
if (ray_pnprocs > 1 && ray_fifo_flush() < 0) |
| 209 |
|
error(USER, "child(ren) died"); |
| 210 |
|
fflush(stdout); |
| 222 |
|
error(USER, "unable to complete processing"); |
| 223 |
|
ray_pclose(0); |
| 224 |
|
} |
| 225 |
+ |
if (vcount) |
| 226 |
+ |
error(WARNING, "unexpected EOF on input"); |
| 227 |
|
if (fflush(stdout) < 0) |
| 228 |
|
error(SYSTEM, "write error"); |
| 229 |
< |
if (vcount) |
| 230 |
< |
error(USER, "unexpected EOF on input"); |
| 231 |
< |
if (fname != NULL) |
| 232 |
< |
fclose(fp); |
| 229 |
> |
if (fname != NULL) { |
| 230 |
> |
fclose(inpfp); |
| 231 |
> |
inpfp = NULL; |
| 232 |
> |
} |
| 233 |
> |
nextray(NULL, NULL); |
| 234 |
|
} |
| 235 |
|
|
| 236 |
|
|
| 237 |
< |
static void |
| 238 |
< |
trace_sources(void) /* trace rays to light sources, also */ |
| 237 |
> |
int |
| 238 |
> |
setrtoutput(void) /* set up output tables, return #comp */ |
| 239 |
|
{ |
| 240 |
< |
int sn; |
| 215 |
< |
|
| 216 |
< |
for (sn = 0; sn < nsources; sn++) |
| 217 |
< |
source[sn].sflags |= SFOLLOW; |
| 218 |
< |
} |
| 219 |
< |
|
| 220 |
< |
|
| 221 |
< |
static void |
| 222 |
< |
setoutput( /* set up output tables */ |
| 223 |
< |
char *vs |
| 224 |
< |
) |
| 225 |
< |
{ |
| 240 |
> |
char *vs = outvals; |
| 241 |
|
oputf_t **table = ray_out; |
| 242 |
+ |
const int nco = (sens_curve != NULL) ? 1 : |
| 243 |
+ |
(out_prims != NULL) ? 3 : NCSAMP; |
| 244 |
+ |
int ncomp = 0; |
| 245 |
|
|
| 246 |
< |
castonly = 1; |
| 247 |
< |
while (*vs) |
| 248 |
< |
switch (*vs++) { |
| 246 |
> |
if (!*vs) |
| 247 |
> |
error(USER, "empty output specification"); |
| 248 |
> |
|
| 249 |
> |
switch (outform) { /* make sure (*putreal)() calls someone! */ |
| 250 |
> |
case 'a': putreal = puta; break; |
| 251 |
> |
case 'f': putreal = putf; break; |
| 252 |
> |
case 'd': putreal = putd; break; |
| 253 |
> |
case 'c': |
| 254 |
> |
if (outvals[1] || !strchr("vrx", outvals[0])) |
| 255 |
> |
error(USER, "color format only with -ov, -or, -ox"); |
| 256 |
> |
if (nco < 3) |
| 257 |
> |
error(USER, "color format incompatible with -pY, -pS, -pM"); |
| 258 |
> |
break; |
| 259 |
> |
default: |
| 260 |
> |
error(CONSISTENCY, "botched output format"); |
| 261 |
> |
} |
| 262 |
> |
castonly = 1; /* sets castonly as side-effect */ |
| 263 |
> |
do |
| 264 |
> |
switch (*vs) { |
| 265 |
|
case 'T': /* trace sources */ |
| 266 |
< |
if (!*vs) break; |
| 233 |
< |
trace_sources(); |
| 266 |
> |
Tflag++; |
| 267 |
|
/* fall through */ |
| 268 |
|
case 't': /* trace */ |
| 269 |
< |
if (!*vs) break; |
| 269 |
> |
if (!vs[1]) break; |
| 270 |
|
*table = NULL; |
| 271 |
|
table = every_out; |
| 239 |
– |
trace = ourtrace; |
| 272 |
|
castonly = 0; |
| 273 |
|
break; |
| 274 |
|
case 'o': /* origin */ |
| 275 |
|
*table++ = oputo; |
| 276 |
+ |
ncomp += 3; |
| 277 |
|
break; |
| 278 |
|
case 'd': /* direction */ |
| 279 |
|
*table++ = oputd; |
| 280 |
+ |
ncomp += 3; |
| 281 |
|
break; |
| 282 |
|
case 'r': /* reflected contrib. */ |
| 283 |
|
*table++ = oputr; |
| 284 |
+ |
ncomp += nco; |
| 285 |
|
castonly = 0; |
| 286 |
|
break; |
| 287 |
|
case 'R': /* reflected distance */ |
| 288 |
|
*table++ = oputR; |
| 289 |
+ |
ncomp++; |
| 290 |
|
castonly = 0; |
| 291 |
|
break; |
| 292 |
|
case 'x': /* xmit contrib. */ |
| 293 |
|
*table++ = oputx; |
| 294 |
+ |
ncomp += nco; |
| 295 |
|
castonly = 0; |
| 296 |
|
break; |
| 297 |
|
case 'X': /* xmit distance */ |
| 298 |
|
*table++ = oputX; |
| 299 |
+ |
ncomp++; |
| 300 |
|
castonly = 0; |
| 301 |
|
break; |
| 302 |
|
case 'v': /* value */ |
| 303 |
|
*table++ = oputv; |
| 304 |
+ |
ncomp += nco; |
| 305 |
|
castonly = 0; |
| 306 |
|
break; |
| 307 |
|
case 'V': /* contribution */ |
| 308 |
|
*table++ = oputV; |
| 309 |
+ |
ncomp += nco; |
| 310 |
|
castonly = 0; |
| 311 |
|
if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0)) |
| 312 |
|
error(WARNING, |
| 314 |
|
break; |
| 315 |
|
case 'l': /* effective distance */ |
| 316 |
|
*table++ = oputl; |
| 317 |
+ |
ncomp++; |
| 318 |
|
castonly = 0; |
| 319 |
|
break; |
| 320 |
|
case 'c': /* local coordinates */ |
| 321 |
|
*table++ = oputc; |
| 322 |
+ |
ncomp += 2; |
| 323 |
|
break; |
| 324 |
|
case 'L': /* single ray length */ |
| 325 |
|
*table++ = oputL; |
| 326 |
+ |
ncomp++; |
| 327 |
|
break; |
| 328 |
|
case 'p': /* point */ |
| 329 |
|
*table++ = oputp; |
| 330 |
+ |
ncomp += 3; |
| 331 |
|
break; |
| 332 |
|
case 'n': /* perturbed normal */ |
| 333 |
|
*table++ = oputn; |
| 334 |
+ |
ncomp += 3; |
| 335 |
|
castonly = 0; |
| 336 |
|
break; |
| 337 |
|
case 'N': /* unperturbed normal */ |
| 338 |
|
*table++ = oputN; |
| 339 |
+ |
ncomp += 3; |
| 340 |
|
break; |
| 341 |
|
case 's': /* surface */ |
| 342 |
|
*table++ = oputs; |
| 343 |
+ |
ncomp++; |
| 344 |
|
break; |
| 345 |
|
case 'w': /* weight */ |
| 346 |
|
*table++ = oputw; |
| 347 |
+ |
ncomp++; |
| 348 |
|
break; |
| 349 |
|
case 'W': /* coefficient */ |
| 350 |
|
*table++ = oputW; |
| 351 |
+ |
ncomp += nco; |
| 352 |
|
castonly = 0; |
| 353 |
|
if (ambounce > 0 && (ambacc > FTINY) | (ambssamp > 0)) |
| 354 |
|
error(WARNING, |
| 356 |
|
break; |
| 357 |
|
case 'm': /* modifier */ |
| 358 |
|
*table++ = oputm; |
| 359 |
+ |
ncomp++; |
| 360 |
|
break; |
| 361 |
|
case 'M': /* material */ |
| 362 |
|
*table++ = oputM; |
| 363 |
+ |
ncomp++; |
| 364 |
|
break; |
| 365 |
|
case '~': /* tilde */ |
| 366 |
|
*table++ = oputtilde; |
| 367 |
|
break; |
| 368 |
+ |
default: |
| 369 |
+ |
sprintf(errmsg, "unrecognized output option '%c'", *vs); |
| 370 |
+ |
error(USER, errmsg); |
| 371 |
|
} |
| 372 |
+ |
while (*++vs); |
| 373 |
+ |
|
| 374 |
|
*table = NULL; |
| 375 |
+ |
if (*every_out != NULL) |
| 376 |
+ |
ncomp = 0; |
| 377 |
|
/* compatibility */ |
| 378 |
+ |
if ((do_irrad | imm_irrad) && castonly) |
| 379 |
+ |
error(USER, "-I+ and -i+ options require some value output"); |
| 380 |
|
for (table = ray_out; *table != NULL; table++) { |
| 381 |
|
if ((*table == oputV) | (*table == oputW)) |
| 382 |
|
error(WARNING, "-oVW options require trace mode"); |
| 385 |
|
(*table == oputx) | (*table == oputX)) |
| 386 |
|
error(WARNING, "-orRxX options incompatible with -I+ and -i+"); |
| 387 |
|
} |
| 388 |
+ |
return(ncomp); |
| 389 |
|
} |
| 390 |
|
|
| 391 |
|
|
| 440 |
|
) |
| 441 |
|
{ |
| 442 |
|
/* set up ray */ |
| 382 |
– |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
| 443 |
|
if (imm_irrad) { |
| 444 |
|
VSUM(thisray.rorg, org, dir, 1.1e-4); |
| 445 |
|
thisray.rdir[0] = -dir[0]; |
| 446 |
|
thisray.rdir[1] = -dir[1]; |
| 447 |
|
thisray.rdir[2] = -dir[2]; |
| 448 |
|
thisray.rmax = 0.0; |
| 389 |
– |
thisray.revf = rayirrad; |
| 449 |
|
} else { |
| 450 |
|
VCOPY(thisray.rorg, org); |
| 451 |
|
VCOPY(thisray.rdir, dir); |
| 452 |
|
thisray.rmax = dmax; |
| 394 |
– |
if (castonly) |
| 395 |
– |
thisray.revf = raycast; |
| 453 |
|
} |
| 454 |
+ |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
| 455 |
+ |
if (imm_irrad) |
| 456 |
+ |
thisray.revf = rayirrad; |
| 457 |
+ |
else if (castonly) |
| 458 |
+ |
thisray.revf = raycast; |
| 459 |
|
if (ray_pnprocs > 1) { /* multiprocessing FIFO? */ |
| 460 |
|
if (ray_fifo_in(&thisray) < 0) |
| 461 |
|
error(USER, "lost children"); |
| 485 |
|
|
| 486 |
|
|
| 487 |
|
static int |
| 488 |
< |
getvec( /* get a vector from fp */ |
| 488 |
> |
is_fifo( /* check if file pointer connected to pipe */ |
| 489 |
> |
FILE *fp |
| 490 |
> |
) |
| 491 |
> |
{ |
| 492 |
> |
#ifdef S_ISFIFO |
| 493 |
> |
struct stat sbuf; |
| 494 |
> |
|
| 495 |
> |
if (fstat(fileno(fp), &sbuf) < 0) |
| 496 |
> |
error(SYSTEM, "fstat() failed on input stream"); |
| 497 |
> |
return(S_ISFIFO(sbuf.st_mode)); |
| 498 |
> |
#else |
| 499 |
> |
return (fp == stdin); /* just a guess, really */ |
| 500 |
> |
#endif |
| 501 |
> |
} |
| 502 |
> |
|
| 503 |
> |
|
| 504 |
> |
static int |
| 505 |
> |
getvec( /* get a vector from fp */ |
| 506 |
|
FVECT vec, |
| 507 |
|
int fmt, |
| 508 |
|
FILE *fp |
| 539 |
|
} |
| 540 |
|
|
| 541 |
|
|
| 542 |
+ |
static int |
| 543 |
+ |
iszerovec(const FVECT vec) |
| 544 |
+ |
{ |
| 545 |
+ |
return (vec[0] == 0.0) & (vec[1] == 0.0) & (vec[2] == 0.0); |
| 546 |
+ |
} |
| 547 |
+ |
|
| 548 |
+ |
|
| 549 |
+ |
static double |
| 550 |
+ |
nextray( /* return next ray in work group (-1.0 if EOF) */ |
| 551 |
+ |
FVECT org, |
| 552 |
+ |
FVECT dir |
| 553 |
+ |
) |
| 554 |
+ |
{ |
| 555 |
+ |
const size_t qlength = !vresolu * hresolu; |
| 556 |
+ |
|
| 557 |
+ |
if ((org == NULL) | (dir == NULL)) { |
| 558 |
+ |
if (inp_queue != NULL) /* asking to free queue */ |
| 559 |
+ |
free(inp_queue); |
| 560 |
+ |
inp_queue = NULL; |
| 561 |
+ |
inp_qpos = inp_qend = 0; |
| 562 |
+ |
return(-1.); |
| 563 |
+ |
} |
| 564 |
+ |
if (!inp_qend) { /* initialize FIFO queue */ |
| 565 |
+ |
int rsiz = 6*20; /* conservative ascii ray size */ |
| 566 |
+ |
if (inform == 'f') rsiz = 6*sizeof(float); |
| 567 |
+ |
else if (inform == 'd') rsiz = 6*sizeof(double); |
| 568 |
+ |
/* check against pipe limit */ |
| 569 |
+ |
if (qlength*rsiz > 512 && is_fifo(inpfp)) |
| 570 |
+ |
inp_queue = (FVECT *)malloc(sizeof(FVECT)*2*qlength); |
| 571 |
+ |
inp_qend = -(inp_queue == NULL); /* flag for no queue */ |
| 572 |
+ |
} |
| 573 |
+ |
if (inp_qend < 0) { /* not queuing? */ |
| 574 |
+ |
if (getvec(org, inform, inpfp) < 0 || |
| 575 |
+ |
getvec(dir, inform, inpfp) < 0) |
| 576 |
+ |
return(-1.); |
| 577 |
+ |
return normalize(dir); |
| 578 |
+ |
} |
| 579 |
+ |
if (inp_qpos >= inp_qend) { /* need to refill input queue? */ |
| 580 |
+ |
for (inp_qend = 0; inp_qend < qlength; inp_qend++) { |
| 581 |
+ |
if (getvec(inp_queue[2*inp_qend], inform, inpfp) < 0 |
| 582 |
+ |
|| getvec(inp_queue[2*inp_qend+1], |
| 583 |
+ |
inform, inpfp) < 0) |
| 584 |
+ |
break; /* hit EOF */ |
| 585 |
+ |
if (iszerovec(inp_queue[2*inp_qend+1])) { |
| 586 |
+ |
++inp_qend; /* flush request */ |
| 587 |
+ |
break; |
| 588 |
+ |
} |
| 589 |
+ |
} |
| 590 |
+ |
inp_qpos = 0; |
| 591 |
+ |
} |
| 592 |
+ |
if (inp_qpos >= inp_qend) /* unexpected EOF? */ |
| 593 |
+ |
return(-1.); |
| 594 |
+ |
VCOPY(org, inp_queue[2*inp_qpos]); |
| 595 |
+ |
VCOPY(dir, inp_queue[2*inp_qpos+1]); |
| 596 |
+ |
++inp_qpos; |
| 597 |
+ |
return normalize(dir); |
| 598 |
+ |
} |
| 599 |
+ |
|
| 600 |
+ |
|
| 601 |
|
void |
| 602 |
|
tranotify( /* record new modifier */ |
| 603 |
|
OBJECT obj |
| 708 |
|
RAY *r |
| 709 |
|
) |
| 710 |
|
{ |
| 711 |
< |
RREAL cval[3]; |
| 711 |
> |
SCOLOR cdiff; |
| 712 |
|
|
| 713 |
< |
cval[0] = colval(r->rcol,RED) - colval(r->mcol,RED); |
| 714 |
< |
cval[1] = colval(r->rcol,GRN) - colval(r->mcol,GRN); |
| 715 |
< |
cval[2] = colval(r->rcol,BLU) - colval(r->mcol,BLU); |
| 716 |
< |
(*putreal)(cval, 3); |
| 713 |
> |
copyscolor(cdiff, r->rcol); |
| 714 |
> |
sopscolor(cdiff, -=, r->mcol); |
| 715 |
> |
|
| 716 |
> |
putscolor(cdiff); |
| 717 |
|
} |
| 718 |
|
|
| 719 |
|
|
| 731 |
|
RAY *r |
| 732 |
|
) |
| 733 |
|
{ |
| 734 |
< |
RREAL cval[3]; |
| 597 |
< |
|
| 598 |
< |
cval[0] = colval(r->rcol,RED); |
| 599 |
< |
cval[1] = colval(r->rcol,GRN); |
| 600 |
< |
cval[2] = colval(r->rcol,BLU); |
| 601 |
< |
(*putreal)(cval, 3); |
| 734 |
> |
putscolor(r->rcol); |
| 735 |
|
} |
| 736 |
|
|
| 737 |
|
|
| 740 |
|
RAY *r |
| 741 |
|
) |
| 742 |
|
{ |
| 743 |
< |
RREAL contr[3]; |
| 743 |
> |
SCOLOR contr; |
| 744 |
|
|
| 745 |
|
raycontrib(contr, r, PRIMARY); |
| 746 |
< |
multcolor(contr, r->rcol); |
| 747 |
< |
(*putreal)(contr, 3); |
| 746 |
> |
smultscolor(contr, r->rcol); |
| 747 |
> |
putscolor(contr); |
| 748 |
|
} |
| 749 |
|
|
| 750 |
|
|
| 781 |
|
|
| 782 |
|
|
| 783 |
|
static void |
| 784 |
< |
oputp( /* print point */ |
| 784 |
> |
oputp( /* print intersection point */ |
| 785 |
|
RAY *r |
| 786 |
|
) |
| 787 |
|
{ |
| 788 |
< |
if (r->rot < FHUGE) |
| 656 |
< |
(*putreal)(r->rop, 3); |
| 657 |
< |
else |
| 658 |
< |
(*putreal)(vdummy, 3); |
| 788 |
> |
(*putreal)(r->rop, 3); /* set to ray origin if distant or no hit */ |
| 789 |
|
} |
| 790 |
|
|
| 791 |
|
|
| 794 |
|
RAY *r |
| 795 |
|
) |
| 796 |
|
{ |
| 797 |
< |
if (r->rot < FHUGE) |
| 668 |
< |
(*putreal)(r->ron, 3); |
| 669 |
< |
else |
| 797 |
> |
if (r->ro == NULL) { /* zero vector if clipped or no hit */ |
| 798 |
|
(*putreal)(vdummy, 3); |
| 799 |
+ |
return; |
| 800 |
+ |
} |
| 801 |
+ |
if (r->rflips & 1) { /* undo any flippin' flips */ |
| 802 |
+ |
FVECT unrm; |
| 803 |
+ |
unrm[0] = -r->ron[0]; |
| 804 |
+ |
unrm[1] = -r->ron[1]; |
| 805 |
+ |
unrm[2] = -r->ron[2]; |
| 806 |
+ |
(*putreal)(unrm, 3); |
| 807 |
+ |
} else |
| 808 |
+ |
(*putreal)(r->ron, 3); |
| 809 |
|
} |
| 810 |
|
|
| 811 |
|
|
| 816 |
|
{ |
| 817 |
|
FVECT pnorm; |
| 818 |
|
|
| 819 |
< |
if (r->rot >= FHUGE) { |
| 819 |
> |
if (r->ro == NULL) { /* clipped or no hit */ |
| 820 |
|
(*putreal)(vdummy, 3); |
| 821 |
|
return; |
| 822 |
|
} |
| 854 |
|
RAY *r |
| 855 |
|
) |
| 856 |
|
{ |
| 857 |
< |
RREAL contr[3]; |
| 857 |
> |
SCOLOR contr; |
| 858 |
|
/* shadow ray not on source? */ |
| 859 |
|
if (r->rsrc >= 0 && source[r->rsrc].so != r->ro) |
| 860 |
< |
setcolor(contr, 0.0, 0.0, 0.0); |
| 860 |
> |
scolorblack(contr); |
| 861 |
|
else |
| 862 |
|
raycontrib(contr, r, PRIMARY); |
| 863 |
|
|
| 864 |
< |
(*putreal)(contr, 3); |
| 864 |
> |
putscolor(contr); |
| 865 |
|
} |
| 866 |
|
|
| 867 |
|
|
| 926 |
|
putd(RREAL *v, int n) /* output binary double(s) */ |
| 927 |
|
{ |
| 928 |
|
#ifdef SMLFLT |
| 929 |
< |
double da[3]; |
| 929 |
> |
double da[MAXCSAMP]; |
| 930 |
|
int i; |
| 931 |
|
|
| 932 |
< |
if (n > 3) |
| 932 |
> |
if (n > MAXCSAMP) |
| 933 |
|
error(INTERNAL, "code error in putd()"); |
| 934 |
|
for (i = n; i--; ) |
| 935 |
|
da[i] = v[i]; |
| 944 |
|
putf(RREAL *v, int n) /* output binary float(s) */ |
| 945 |
|
{ |
| 946 |
|
#ifndef SMLFLT |
| 947 |
< |
float fa[3]; |
| 947 |
> |
float fa[MAXCSAMP]; |
| 948 |
|
int i; |
| 949 |
|
|
| 950 |
< |
if (n > 3) |
| 950 |
> |
if (n > MAXCSAMP) |
| 951 |
|
error(INTERNAL, "code error in putf()"); |
| 952 |
|
for (i = n; i--; ) |
| 953 |
|
fa[i] = v[i]; |
| 959 |
|
|
| 960 |
|
|
| 961 |
|
static void |
| 962 |
< |
putrgbe(RREAL *v, int n) /* output RGBE color */ |
| 962 |
> |
putscolor(COLORV *scol) /* output (spectral) color */ |
| 963 |
|
{ |
| 964 |
< |
COLR cout; |
| 965 |
< |
|
| 966 |
< |
if (n != 3) |
| 967 |
< |
error(INTERNAL, "putrgbe() not called with 3 components"); |
| 968 |
< |
setcolr(cout, v[0], v[1], v[2]); |
| 969 |
< |
putbinary(cout, sizeof(cout), 1, stdout); |
| 964 |
> |
static COLORMAT xyz2myrgbmat; |
| 965 |
> |
SCOLOR my_scol; |
| 966 |
> |
COLOR col; |
| 967 |
> |
/* apply scalefactor if any */ |
| 968 |
> |
if (out_scalefactor != 1.) { |
| 969 |
> |
copyscolor(my_scol, scol); |
| 970 |
> |
scalescolor(my_scol, out_scalefactor); |
| 971 |
> |
scol = my_scol; |
| 972 |
> |
} |
| 973 |
> |
if (sens_curve != NULL) { /* single channel output */ |
| 974 |
> |
RREAL v = (*sens_curve)(scol); |
| 975 |
> |
(*putreal)(&v, 1); |
| 976 |
> |
return; |
| 977 |
> |
} |
| 978 |
> |
if (out_prims == NULL) { /* full spectral reporting */ |
| 979 |
> |
if (outform == 'c') { |
| 980 |
> |
SCOLR sclr; |
| 981 |
> |
scolor_scolr(sclr, scol); |
| 982 |
> |
putbinary(sclr, LSCOLR, 1, stdout); |
| 983 |
> |
} else if (sizeof(RREAL) != sizeof(COLORV)) { |
| 984 |
> |
RREAL sreal[MAXCSAMP]; |
| 985 |
> |
int i = NCSAMP; |
| 986 |
> |
while (i--) sreal[i] = scol[i]; |
| 987 |
> |
(*putreal)(sreal, NCSAMP); |
| 988 |
> |
} else |
| 989 |
> |
(*putreal)((RREAL *)scol, NCSAMP); |
| 990 |
> |
return; |
| 991 |
> |
} |
| 992 |
> |
if (out_prims == xyzprims) { |
| 993 |
> |
scolor_cie(col, scol); |
| 994 |
> |
} else if (out_prims == stdprims) { |
| 995 |
> |
scolor_rgb(col, scol); |
| 996 |
> |
} else { |
| 997 |
> |
COLOR xyz; |
| 998 |
> |
if (xyz2myrgbmat[0][0] == 0) |
| 999 |
> |
compxyz2rgbWBmat(xyz2myrgbmat, out_prims); |
| 1000 |
> |
scolor_cie(xyz, scol); |
| 1001 |
> |
colortrans(col, xyz2myrgbmat, xyz); |
| 1002 |
> |
clipgamut(col, xyz[CIEY], CGAMUT_LOWER, cblack, cwhite); |
| 1003 |
> |
} |
| 1004 |
> |
if (outform == 'c') { |
| 1005 |
> |
COLR clr; |
| 1006 |
> |
setcolr(clr, colval(col,RED), colval(col,GRN), colval(col,BLU)); |
| 1007 |
> |
putbinary(clr, sizeof(COLR), 1, stdout); |
| 1008 |
> |
} else if (sizeof(RREAL) != sizeof(COLORV)) { |
| 1009 |
> |
RREAL creal[3]; |
| 1010 |
> |
copycolor(creal, col); |
| 1011 |
> |
(*putreal)(creal, 3); |
| 1012 |
> |
} else |
| 1013 |
> |
(*putreal)((RREAL *)col, 3); |
| 1014 |
|
} |
