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 |
|
|
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", |
105 |
|
combine = !combine; |
106 |
|
break; |
107 |
|
case 'd': |
108 |
+ |
if (argv[i][2] == 'v') { |
109 |
+ |
rtargv[rtargc++] = argv[i]; |
110 |
+ |
break; |
111 |
+ |
} |
112 |
+ |
/* FALL THROUGH */ |
113 |
|
case 'l': |
114 |
+ |
case 's': |
115 |
|
rtargv[rtargc++] = argv[i]; |
116 |
|
rtargv[rtargc++] = argv[++i]; |
117 |
|
break; |
118 |
+ |
case 'w': |
119 |
+ |
rtargv[rtargc++] = argv[i]; |
120 |
+ |
break; |
121 |
|
case 'a': |
122 |
|
rtargv[rtargc++] = argv[i]; |
123 |
|
if (argv[i][2] == 'v') { |
139 |
|
} |
140 |
|
/* get view */ |
141 |
|
if (picture != NULL) { |
142 |
< |
rval = viewfile(picture, &pictview, 0, 0); |
142 |
> |
rval = viewfile(picture, &pictview, NULL); |
143 |
|
if (rval < 0) { |
144 |
|
fprintf(stderr, "%s: cannot open picture file \"%s\"\n", |
145 |
|
progname, picture); |
314 |
|
if (octree != NULL) |
315 |
|
done_rtrace(); |
316 |
|
if (npixinvw < 100*npixmiss) |
317 |
< |
fprintf(stderr, "%s: warning -- missing %ld%% of samples\n", |
318 |
< |
progname, 100L*npixmiss/npixinvw); |
317 |
> |
fprintf(stderr, "%s: warning -- missing %d%% of samples\n", |
318 |
> |
progname, (int)(100L*npixmiss/npixinvw)); |
319 |
|
} |
320 |
|
|
321 |
|
|