1 |
– |
/* Copyright (c) 1994 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 |
|
* rtrace.c - program and variables for individual ray tracing. |
9 |
– |
* |
10 |
– |
* 6/11/86 |
6 |
|
*/ |
7 |
|
|
8 |
+ |
#include "copyright.h" |
9 |
+ |
|
10 |
|
/* |
11 |
|
* Input is in the form: |
12 |
|
* |
21 |
|
* irradiance values are desired. |
22 |
|
*/ |
23 |
|
|
24 |
< |
#include "ray.h" |
24 |
> |
#include <time.h> |
25 |
|
|
26 |
< |
#include "octree.h" |
27 |
< |
|
26 |
> |
#include "platform.h" |
27 |
> |
#include "ray.h" |
28 |
> |
#include "ambient.h" |
29 |
> |
#include "source.h" |
30 |
|
#include "otypes.h" |
32 |
– |
|
31 |
|
#include "resolu.h" |
32 |
|
|
33 |
+ |
CUBE thescene; /* our scene */ |
34 |
+ |
OBJECT nsceneobjs; /* number of objects in our scene */ |
35 |
+ |
|
36 |
|
int dimlist[MAXDIM]; /* sampling dimensions */ |
37 |
|
int ndims = 0; /* number of sampling dimensions */ |
38 |
|
int samplendx = 0; /* index for this sample */ |
39 |
|
|
40 |
|
int imm_irrad = 0; /* compute immediate irradiance? */ |
41 |
+ |
int lim_dist = 0; /* limit distance? */ |
42 |
|
|
43 |
|
int inform = 'a'; /* input format */ |
44 |
|
int outform = 'a'; /* output format */ |
45 |
|
char *outvals = "v"; /* output specification */ |
46 |
|
|
47 |
+ |
int do_irrad = 0; /* compute irradiance? */ |
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 */ |
57 |
|
int vresolu = 0; /* vertical resolution */ |
58 |
|
|
59 |
|
double dstrsrc = 0.0; /* square source distribution */ |
60 |
< |
double shadthresh = .05; /* shadow threshold */ |
61 |
< |
double shadcert = .5; /* shadow certainty */ |
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 = 6; /* maximum recursion depth */ |
78 |
< |
double minweight = 4e-3; /* minimum ray weight */ |
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 |
< |
double ambacc = 0.2; /* ambient accuracy */ |
83 |
< |
int ambres = 128; /* ambient resolution */ |
84 |
< |
int ambdiv = 512; /* ambient divisions */ |
85 |
< |
int ambssamp = 0; /* ambient super-samples */ |
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[128]; /* ambient include/exclude list */ |
88 |
> |
char *amblist[AMBLLEN]; /* ambient include/exclude list */ |
89 |
|
int ambincl = -1; /* include == 1, exclude == 0 */ |
90 |
|
|
91 |
< |
extern OBJREC Lamb; /* a Lambertian surface */ |
91 |
> |
static int castonly = 0; |
92 |
|
|
93 |
|
static RAY thisray; /* for our convenience */ |
94 |
|
|
95 |
< |
static int oputo(), oputd(), oputv(), oputl(), oputL(), |
96 |
< |
oputp(), oputn(), oputN(), oputs(), oputw(), oputm(); |
95 |
> |
typedef void putf_t(double v); |
96 |
> |
static putf_t puta, putd, putf; |
97 |
|
|
98 |
< |
static int ourtrace(), tabin(); |
99 |
< |
static int (*ray_out[16])(), (*every_out[16])(); |
100 |
< |
static int castonly = 0; |
98 |
> |
typedef void oputf_t(RAY *r); |
99 |
> |
static oputf_t oputo, oputd, oputv, oputl, oputL, oputc, oputp, |
100 |
> |
oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputtilde; |
101 |
|
|
102 |
< |
static int puta(), putf(), putd(); |
102 |
> |
static void setoutput(char *vs); |
103 |
> |
static void tranotify(OBJECT obj); |
104 |
> |
static void bogusray(void); |
105 |
> |
static void rad(FVECT org, FVECT dir, double dmax); |
106 |
> |
static void irrad(FVECT org, FVECT dir); |
107 |
> |
static void printvals(RAY *r); |
108 |
> |
static int getvec(FVECT vec, int fmt, FILE *fp); |
109 |
> |
static void tabin(RAY *r); |
110 |
> |
static void ourtrace(RAY *r); |
111 |
|
|
112 |
< |
static int (*putreal)(); |
112 |
> |
static oputf_t *ray_out[16], *every_out[16]; |
113 |
> |
static putf_t *putreal; |
114 |
|
|
115 |
+ |
void (*addobjnotify[])() = {ambnotify, tranotify, NULL}; |
116 |
|
|
117 |
< |
quit(code) /* quit program */ |
118 |
< |
int code; |
117 |
> |
|
118 |
> |
void |
119 |
> |
quit( /* quit program */ |
120 |
> |
int code |
121 |
> |
) |
122 |
|
{ |
123 |
< |
#ifndef NIX |
123 |
> |
#ifndef NON_POSIX /* XXX we don't clean up elsewhere? */ |
124 |
|
headclean(); /* delete header file */ |
125 |
|
pfclean(); /* clean up persist files */ |
126 |
|
#endif |
128 |
|
} |
129 |
|
|
130 |
|
|
131 |
< |
char * |
132 |
< |
formstr(f) /* return format identifier */ |
133 |
< |
int f; |
131 |
> |
extern char * |
132 |
> |
formstr( /* return format identifier */ |
133 |
> |
int f |
134 |
> |
) |
135 |
|
{ |
136 |
|
switch (f) { |
137 |
|
case 'a': return("ascii"); |
143 |
|
} |
144 |
|
|
145 |
|
|
146 |
< |
rtrace(fname) /* trace rays from file */ |
147 |
< |
char *fname; |
146 |
> |
extern void |
147 |
> |
rtrace( /* trace rays from file */ |
148 |
> |
char *fname |
149 |
> |
) |
150 |
|
{ |
151 |
|
long vcount = hresolu>1 ? hresolu*vresolu : vresolu; |
152 |
|
long nextflush = hresolu; |
153 |
|
FILE *fp; |
154 |
+ |
double d; |
155 |
|
FVECT orig, direc; |
156 |
|
/* set up input */ |
157 |
|
if (fname == NULL) |
160 |
|
sprintf(errmsg, "cannot open input file \"%s\"", fname); |
161 |
|
error(SYSTEM, errmsg); |
162 |
|
} |
163 |
< |
#ifdef MSDOS |
163 |
> |
#ifdef _WIN32 |
164 |
|
if (inform != 'a') |
165 |
< |
setmode(fileno(fp), O_BINARY); |
165 |
> |
SET_FILE_BINARY(fp); |
166 |
|
#endif |
167 |
|
/* set up output */ |
168 |
|
setoutput(outvals); |
186 |
|
while (getvec(orig, inform, fp) == 0 && |
187 |
|
getvec(direc, inform, fp) == 0) { |
188 |
|
|
189 |
< |
if (normalize(direc) == 0.0) { /* zero ==> flush */ |
190 |
< |
fflush(stdout); |
191 |
< |
continue; |
192 |
< |
} |
193 |
< |
samplendx++; |
189 |
> |
d = normalize(direc); |
190 |
> |
if (d == 0.0) { /* zero ==> flush */ |
191 |
> |
bogusray(); |
192 |
> |
if (--nextflush <= 0 || vcount <= 0) { |
193 |
> |
fflush(stdout); |
194 |
> |
nextflush = hresolu; |
195 |
> |
} |
196 |
> |
} else { |
197 |
> |
samplendx++; |
198 |
|
/* compute and print */ |
199 |
< |
if (imm_irrad) |
200 |
< |
irrad(orig, direc); |
201 |
< |
else |
202 |
< |
rad(orig, direc); |
199 |
> |
if (imm_irrad) |
200 |
> |
irrad(orig, direc); |
201 |
> |
else |
202 |
> |
rad(orig, direc, lim_dist ? d : 0.0); |
203 |
|
/* flush if time */ |
204 |
< |
if (--nextflush == 0) { |
205 |
< |
fflush(stdout); |
206 |
< |
nextflush = hresolu; |
204 |
> |
if (--nextflush == 0) { |
205 |
> |
fflush(stdout); |
206 |
> |
nextflush = hresolu; |
207 |
> |
} |
208 |
|
} |
209 |
|
if (ferror(stdout)) |
210 |
|
error(SYSTEM, "write error"); |
213 |
|
} |
214 |
|
fflush(stdout); |
215 |
|
if (vcount > 0) |
216 |
< |
error(USER, "read error"); |
216 |
> |
error(USER, "unexpected EOF on input"); |
217 |
|
if (fname != NULL) |
218 |
|
fclose(fp); |
219 |
|
} |
220 |
|
|
221 |
|
|
222 |
< |
setoutput(vs) /* set up output tables */ |
223 |
< |
register char *vs; |
222 |
> |
static void |
223 |
> |
trace_sources(void) /* trace rays to light sources, also */ |
224 |
|
{ |
225 |
< |
extern int (*trace)(); |
226 |
< |
register int (**table)() = ray_out; |
225 |
> |
int sn; |
226 |
> |
|
227 |
> |
for (sn = 0; sn < nsources; sn++) |
228 |
> |
source[sn].sflags |= SFOLLOW; |
229 |
> |
} |
230 |
|
|
231 |
+ |
|
232 |
+ |
static void |
233 |
+ |
setoutput( /* set up output tables */ |
234 |
+ |
register char *vs |
235 |
+ |
) |
236 |
+ |
{ |
237 |
+ |
register oputf_t **table = ray_out; |
238 |
+ |
|
239 |
|
castonly = 1; |
240 |
|
while (*vs) |
241 |
|
switch (*vs++) { |
242 |
+ |
case 'T': /* trace sources */ |
243 |
+ |
if (!*vs) break; |
244 |
+ |
trace_sources(); |
245 |
+ |
/* fall through */ |
246 |
|
case 't': /* trace */ |
247 |
+ |
if (!*vs) break; |
248 |
|
*table = NULL; |
249 |
|
table = every_out; |
250 |
|
trace = ourtrace; |
264 |
|
*table++ = oputl; |
265 |
|
castonly = 0; |
266 |
|
break; |
267 |
+ |
case 'c': /* local coordinates */ |
268 |
+ |
*table++ = oputc; |
269 |
+ |
break; |
270 |
|
case 'L': /* single ray length */ |
271 |
|
*table++ = oputL; |
272 |
|
break; |
286 |
|
case 'w': /* weight */ |
287 |
|
*table++ = oputw; |
288 |
|
break; |
289 |
+ |
case 'W': /* coefficient */ |
290 |
+ |
*table++ = oputW; |
291 |
+ |
if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0)) |
292 |
+ |
error(WARNING, |
293 |
+ |
"-otW accuracy depends on -aa 0 -as 0"); |
294 |
+ |
break; |
295 |
|
case 'm': /* modifier */ |
296 |
|
*table++ = oputm; |
297 |
|
break; |
298 |
+ |
case 'M': /* material */ |
299 |
+ |
*table++ = oputM; |
300 |
+ |
break; |
301 |
+ |
case '~': /* tilde */ |
302 |
+ |
*table++ = oputtilde; |
303 |
+ |
break; |
304 |
|
} |
305 |
|
*table = NULL; |
306 |
|
} |
307 |
|
|
308 |
|
|
309 |
< |
rad(org, dir) /* compute and print ray value(s) */ |
310 |
< |
FVECT org, dir; |
309 |
> |
static void |
310 |
> |
bogusray(void) /* print out empty record */ |
311 |
|
{ |
312 |
+ |
thisray.rorg[0] = thisray.rorg[1] = thisray.rorg[2] = |
313 |
+ |
thisray.rdir[0] = thisray.rdir[1] = thisray.rdir[2] = 0.0; |
314 |
+ |
thisray.rmax = 0.0; |
315 |
+ |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
316 |
+ |
printvals(&thisray); |
317 |
+ |
} |
318 |
+ |
|
319 |
+ |
|
320 |
+ |
static void |
321 |
+ |
rad( /* compute and print ray value(s) */ |
322 |
+ |
FVECT org, |
323 |
+ |
FVECT dir, |
324 |
+ |
double dmax |
325 |
+ |
) |
326 |
+ |
{ |
327 |
|
VCOPY(thisray.rorg, org); |
328 |
|
VCOPY(thisray.rdir, dir); |
329 |
< |
thisray.rmax = 0.0; |
330 |
< |
rayorigin(&thisray, NULL, PRIMARY, 1.0); |
331 |
< |
if (castonly) |
332 |
< |
localhit(&thisray, &thescene) || sourcehit(&thisray); |
333 |
< |
else |
329 |
> |
thisray.rmax = dmax; |
330 |
> |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
331 |
> |
if (castonly) { |
332 |
> |
if (!localhit(&thisray, &thescene)) { |
333 |
> |
if (thisray.ro == &Aftplane) { /* clipped */ |
334 |
> |
thisray.ro = NULL; |
335 |
> |
thisray.rot = FHUGE; |
336 |
> |
} else |
337 |
> |
sourcehit(&thisray); |
338 |
> |
} |
339 |
> |
} else |
340 |
|
rayvalue(&thisray); |
341 |
|
printvals(&thisray); |
342 |
|
} |
343 |
|
|
344 |
|
|
345 |
< |
irrad(org, dir) /* compute immediate irradiance value */ |
346 |
< |
FVECT org, dir; |
345 |
> |
static void |
346 |
> |
irrad( /* compute immediate irradiance value */ |
347 |
> |
FVECT org, |
348 |
> |
FVECT dir |
349 |
> |
) |
350 |
|
{ |
351 |
|
register int i; |
352 |
|
|
354 |
|
thisray.rorg[i] = org[i] + dir[i]; |
355 |
|
thisray.rdir[i] = -dir[i]; |
356 |
|
} |
357 |
< |
rayorigin(&thisray, NULL, PRIMARY, 1.0); |
357 |
> |
thisray.rmax = 0.0; |
358 |
> |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
359 |
|
/* pretend we hit surface */ |
360 |
|
thisray.rot = 1.0-1e-4; |
361 |
|
thisray.rod = 1.0; |
368 |
|
} |
369 |
|
|
370 |
|
|
371 |
< |
printvals(r) /* print requested ray values */ |
372 |
< |
RAY *r; |
371 |
> |
static void |
372 |
> |
printvals( /* print requested ray values */ |
373 |
> |
RAY *r |
374 |
> |
) |
375 |
|
{ |
376 |
< |
register int (**tp)(); |
376 |
> |
register oputf_t **tp; |
377 |
|
|
378 |
|
if (ray_out[0] == NULL) |
379 |
|
return; |
384 |
|
} |
385 |
|
|
386 |
|
|
387 |
< |
getvec(vec, fmt, fp) /* get a vector from fp */ |
388 |
< |
register FVECT vec; |
389 |
< |
int fmt; |
390 |
< |
FILE *fp; |
387 |
> |
static int |
388 |
> |
getvec( /* get a vector from fp */ |
389 |
> |
register FVECT vec, |
390 |
> |
int fmt, |
391 |
> |
FILE *fp |
392 |
> |
) |
393 |
|
{ |
299 |
– |
extern char *fgetword(); |
394 |
|
static float vf[3]; |
395 |
|
static double vd[3]; |
396 |
|
char buf[32]; |
422 |
|
} |
423 |
|
|
424 |
|
|
425 |
< |
tranotify(obj) /* record new modifier */ |
426 |
< |
OBJECT obj; |
425 |
> |
static void |
426 |
> |
tranotify( /* record new modifier */ |
427 |
> |
OBJECT obj |
428 |
> |
) |
429 |
|
{ |
430 |
|
static int hitlimit = 0; |
431 |
|
register OBJREC *o = objptr(obj); |
432 |
|
register char **tralp; |
433 |
|
|
434 |
+ |
if (obj == OVOID) { /* starting over */ |
435 |
+ |
traset[0] = 0; |
436 |
+ |
hitlimit = 0; |
437 |
+ |
return; |
438 |
+ |
} |
439 |
|
if (hitlimit || !ismodifier(o->otype)) |
440 |
|
return; |
441 |
|
for (tralp = tralist; *tralp != NULL; tralp++) |
451 |
|
} |
452 |
|
|
453 |
|
|
454 |
< |
static |
455 |
< |
ourtrace(r) /* print ray values */ |
456 |
< |
RAY *r; |
454 |
> |
static void |
455 |
> |
ourtrace( /* print ray values */ |
456 |
> |
RAY *r |
457 |
> |
) |
458 |
|
{ |
459 |
< |
register int (**tp)(); |
459 |
> |
register oputf_t **tp; |
460 |
|
|
461 |
|
if (every_out[0] == NULL) |
462 |
|
return; |
468 |
|
tabin(r); |
469 |
|
for (tp = every_out; *tp != NULL; tp++) |
470 |
|
(**tp)(r); |
471 |
< |
putchar('\n'); |
471 |
> |
if (outform == 'a') |
472 |
> |
putchar('\n'); |
473 |
|
} |
474 |
|
|
475 |
|
|
476 |
< |
static |
477 |
< |
tabin(r) /* tab in appropriate amount */ |
478 |
< |
RAY *r; |
476 |
> |
static void |
477 |
> |
tabin( /* tab in appropriate amount */ |
478 |
> |
RAY *r |
479 |
> |
) |
480 |
|
{ |
481 |
< |
register RAY *rp; |
481 |
> |
const RAY *rp; |
482 |
|
|
483 |
|
for (rp = r->parent; rp != NULL; rp = rp->parent) |
484 |
|
putchar('\t'); |
485 |
|
} |
486 |
|
|
487 |
|
|
488 |
< |
static |
489 |
< |
oputo(r) /* print origin */ |
490 |
< |
register RAY *r; |
488 |
> |
static void |
489 |
> |
oputo( /* print origin */ |
490 |
> |
RAY *r |
491 |
> |
) |
492 |
|
{ |
493 |
|
(*putreal)(r->rorg[0]); |
494 |
|
(*putreal)(r->rorg[1]); |
496 |
|
} |
497 |
|
|
498 |
|
|
499 |
< |
static |
500 |
< |
oputd(r) /* print direction */ |
501 |
< |
register RAY *r; |
499 |
> |
static void |
500 |
> |
oputd( /* print direction */ |
501 |
> |
RAY *r |
502 |
> |
) |
503 |
|
{ |
504 |
|
(*putreal)(r->rdir[0]); |
505 |
|
(*putreal)(r->rdir[1]); |
507 |
|
} |
508 |
|
|
509 |
|
|
510 |
< |
static |
511 |
< |
oputv(r) /* print value */ |
512 |
< |
register RAY *r; |
510 |
> |
static void |
511 |
> |
oputv( /* print value */ |
512 |
> |
RAY *r |
513 |
> |
) |
514 |
|
{ |
408 |
– |
COLR cout; |
409 |
– |
|
515 |
|
if (outform == 'c') { |
516 |
+ |
COLR cout; |
517 |
|
setcolr(cout, colval(r->rcol,RED), |
518 |
|
colval(r->rcol,GRN), |
519 |
|
colval(r->rcol,BLU)); |
526 |
|
} |
527 |
|
|
528 |
|
|
529 |
< |
static |
530 |
< |
oputl(r) /* print effective distance */ |
531 |
< |
register RAY *r; |
529 |
> |
static void |
530 |
> |
oputl( /* print effective distance */ |
531 |
> |
RAY *r |
532 |
> |
) |
533 |
|
{ |
534 |
|
(*putreal)(r->rt); |
535 |
|
} |
536 |
|
|
537 |
|
|
538 |
< |
static |
539 |
< |
oputL(r) /* print single ray length */ |
540 |
< |
register RAY *r; |
538 |
> |
static void |
539 |
> |
oputL( /* print single ray length */ |
540 |
> |
RAY *r |
541 |
> |
) |
542 |
|
{ |
543 |
|
(*putreal)(r->rot); |
544 |
|
} |
545 |
|
|
546 |
|
|
547 |
< |
static |
548 |
< |
oputp(r) /* print point */ |
549 |
< |
register RAY *r; |
547 |
> |
static void |
548 |
> |
oputc( /* print local coordinates */ |
549 |
> |
RAY *r |
550 |
> |
) |
551 |
|
{ |
552 |
+ |
(*putreal)(r->uv[0]); |
553 |
+ |
(*putreal)(r->uv[1]); |
554 |
+ |
} |
555 |
+ |
|
556 |
+ |
|
557 |
+ |
static void |
558 |
+ |
oputp( /* print point */ |
559 |
+ |
RAY *r |
560 |
+ |
) |
561 |
+ |
{ |
562 |
|
if (r->rot < FHUGE) { |
563 |
|
(*putreal)(r->rop[0]); |
564 |
|
(*putreal)(r->rop[1]); |
571 |
|
} |
572 |
|
|
573 |
|
|
574 |
< |
static |
575 |
< |
oputN(r) /* print unperturbed normal */ |
576 |
< |
register RAY *r; |
574 |
> |
static void |
575 |
> |
oputN( /* print unperturbed normal */ |
576 |
> |
RAY *r |
577 |
> |
) |
578 |
|
{ |
579 |
|
if (r->rot < FHUGE) { |
580 |
|
(*putreal)(r->ron[0]); |
588 |
|
} |
589 |
|
|
590 |
|
|
591 |
< |
static |
592 |
< |
oputn(r) /* print perturbed normal */ |
593 |
< |
RAY *r; |
591 |
> |
static void |
592 |
> |
oputn( /* print perturbed normal */ |
593 |
> |
RAY *r |
594 |
> |
) |
595 |
|
{ |
596 |
|
FVECT pnorm; |
597 |
|
|
608 |
|
} |
609 |
|
|
610 |
|
|
611 |
< |
static |
612 |
< |
oputs(r) /* print name */ |
613 |
< |
register RAY *r; |
611 |
> |
static void |
612 |
> |
oputs( /* print name */ |
613 |
> |
RAY *r |
614 |
> |
) |
615 |
|
{ |
616 |
|
if (r->ro != NULL) |
617 |
|
fputs(r->ro->oname, stdout); |
621 |
|
} |
622 |
|
|
623 |
|
|
624 |
< |
static |
625 |
< |
oputw(r) /* print weight */ |
626 |
< |
register RAY *r; |
624 |
> |
static void |
625 |
> |
oputw( /* print weight */ |
626 |
> |
RAY *r |
627 |
> |
) |
628 |
|
{ |
629 |
|
(*putreal)(r->rweight); |
630 |
|
} |
631 |
|
|
632 |
|
|
633 |
< |
static |
634 |
< |
oputm(r) /* print modifier */ |
635 |
< |
register RAY *r; |
633 |
> |
static void |
634 |
> |
oputW( /* print contribution */ |
635 |
> |
RAY *r |
636 |
> |
) |
637 |
|
{ |
638 |
+ |
COLOR contr; |
639 |
+ |
|
640 |
+ |
raycontrib(contr, r, PRIMARY); |
641 |
+ |
(*putreal)(colval(contr,RED)); |
642 |
+ |
(*putreal)(colval(contr,GRN)); |
643 |
+ |
(*putreal)(colval(contr,BLU)); |
644 |
+ |
} |
645 |
+ |
|
646 |
+ |
|
647 |
+ |
static void |
648 |
+ |
oputm( /* print modifier */ |
649 |
+ |
RAY *r |
650 |
+ |
) |
651 |
+ |
{ |
652 |
|
if (r->ro != NULL) |
653 |
< |
fputs(objptr(r->ro->omod)->oname, stdout); |
653 |
> |
if (r->ro->omod != OVOID) |
654 |
> |
fputs(objptr(r->ro->omod)->oname, stdout); |
655 |
> |
else |
656 |
> |
fputs(VOIDID, stdout); |
657 |
|
else |
658 |
|
putchar('*'); |
659 |
|
putchar('\t'); |
660 |
|
} |
661 |
|
|
662 |
|
|
663 |
< |
static |
664 |
< |
puta(v) /* print ascii value */ |
665 |
< |
double v; |
663 |
> |
static void |
664 |
> |
oputM( /* print material */ |
665 |
> |
RAY *r |
666 |
> |
) |
667 |
|
{ |
668 |
+ |
OBJREC *mat; |
669 |
+ |
|
670 |
+ |
if (r->ro != NULL) { |
671 |
+ |
if ((mat = findmaterial(r->ro)) != NULL) |
672 |
+ |
fputs(mat->oname, stdout); |
673 |
+ |
else |
674 |
+ |
fputs(VOIDID, stdout); |
675 |
+ |
} else |
676 |
+ |
putchar('*'); |
677 |
+ |
putchar('\t'); |
678 |
+ |
} |
679 |
+ |
|
680 |
+ |
|
681 |
+ |
static void |
682 |
+ |
oputtilde( /* output tilde (spacer) */ |
683 |
+ |
RAY *r |
684 |
+ |
) |
685 |
+ |
{ |
686 |
+ |
fputs("~\t", stdout); |
687 |
+ |
} |
688 |
+ |
|
689 |
+ |
|
690 |
+ |
static void |
691 |
+ |
puta( /* print ascii value */ |
692 |
+ |
double v |
693 |
+ |
) |
694 |
+ |
{ |
695 |
|
printf("%e\t", v); |
696 |
|
} |
697 |
|
|
698 |
|
|
699 |
< |
static |
699 |
> |
static void |
700 |
|
putd(v) /* print binary double */ |
701 |
|
double v; |
702 |
|
{ |
704 |
|
} |
705 |
|
|
706 |
|
|
707 |
< |
static |
707 |
> |
static void |
708 |
|
putf(v) /* print binary float */ |
709 |
|
double v; |
710 |
|
{ |