12 |
|
|
13 |
|
#include "glare.h" |
14 |
|
|
15 |
< |
#define FEQ(a,b) ((a)-(b)<=FTINY&&(a)-(b)<=FTINY) |
15 |
> |
#define FEQ(a,b) ((a)-(b)<=FTINY&&(b)-(a)<=FTINY) |
16 |
|
#define VEQ(v1,v2) (FEQ((v1)[0],(v2)[0])&&FEQ((v1)[1],(v2)[1]) \ |
17 |
|
&&FEQ((v1)[2],(v2)[2])) |
18 |
|
|
19 |
< |
char *rtargv[32] = {"rtrace", "-h", "-ov", "-fff"}; |
19 |
> |
char *rtargv[32] = {"rtrace", "-h-", "-ov", "-fff"}; |
20 |
|
int rtargc = 4; |
21 |
|
|
22 |
|
VIEW ourview = STDVIEW; /* our view */ |
55 |
|
progname = argv[0]; |
56 |
|
/* process options */ |
57 |
|
for (i = 1; i < argc && argv[i][0] == '-'; i++) { |
58 |
+ |
/* expand arguments */ |
59 |
+ |
while (rval = expandarg(&argc, &argv, i)) |
60 |
+ |
if (rval < 0) { |
61 |
+ |
fprintf(stderr, "%s: cannot expand '%s'", |
62 |
+ |
argv[0], argv[i]); |
63 |
+ |
exit(1); |
64 |
+ |
} |
65 |
|
rval = getviewopt(&ourview, argc-i, argv+i); |
66 |
|
if (rval >= 0) { |
67 |
|
i += rval; |
82 |
|
} |
83 |
|
if (argv[i][2] != 'f') |
84 |
|
goto userr; |
85 |
< |
rval = viewfile(argv[++i], &ourview, 0, 0); |
85 |
> |
rval = viewfile(argv[++i], &ourview, NULL); |
86 |
|
if (rval < 0) { |
87 |
|
fprintf(stderr, |
88 |
|
"%s: cannot open view file \"%s\"\n", |
112 |
|
combine = !combine; |
113 |
|
break; |
114 |
|
case 'd': |
115 |
+ |
if (argv[i][2] == 'v') { |
116 |
+ |
rtargv[rtargc++] = argv[i]; |
117 |
+ |
break; |
118 |
+ |
} |
119 |
+ |
/* FALL THROUGH */ |
120 |
|
case 'l': |
121 |
+ |
case 's': |
122 |
+ |
case 'P': |
123 |
|
rtargv[rtargc++] = argv[i]; |
124 |
|
rtargv[rtargc++] = argv[++i]; |
125 |
|
break; |
126 |
+ |
case 'w': |
127 |
+ |
rtargv[rtargc++] = argv[i]; |
128 |
+ |
break; |
129 |
|
case 'a': |
130 |
|
rtargv[rtargc++] = argv[i]; |
131 |
|
if (argv[i][2] == 'v') { |
147 |
|
} |
148 |
|
/* get view */ |
149 |
|
if (picture != NULL) { |
150 |
< |
rval = viewfile(picture, &pictview, 0, 0); |
150 |
> |
rval = viewfile(picture, &pictview, NULL); |
151 |
|
if (rval < 0) { |
152 |
|
fprintf(stderr, "%s: cannot open picture file \"%s\"\n", |
153 |
|
progname, picture); |
203 |
|
absorb_specks(); /* eliminate tiny sources */ |
204 |
|
cleanup(); /* tidy up */ |
205 |
|
/* print header */ |
206 |
+ |
newheader("RADIANCE", stdout); |
207 |
|
printargs(argc, argv, stdout); |
208 |
|
fputs(VIEWSTR, stdout); |
209 |
|
fprintview(&ourview, stdout); |
323 |
|
if (octree != NULL) |
324 |
|
done_rtrace(); |
325 |
|
if (npixinvw < 100*npixmiss) |
326 |
< |
fprintf(stderr, "%s: warning -- missing %ld%% of samples\n", |
327 |
< |
progname, 100L*npixmiss/npixinvw); |
326 |
> |
fprintf(stderr, "%s: warning -- missing %d%% of samples\n", |
327 |
> |
progname, (int)(100L*npixmiss/npixinvw)); |
328 |
|
} |
329 |
|
|
330 |
|
|
372 |
|
xo = x-hl; |
373 |
|
else |
374 |
|
xo = 0; |
375 |
< |
disc = 1. - (double)(xo*xo + y*y)/(sampdens*sampdens); |
376 |
< |
if (disc <= FTINY) |
375 |
> |
disc = 1. - (double)((long)xo*xo + (long)y*y)/((long)sampdens*sampdens); |
376 |
> |
if (disc <= FTINY*FTINY) |
377 |
|
return(0.); |
378 |
|
return(1./(sampdens*sampdens*sqrt(disc))); |
379 |
|
} |