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 */ |
75 |
|
} |
76 |
|
if (argv[i][2] != 'f') |
77 |
|
goto userr; |
78 |
< |
rval = viewfile(argv[++i], &ourview, 0, 0); |
78 |
> |
rval = viewfile(argv[++i], &ourview, NULL); |
79 |
|
if (rval < 0) { |
80 |
|
fprintf(stderr, |
81 |
|
"%s: cannot open view file \"%s\"\n", |
106 |
|
break; |
107 |
|
case 'd': |
108 |
|
case 'l': |
109 |
+ |
case 's': |
110 |
|
rtargv[rtargc++] = argv[i]; |
111 |
|
rtargv[rtargc++] = argv[++i]; |
112 |
|
break; |
131 |
|
} |
132 |
|
/* get view */ |
133 |
|
if (picture != NULL) { |
134 |
< |
rval = viewfile(picture, &pictview, 0, 0); |
134 |
> |
rval = viewfile(picture, &pictview, NULL); |
135 |
|
if (rval < 0) { |
136 |
|
fprintf(stderr, "%s: cannot open picture file \"%s\"\n", |
137 |
|
progname, picture); |
204 |
|
} |
205 |
|
|
206 |
|
|
207 |
+ |
int |
208 |
+ |
angcmp(ap1, ap2) /* compare two angles */ |
209 |
+ |
ANGLE *ap1, *ap2; |
210 |
+ |
{ |
211 |
+ |
register int a1, a2; |
212 |
+ |
|
213 |
+ |
a1 = *ap1; |
214 |
+ |
a2 = *ap2; |
215 |
+ |
if (a1 == a2) { |
216 |
+ |
fprintf(stderr, "%s: duplicate glare angle (%d)\n", |
217 |
+ |
progname, a1); |
218 |
+ |
exit(1); |
219 |
+ |
} |
220 |
+ |
return(a1-a2); |
221 |
+ |
} |
222 |
+ |
|
223 |
+ |
|
224 |
|
init() /* initialize global variables */ |
225 |
|
{ |
226 |
|
double d; |
232 |
|
/* set direction vectors */ |
233 |
|
for (i = 0; glarang[i] != AEND; i++) |
234 |
|
; |
235 |
< |
if (i > 0 && (glarang[0] <= 0 || glarang[i-1] >= 180)) { |
236 |
< |
fprintf(stderr, "%s: glare angles must be between 1 and 179\n", |
235 |
> |
qsort(glarang, i, sizeof(ANGLE), angcmp); |
236 |
> |
if (i > 0 && (glarang[0] <= 0 || glarang[i-1] > 180)) { |
237 |
> |
fprintf(stderr, "%s: glare angles must be between 1 and 180\n", |
238 |
|
progname); |
239 |
|
exit(1); |
240 |
|
} |
306 |
|
if (octree != NULL) |
307 |
|
done_rtrace(); |
308 |
|
if (npixinvw < 100*npixmiss) |
309 |
< |
fprintf(stderr, "%s: warning -- missing %ld%% of samples\n", |
310 |
< |
progname, 100L*npixmiss/npixinvw); |
309 |
> |
fprintf(stderr, "%s: warning -- missing %d%% of samples\n", |
310 |
> |
progname, (int)(100L*npixmiss/npixinvw)); |
311 |
|
} |
312 |
|
|
313 |
|
|
319 |
|
FVECT org; /* dummy variable */ |
320 |
|
|
321 |
|
hl = hlim(y); |
322 |
< |
if (x <= -hl) /* left region */ |
322 |
> |
if (x <= -hl) { /* left region */ |
323 |
> |
if (x <= -hl-sampdens) |
324 |
> |
return(-1); |
325 |
|
return(viewray(org, vd, &leftview, |
326 |
|
(double)(x+hl)/(2*sampdens)+.5, |
327 |
|
(double)y/(2*sampdens)+.5)); |
328 |
< |
if (x >= hl) /* right region */ |
328 |
> |
} |
329 |
> |
if (x >= hl) { /* right region */ |
330 |
> |
if (x >= hl+sampdens) |
331 |
> |
return(-1); |
332 |
|
return(viewray(org, vd, &rightview, |
333 |
|
(double)(x-hl)/(2*sampdens)+.5, |
334 |
|
(double)y/(2*sampdens)+.5)); |
335 |
+ |
} |
336 |
|
/* central region */ |
337 |
|
if (viewray(org, vd, &ourview, .5, (double)y/(2*sampdens)+.5) < 0) |
338 |
|
return(-1); |