46 |
|
|
47 |
|
int do_irrad = 0; /* compute irradiance? */ |
48 |
|
|
49 |
+ |
int rand_samp = 0; /* pure Monte Carlo sampling? */ |
50 |
+ |
|
51 |
|
void (*trace)() = NULL; /* trace call */ |
52 |
|
|
53 |
|
char *tralist[128]; /* list of modifers to trace (or no) */ |
54 |
|
int traincl = -1; /* include == 1, exclude == 0 */ |
55 |
< |
#define MAXTSET 511 /* maximum number in trace set */ |
55 |
> |
#ifndef MAXTSET |
56 |
> |
#define MAXTSET 1024 /* maximum number in trace set */ |
57 |
> |
#endif |
58 |
|
OBJECT traset[MAXTSET+1]={0}; /* trace include/exclude set */ |
59 |
|
|
60 |
|
int hresolu = 0; /* horizontal (scan) size */ |
78 |
|
|
79 |
|
int backvis = 1; /* back face visibility */ |
80 |
|
|
81 |
< |
int maxdepth = 8; /* maximum recursion depth */ |
81 |
> |
int maxdepth = -10; /* maximum recursion depth */ |
82 |
|
double minweight = 2e-3; /* minimum ray weight */ |
83 |
|
|
84 |
|
char *ambfile = NULL; /* ambient file name */ |
101 |
|
|
102 |
|
typedef void oputf_t(RAY *r); |
103 |
|
static oputf_t oputo, oputd, oputv, oputl, oputL, oputc, oputp, |
104 |
< |
oputn, oputN, oputs, oputw, oputW, oputm, oputM; |
104 |
> |
oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputtilde; |
105 |
|
|
106 |
|
static void setoutput(char *vs); |
107 |
|
static void tranotify(OBJECT obj); |
152 |
|
char *fname |
153 |
|
) |
154 |
|
{ |
155 |
< |
long vcount = hresolu>1 ? hresolu*vresolu : vresolu; |
155 |
> |
unsigned long vcount = (hresolu > 1) ? (unsigned long)hresolu*vresolu |
156 |
> |
: vresolu; |
157 |
|
long nextflush = hresolu; |
158 |
|
FILE *fp; |
159 |
|
double d; |
165 |
|
sprintf(errmsg, "cannot open input file \"%s\"", fname); |
166 |
|
error(SYSTEM, errmsg); |
167 |
|
} |
163 |
– |
#ifdef _WIN32 |
168 |
|
if (inform != 'a') |
169 |
|
SET_FILE_BINARY(fp); |
166 |
– |
#endif |
170 |
|
/* set up output */ |
171 |
|
setoutput(outvals); |
172 |
|
switch (outform) { |
192 |
|
d = normalize(direc); |
193 |
|
if (d == 0.0) { /* zero ==> flush */ |
194 |
|
bogusray(); |
195 |
< |
if (--nextflush <= 0 || vcount <= 0) { |
195 |
> |
if (--nextflush <= 0 || !vcount) { |
196 |
|
fflush(stdout); |
197 |
|
nextflush = hresolu; |
198 |
|
} |
199 |
|
} else { |
200 |
< |
samplendx++; |
200 |
> |
samplendx = rand_samp ? random() : samplendx+1; |
201 |
|
/* compute and print */ |
202 |
|
if (imm_irrad) |
203 |
|
irrad(orig, direc); |
204 |
|
else |
205 |
|
rad(orig, direc, lim_dist ? d : 0.0); |
206 |
|
/* flush if time */ |
207 |
< |
if (--nextflush == 0) { |
207 |
> |
if (!--nextflush) { |
208 |
|
fflush(stdout); |
209 |
|
nextflush = hresolu; |
210 |
|
} |
211 |
|
} |
212 |
|
if (ferror(stdout)) |
213 |
|
error(SYSTEM, "write error"); |
214 |
< |
if (--vcount == 0) /* check for end */ |
214 |
> |
if (vcount && !--vcount) /* check for end */ |
215 |
|
break; |
216 |
|
} |
217 |
|
fflush(stdout); |
218 |
< |
if (vcount > 0) |
219 |
< |
error(USER, "read error"); |
218 |
> |
if (vcount) |
219 |
> |
error(USER, "unexpected EOF on input"); |
220 |
|
if (fname != NULL) |
221 |
|
fclose(fp); |
222 |
|
} |
243 |
|
while (*vs) |
244 |
|
switch (*vs++) { |
245 |
|
case 'T': /* trace sources */ |
246 |
+ |
if (!*vs) break; |
247 |
|
trace_sources(); |
248 |
|
/* fall through */ |
249 |
|
case 't': /* trace */ |
250 |
+ |
if (!*vs) break; |
251 |
|
*table = NULL; |
252 |
|
table = every_out; |
253 |
|
trace = ourtrace; |
293 |
|
*table++ = oputW; |
294 |
|
if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0)) |
295 |
|
error(WARNING, |
296 |
< |
"-otW accuracy requires -aa 0 -as 0"); |
296 |
> |
"-otW accuracy depends on -aa 0 -as 0"); |
297 |
|
break; |
298 |
|
case 'm': /* modifier */ |
299 |
|
*table++ = oputm; |
301 |
|
case 'M': /* material */ |
302 |
|
*table++ = oputM; |
303 |
|
break; |
304 |
+ |
case '~': /* tilde */ |
305 |
+ |
*table++ = oputtilde; |
306 |
+ |
break; |
307 |
|
} |
308 |
|
*table = NULL; |
309 |
|
} |
471 |
|
tabin(r); |
472 |
|
for (tp = every_out; *tp != NULL; tp++) |
473 |
|
(**tp)(r); |
474 |
< |
putchar('\n'); |
474 |
> |
if (outform == 'a') |
475 |
> |
putchar('\n'); |
476 |
|
} |
477 |
|
|
478 |
|
|
515 |
|
RAY *r |
516 |
|
) |
517 |
|
{ |
509 |
– |
COLR cout; |
510 |
– |
|
518 |
|
if (outform == 'c') { |
519 |
+ |
COLR cout; |
520 |
|
setcolr(cout, colval(r->rcol,RED), |
521 |
|
colval(r->rcol,GRN), |
522 |
|
colval(r->rcol,BLU)); |
638 |
|
RAY *r |
639 |
|
) |
640 |
|
{ |
641 |
< |
COLOR contr; |
634 |
< |
COLR cout; |
641 |
> |
double contr[3]; |
642 |
|
|
643 |
|
raycontrib(contr, r, PRIMARY); |
644 |
< |
if (outform == 'c') { |
645 |
< |
setcolr(cout, colval(contr,RED), |
646 |
< |
colval(contr,GRN), |
640 |
< |
colval(contr,BLU)); |
641 |
< |
fwrite((char *)cout, sizeof(cout), 1, stdout); |
642 |
< |
return; |
643 |
< |
} |
644 |
< |
(*putreal)(colval(contr,RED)); |
645 |
< |
(*putreal)(colval(contr,GRN)); |
646 |
< |
(*putreal)(colval(contr,BLU)); |
644 |
> |
(*putreal)(contr[RED]); |
645 |
> |
(*putreal)(contr[GRN]); |
646 |
> |
(*putreal)(contr[BLU]); |
647 |
|
} |
648 |
|
|
649 |
|
|
678 |
|
} else |
679 |
|
putchar('*'); |
680 |
|
putchar('\t'); |
681 |
+ |
} |
682 |
+ |
|
683 |
+ |
|
684 |
+ |
static void |
685 |
+ |
oputtilde( /* output tilde (spacer) */ |
686 |
+ |
RAY *r |
687 |
+ |
) |
688 |
+ |
{ |
689 |
+ |
fputs("~\t", stdout); |
690 |
|
} |
691 |
|
|
692 |
|
|