| 29 |
|
#include "source.h" |
| 30 |
|
#include "otypes.h" |
| 31 |
|
#include "resolu.h" |
| 32 |
+ |
#include "random.h" |
| 33 |
|
|
| 34 |
< |
CUBE thescene; /* our scene */ |
| 35 |
< |
OBJECT nsceneobjs; /* number of objects in our scene */ |
| 34 |
> |
extern int inform; /* input format */ |
| 35 |
> |
extern int outform; /* output format */ |
| 36 |
> |
extern char *outvals; /* output values */ |
| 37 |
|
|
| 38 |
< |
int dimlist[MAXDIM]; /* sampling dimensions */ |
| 39 |
< |
int ndims = 0; /* number of sampling dimensions */ |
| 38 |
< |
int samplendx = 0; /* index for this sample */ |
| 38 |
> |
extern int imm_irrad; /* compute immediate irradiance? */ |
| 39 |
> |
extern int lim_dist; /* limit distance? */ |
| 40 |
|
|
| 41 |
< |
int imm_irrad = 0; /* compute immediate irradiance? */ |
| 42 |
< |
int lim_dist = 0; /* limit distance? */ |
| 41 |
> |
extern char *tralist[]; /* list of modifers to trace (or no) */ |
| 42 |
> |
extern int traincl; /* include == 1, exclude == 0 */ |
| 43 |
|
|
| 44 |
< |
int inform = 'a'; /* input format */ |
| 45 |
< |
int outform = 'a'; /* output format */ |
| 45 |
< |
char *outvals = "v"; /* output specification */ |
| 44 |
> |
extern int hresolu; /* horizontal resolution */ |
| 45 |
> |
extern int vresolu; /* vertical resolution */ |
| 46 |
|
|
| 47 |
< |
int do_irrad = 0; /* compute irradiance? */ |
| 47 |
> |
static int castonly = 0; |
| 48 |
|
|
| 49 |
< |
void (*trace)() = NULL; /* trace call */ |
| 50 |
< |
|
| 51 |
< |
char *tralist[128]; /* list of modifers to trace (or no) */ |
| 52 |
< |
int traincl = -1; /* include == 1, exclude == 0 */ |
| 53 |
< |
#define MAXTSET 511 /* maximum number in trace set */ |
| 49 |
> |
#ifndef MAXTSET |
| 50 |
> |
#define MAXTSET 8191 /* maximum number in trace set */ |
| 51 |
> |
#endif |
| 52 |
|
OBJECT traset[MAXTSET+1]={0}; /* trace include/exclude set */ |
| 53 |
|
|
| 56 |
– |
int hresolu = 0; /* horizontal (scan) size */ |
| 57 |
– |
int vresolu = 0; /* vertical resolution */ |
| 58 |
– |
|
| 59 |
– |
double dstrsrc = 0.0; /* square source distribution */ |
| 60 |
– |
double shadthresh = .03; /* shadow threshold */ |
| 61 |
– |
double shadcert = .75; /* shadow certainty */ |
| 62 |
– |
int directrelay = 2; /* number of source relays */ |
| 63 |
– |
int vspretest = 512; /* virtual source pretest density */ |
| 64 |
– |
int directvis = 1; /* sources visible? */ |
| 65 |
– |
double srcsizerat = .2; /* maximum ratio source size/dist. */ |
| 66 |
– |
|
| 67 |
– |
COLOR cextinction = BLKCOLOR; /* global extinction coefficient */ |
| 68 |
– |
COLOR salbedo = BLKCOLOR; /* global scattering albedo */ |
| 69 |
– |
double seccg = 0.; /* global scattering eccentricity */ |
| 70 |
– |
double ssampdist = 0.; /* scatter sampling distance */ |
| 71 |
– |
|
| 72 |
– |
double specthresh = .15; /* specular sampling threshold */ |
| 73 |
– |
double specjitter = 1.; /* specular sampling jitter */ |
| 74 |
– |
|
| 75 |
– |
int backvis = 1; /* back face visibility */ |
| 76 |
– |
|
| 77 |
– |
int maxdepth = 8; /* maximum recursion depth */ |
| 78 |
– |
double minweight = 2e-3; /* minimum ray weight */ |
| 79 |
– |
|
| 80 |
– |
char *ambfile = NULL; /* ambient file name */ |
| 81 |
– |
COLOR ambval = BLKCOLOR; /* ambient value */ |
| 82 |
– |
int ambvwt = 0; /* initial weight for ambient value */ |
| 83 |
– |
double ambacc = 0.15; /* ambient accuracy */ |
| 84 |
– |
int ambres = 256; /* ambient resolution */ |
| 85 |
– |
int ambdiv = 1024; /* ambient divisions */ |
| 86 |
– |
int ambssamp = 512; /* ambient super-samples */ |
| 87 |
– |
int ambounce = 0; /* ambient bounces */ |
| 88 |
– |
char *amblist[AMBLLEN]; /* ambient include/exclude list */ |
| 89 |
– |
int ambincl = -1; /* include == 1, exclude == 0 */ |
| 90 |
– |
|
| 91 |
– |
static int castonly = 0; |
| 92 |
– |
|
| 54 |
|
static RAY thisray; /* for our convenience */ |
| 55 |
|
|
| 56 |
|
typedef void putf_t(double v); |
| 57 |
|
static putf_t puta, putd, putf; |
| 58 |
|
|
| 59 |
|
typedef void oputf_t(RAY *r); |
| 60 |
< |
static oputf_t oputo, oputd, oputv, oputl, oputL, oputc, oputp, |
| 61 |
< |
oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputdash; |
| 60 |
> |
static oputf_t oputo, oputd, oputv, oputV, oputl, oputL, oputc, oputp, |
| 61 |
> |
oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputtilde; |
| 62 |
|
|
| 63 |
|
static void setoutput(char *vs); |
| 64 |
< |
static void tranotify(OBJECT obj); |
| 64 |
> |
extern void tranotify(OBJECT obj); |
| 65 |
|
static void bogusray(void); |
| 66 |
< |
static void rad(FVECT org, FVECT dir, double dmax); |
| 67 |
< |
static void irrad(FVECT org, FVECT dir); |
| 68 |
< |
static void printvals(RAY *r); |
| 69 |
< |
static int getvec(FVECT vec, int fmt, FILE *fp); |
| 70 |
< |
static void tabin(RAY *r); |
| 71 |
< |
static void ourtrace(RAY *r); |
| 66 |
> |
static void raycast(RAY *r); |
| 67 |
> |
static void rayirrad(RAY *r); |
| 68 |
> |
static void rtcompute(FVECT org, FVECT dir, double dmax); |
| 69 |
> |
static int printvals(RAY *r); |
| 70 |
> |
static int getvec(FVECT vec, int fmt, FILE *fp); |
| 71 |
> |
static void tabin(RAY *r); |
| 72 |
> |
static void ourtrace(RAY *r); |
| 73 |
|
|
| 74 |
|
static oputf_t *ray_out[16], *every_out[16]; |
| 75 |
|
static putf_t *putreal; |
| 76 |
|
|
| 115 |
– |
void (*addobjnotify[])() = {ambnotify, tranotify, NULL}; |
| 77 |
|
|
| 117 |
– |
|
| 78 |
|
void |
| 79 |
|
quit( /* quit program */ |
| 80 |
|
int code |
| 81 |
|
) |
| 82 |
|
{ |
| 83 |
< |
#ifndef NON_POSIX /* XXX we don't clean up elsewhere? */ |
| 84 |
< |
headclean(); /* delete header file */ |
| 85 |
< |
pfclean(); /* clean up persist files */ |
| 83 |
> |
if (ray_pnprocs > 0) /* close children if any */ |
| 84 |
> |
ray_pclose(0); |
| 85 |
> |
#ifndef NON_POSIX |
| 86 |
> |
else if (!ray_pnprocs) { |
| 87 |
> |
headclean(); /* delete header file */ |
| 88 |
> |
pfclean(); /* clean up persist files */ |
| 89 |
> |
} |
| 90 |
|
#endif |
| 91 |
|
exit(code); |
| 92 |
|
} |
| 93 |
|
|
| 94 |
|
|
| 95 |
< |
extern char * |
| 95 |
> |
char * |
| 96 |
|
formstr( /* return format identifier */ |
| 97 |
|
int f |
| 98 |
|
) |
| 109 |
|
|
| 110 |
|
extern void |
| 111 |
|
rtrace( /* trace rays from file */ |
| 112 |
< |
char *fname |
| 112 |
> |
char *fname, |
| 113 |
> |
int nproc |
| 114 |
|
) |
| 115 |
|
{ |
| 116 |
< |
long vcount = hresolu>1 ? hresolu*vresolu : vresolu; |
| 116 |
> |
unsigned long vcount = (hresolu > 1) ? (unsigned long)hresolu*vresolu |
| 117 |
> |
: vresolu; |
| 118 |
|
long nextflush = hresolu; |
| 119 |
|
FILE *fp; |
| 120 |
|
double d; |
| 126 |
|
sprintf(errmsg, "cannot open input file \"%s\"", fname); |
| 127 |
|
error(SYSTEM, errmsg); |
| 128 |
|
} |
| 163 |
– |
#ifdef _WIN32 |
| 129 |
|
if (inform != 'a') |
| 130 |
|
SET_FILE_BINARY(fp); |
| 166 |
– |
#endif |
| 131 |
|
/* set up output */ |
| 132 |
|
setoutput(outvals); |
| 133 |
+ |
if (imm_irrad) |
| 134 |
+ |
castonly = 0; |
| 135 |
+ |
else if (castonly) |
| 136 |
+ |
nproc = 1; /* don't bother multiprocessing */ |
| 137 |
|
switch (outform) { |
| 138 |
|
case 'a': putreal = puta; break; |
| 139 |
|
case 'f': putreal = putf; break; |
| 145 |
|
default: |
| 146 |
|
error(CONSISTENCY, "botched output format"); |
| 147 |
|
} |
| 148 |
+ |
if (nproc > 1) { /* start multiprocessing */ |
| 149 |
+ |
ray_popen(nproc); |
| 150 |
+ |
ray_fifo_out = printvals; |
| 151 |
+ |
} |
| 152 |
|
if (hresolu > 0) { |
| 153 |
|
if (vresolu > 0) |
| 154 |
|
fprtresolu(hresolu, vresolu, stdout); |
| 160 |
|
|
| 161 |
|
d = normalize(direc); |
| 162 |
|
if (d == 0.0) { /* zero ==> flush */ |
| 163 |
+ |
if (nproc > 1 && ray_fifo_flush() < 0) |
| 164 |
+ |
error(USER, "lost children"); |
| 165 |
|
bogusray(); |
| 166 |
< |
if (--nextflush <= 0 || vcount <= 0) { |
| 166 |
> |
if (--nextflush <= 0 || !vcount) { |
| 167 |
|
fflush(stdout); |
| 168 |
|
nextflush = hresolu; |
| 169 |
|
} |
| 170 |
< |
} else { |
| 171 |
< |
samplendx++; |
| 198 |
< |
/* compute and print */ |
| 199 |
< |
if (imm_irrad) |
| 200 |
< |
irrad(orig, direc); |
| 201 |
< |
else |
| 202 |
< |
rad(orig, direc, lim_dist ? d : 0.0); |
| 170 |
> |
} else { /* compute and print */ |
| 171 |
> |
rtcompute(orig, direc, lim_dist ? d : 0.0); |
| 172 |
|
/* flush if time */ |
| 173 |
< |
if (--nextflush == 0) { |
| 173 |
> |
if (!--nextflush) { |
| 174 |
> |
if (nproc > 1 && ray_fifo_flush() < 0) |
| 175 |
> |
error(USER, "lost children"); |
| 176 |
|
fflush(stdout); |
| 177 |
|
nextflush = hresolu; |
| 178 |
|
} |
| 179 |
|
} |
| 180 |
|
if (ferror(stdout)) |
| 181 |
|
error(SYSTEM, "write error"); |
| 182 |
< |
if (--vcount == 0) /* check for end */ |
| 182 |
> |
if (vcount && !--vcount) /* check for end */ |
| 183 |
|
break; |
| 184 |
|
} |
| 185 |
< |
fflush(stdout); |
| 186 |
< |
if (vcount > 0) |
| 187 |
< |
error(USER, "read error"); |
| 185 |
> |
if (nproc > 1) { /* clean up children */ |
| 186 |
> |
if (ray_fifo_flush() < 0) |
| 187 |
> |
error(USER, "unable to complete processing"); |
| 188 |
> |
ray_pclose(0); |
| 189 |
> |
} |
| 190 |
> |
if (fflush(stdout) < 0) |
| 191 |
> |
error(SYSTEM, "write error"); |
| 192 |
> |
if (vcount) |
| 193 |
> |
error(USER, "unexpected EOF on input"); |
| 194 |
|
if (fname != NULL) |
| 195 |
|
fclose(fp); |
| 196 |
|
} |
| 208 |
|
|
| 209 |
|
static void |
| 210 |
|
setoutput( /* set up output tables */ |
| 211 |
< |
register char *vs |
| 211 |
> |
char *vs |
| 212 |
|
) |
| 213 |
|
{ |
| 214 |
< |
register oputf_t **table = ray_out; |
| 214 |
> |
oputf_t **table = ray_out; |
| 215 |
|
|
| 216 |
|
castonly = 1; |
| 217 |
|
while (*vs) |
| 218 |
|
switch (*vs++) { |
| 219 |
|
case 'T': /* trace sources */ |
| 220 |
+ |
if (!*vs) break; |
| 221 |
|
trace_sources(); |
| 222 |
|
/* fall through */ |
| 223 |
|
case 't': /* trace */ |
| 224 |
+ |
if (!*vs) break; |
| 225 |
|
*table = NULL; |
| 226 |
|
table = every_out; |
| 227 |
|
trace = ourtrace; |
| 237 |
|
*table++ = oputv; |
| 238 |
|
castonly = 0; |
| 239 |
|
break; |
| 240 |
+ |
case 'V': /* contribution */ |
| 241 |
+ |
*table++ = oputV; |
| 242 |
+ |
if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0)) |
| 243 |
+ |
error(WARNING, |
| 244 |
+ |
"-otV accuracy depends on -aa 0 -as 0"); |
| 245 |
+ |
break; |
| 246 |
|
case 'l': /* effective distance */ |
| 247 |
|
*table++ = oputl; |
| 248 |
|
castonly = 0; |
| 281 |
|
case 'M': /* material */ |
| 282 |
|
*table++ = oputM; |
| 283 |
|
break; |
| 284 |
< |
case '-': /* dash */ |
| 285 |
< |
*table++ = oputdash; |
| 284 |
> |
case '~': /* tilde */ |
| 285 |
> |
*table++ = oputtilde; |
| 286 |
|
break; |
| 287 |
|
} |
| 288 |
|
*table = NULL; |
| 301 |
|
|
| 302 |
|
|
| 303 |
|
static void |
| 304 |
< |
rad( /* compute and print ray value(s) */ |
| 305 |
< |
FVECT org, |
| 321 |
< |
FVECT dir, |
| 322 |
< |
double dmax |
| 304 |
> |
raycast( /* compute first ray intersection only */ |
| 305 |
> |
RAY *r |
| 306 |
|
) |
| 307 |
|
{ |
| 308 |
< |
VCOPY(thisray.rorg, org); |
| 309 |
< |
VCOPY(thisray.rdir, dir); |
| 310 |
< |
thisray.rmax = dmax; |
| 311 |
< |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
| 312 |
< |
if (castonly) { |
| 313 |
< |
if (!localhit(&thisray, &thescene)) { |
| 314 |
< |
if (thisray.ro == &Aftplane) { /* clipped */ |
| 332 |
< |
thisray.ro = NULL; |
| 333 |
< |
thisray.rot = FHUGE; |
| 334 |
< |
} else |
| 335 |
< |
sourcehit(&thisray); |
| 336 |
< |
} |
| 337 |
< |
} else |
| 338 |
< |
rayvalue(&thisray); |
| 339 |
< |
printvals(&thisray); |
| 308 |
> |
if (!localhit(r, &thescene)) { |
| 309 |
> |
if (r->ro == &Aftplane) { /* clipped */ |
| 310 |
> |
r->ro = NULL; |
| 311 |
> |
r->rot = FHUGE; |
| 312 |
> |
} else |
| 313 |
> |
sourcehit(r); |
| 314 |
> |
} |
| 315 |
|
} |
| 316 |
|
|
| 317 |
|
|
| 318 |
|
static void |
| 319 |
< |
irrad( /* compute immediate irradiance value */ |
| 320 |
< |
FVECT org, |
| 346 |
< |
FVECT dir |
| 319 |
> |
rayirrad( /* compute irradiance rather than radiance */ |
| 320 |
> |
RAY *r |
| 321 |
|
) |
| 322 |
|
{ |
| 323 |
< |
register int i; |
| 323 |
> |
r->rot = 1e-5; /* pretend we hit surface */ |
| 324 |
> |
VSUM(r->rop, r->rorg, r->rdir, r->rot); |
| 325 |
> |
r->ron[0] = -r->rdir[0]; |
| 326 |
> |
r->ron[1] = -r->rdir[1]; |
| 327 |
> |
r->ron[2] = -r->rdir[2]; |
| 328 |
> |
r->rod = 1.0; |
| 329 |
> |
/* compute result */ |
| 330 |
> |
(*ofun[Lamb.otype].funp)(&Lamb, r); |
| 331 |
> |
} |
| 332 |
|
|
| 333 |
< |
for (i = 0; i < 3; i++) { |
| 334 |
< |
thisray.rorg[i] = org[i] + dir[i]; |
| 335 |
< |
thisray.rdir[i] = -dir[i]; |
| 336 |
< |
} |
| 337 |
< |
thisray.rmax = 0.0; |
| 333 |
> |
|
| 334 |
> |
static void |
| 335 |
> |
rtcompute( /* compute and print ray value(s) */ |
| 336 |
> |
FVECT org, |
| 337 |
> |
FVECT dir, |
| 338 |
> |
double dmax |
| 339 |
> |
) |
| 340 |
> |
{ |
| 341 |
> |
/* set up ray */ |
| 342 |
|
rayorigin(&thisray, PRIMARY, NULL, NULL); |
| 343 |
< |
/* pretend we hit surface */ |
| 344 |
< |
thisray.rot = 1.0-1e-4; |
| 345 |
< |
thisray.rod = 1.0; |
| 346 |
< |
VCOPY(thisray.ron, dir); |
| 347 |
< |
for (i = 0; i < 3; i++) /* fudge factor */ |
| 348 |
< |
thisray.rop[i] = org[i] + 1e-4*dir[i]; |
| 349 |
< |
/* compute and print */ |
| 350 |
< |
(*ofun[Lamb.otype].funp)(&Lamb, &thisray); |
| 343 |
> |
if (imm_irrad) { |
| 344 |
> |
VSUM(thisray.rorg, org, dir, 1.1e-4); |
| 345 |
> |
thisray.rdir[0] = -dir[0]; |
| 346 |
> |
thisray.rdir[1] = -dir[1]; |
| 347 |
> |
thisray.rdir[2] = -dir[2]; |
| 348 |
> |
thisray.rmax = 0.0; |
| 349 |
> |
thisray.revf = rayirrad; |
| 350 |
> |
} else { |
| 351 |
> |
VCOPY(thisray.rorg, org); |
| 352 |
> |
VCOPY(thisray.rdir, dir); |
| 353 |
> |
thisray.rmax = dmax; |
| 354 |
> |
if (castonly) |
| 355 |
> |
thisray.revf = raycast; |
| 356 |
> |
} |
| 357 |
> |
if (ray_pnprocs > 1) { /* multiprocessing FIFO? */ |
| 358 |
> |
if (ray_fifo_in(&thisray) < 0) |
| 359 |
> |
error(USER, "lost children"); |
| 360 |
> |
return; |
| 361 |
> |
} |
| 362 |
> |
samplendx++; /* else do it ourselves */ |
| 363 |
> |
rayvalue(&thisray); |
| 364 |
|
printvals(&thisray); |
| 365 |
|
} |
| 366 |
|
|
| 367 |
|
|
| 368 |
< |
static void |
| 368 |
> |
static int |
| 369 |
|
printvals( /* print requested ray values */ |
| 370 |
|
RAY *r |
| 371 |
|
) |
| 372 |
|
{ |
| 373 |
< |
register oputf_t **tp; |
| 373 |
> |
oputf_t **tp; |
| 374 |
|
|
| 375 |
|
if (ray_out[0] == NULL) |
| 376 |
< |
return; |
| 376 |
> |
return(0); |
| 377 |
|
for (tp = ray_out; *tp != NULL; tp++) |
| 378 |
|
(**tp)(r); |
| 379 |
|
if (outform == 'a') |
| 380 |
|
putchar('\n'); |
| 381 |
+ |
return(1); |
| 382 |
|
} |
| 383 |
|
|
| 384 |
|
|
| 385 |
|
static int |
| 386 |
|
getvec( /* get a vector from fp */ |
| 387 |
< |
register FVECT vec, |
| 387 |
> |
FVECT vec, |
| 388 |
|
int fmt, |
| 389 |
|
FILE *fp |
| 390 |
|
) |
| 392 |
|
static float vf[3]; |
| 393 |
|
static double vd[3]; |
| 394 |
|
char buf[32]; |
| 395 |
< |
register int i; |
| 395 |
> |
int i; |
| 396 |
|
|
| 397 |
|
switch (fmt) { |
| 398 |
|
case 'a': /* ascii */ |
| 406 |
|
case 'f': /* binary float */ |
| 407 |
|
if (fread((char *)vf, sizeof(float), 3, fp) != 3) |
| 408 |
|
return(-1); |
| 409 |
< |
vec[0] = vf[0]; vec[1] = vf[1]; vec[2] = vf[2]; |
| 409 |
> |
VCOPY(vec, vf); |
| 410 |
|
break; |
| 411 |
|
case 'd': /* binary double */ |
| 412 |
|
if (fread((char *)vd, sizeof(double), 3, fp) != 3) |
| 413 |
|
return(-1); |
| 414 |
< |
vec[0] = vd[0]; vec[1] = vd[1]; vec[2] = vd[2]; |
| 414 |
> |
VCOPY(vec, vd); |
| 415 |
|
break; |
| 416 |
|
default: |
| 417 |
|
error(CONSISTENCY, "botched input format"); |
| 420 |
|
} |
| 421 |
|
|
| 422 |
|
|
| 423 |
< |
static void |
| 423 |
> |
void |
| 424 |
|
tranotify( /* record new modifier */ |
| 425 |
|
OBJECT obj |
| 426 |
|
) |
| 427 |
|
{ |
| 428 |
|
static int hitlimit = 0; |
| 429 |
< |
register OBJREC *o = objptr(obj); |
| 430 |
< |
register char **tralp; |
| 429 |
> |
OBJREC *o = objptr(obj); |
| 430 |
> |
char **tralp; |
| 431 |
|
|
| 432 |
|
if (obj == OVOID) { /* starting over */ |
| 433 |
|
traset[0] = 0; |
| 454 |
|
RAY *r |
| 455 |
|
) |
| 456 |
|
{ |
| 457 |
< |
register oputf_t **tp; |
| 457 |
> |
oputf_t **tp; |
| 458 |
|
|
| 459 |
|
if (every_out[0] == NULL) |
| 460 |
|
return; |
| 525 |
|
|
| 526 |
|
|
| 527 |
|
static void |
| 528 |
+ |
oputV( /* print value contribution */ |
| 529 |
+ |
RAY *r |
| 530 |
+ |
) |
| 531 |
+ |
{ |
| 532 |
+ |
double contr[3]; |
| 533 |
+ |
|
| 534 |
+ |
raycontrib(contr, r, PRIMARY); |
| 535 |
+ |
multcolor(contr, r->rcol); |
| 536 |
+ |
(*putreal)(contr[RED]); |
| 537 |
+ |
(*putreal)(contr[GRN]); |
| 538 |
+ |
(*putreal)(contr[BLU]); |
| 539 |
+ |
} |
| 540 |
+ |
|
| 541 |
+ |
|
| 542 |
+ |
static void |
| 543 |
|
oputl( /* print effective distance */ |
| 544 |
|
RAY *r |
| 545 |
|
) |
| 644 |
|
|
| 645 |
|
|
| 646 |
|
static void |
| 647 |
< |
oputW( /* print contribution */ |
| 647 |
> |
oputW( /* print coefficient */ |
| 648 |
|
RAY *r |
| 649 |
|
) |
| 650 |
|
{ |
| 651 |
< |
COLOR contr; |
| 651 |
> |
double contr[3]; |
| 652 |
|
|
| 653 |
|
raycontrib(contr, r, PRIMARY); |
| 654 |
< |
(*putreal)(colval(contr,RED)); |
| 655 |
< |
(*putreal)(colval(contr,GRN)); |
| 656 |
< |
(*putreal)(colval(contr,BLU)); |
| 654 |
> |
(*putreal)(contr[RED]); |
| 655 |
> |
(*putreal)(contr[GRN]); |
| 656 |
> |
(*putreal)(contr[BLU]); |
| 657 |
|
} |
| 658 |
|
|
| 659 |
|
|
| 692 |
|
|
| 693 |
|
|
| 694 |
|
static void |
| 695 |
< |
oputdash( /* output dash (spacer) */ |
| 695 |
> |
oputtilde( /* output tilde (spacer) */ |
| 696 |
|
RAY *r |
| 697 |
|
) |
| 698 |
|
{ |
| 699 |
< |
putchar('-'); |
| 685 |
< |
putchar('\t'); |
| 699 |
> |
fputs("~\t", stdout); |
| 700 |
|
} |
| 701 |
|
|
| 702 |
|
|
