| 9 |
|
|
| 10 |
|
#include "glare.h" |
| 11 |
|
|
| 12 |
– |
#define FEQ(a,b) ((a)-(b)<=FTINY&&(b)-(a)<=FTINY) |
| 13 |
– |
#define VEQ(v1,v2) (FEQ((v1)[0],(v2)[0])&&FEQ((v1)[1],(v2)[1]) \ |
| 14 |
– |
&&FEQ((v1)[2],(v2)[2])) |
| 15 |
– |
|
| 12 |
|
char *rtargv[64] = {"rtrace", "-h-", "-ov", "-fff", "-ld-", "-i-", "-I-"}; |
| 13 |
|
int rtargc = 7; |
| 14 |
|
|
| 35 |
|
long npixinvw; /* number of pixels in view */ |
| 36 |
|
long npixmiss; /* number of pixels missed */ |
| 37 |
|
|
| 38 |
+ |
static int angcmp(const void *ap1, const void *ap2); |
| 39 |
+ |
static void init(void); |
| 40 |
+ |
static void cleanup(void); |
| 41 |
+ |
static void printsources(void); |
| 42 |
+ |
static void printillum(void); |
| 43 |
|
|
| 44 |
< |
main(argc, argv) |
| 45 |
< |
int argc; |
| 46 |
< |
char *argv[]; |
| 44 |
> |
|
| 45 |
> |
|
| 46 |
> |
int |
| 47 |
> |
main( |
| 48 |
> |
int argc, |
| 49 |
> |
char *argv[] |
| 50 |
> |
) |
| 51 |
|
{ |
| 52 |
|
int combine = 1; |
| 53 |
|
int gotview = 0; |
| 61 |
|
while ((rval = expandarg(&argc, &argv, i)) > 0) |
| 62 |
|
; |
| 63 |
|
if (rval < 0) { |
| 64 |
< |
fprintf(stderr, "%s: cannot expand '%s'", |
| 64 |
> |
fprintf(stderr, "%s: cannot expand '%s'\n", |
| 65 |
|
argv[0], argv[i]); |
| 66 |
|
exit(1); |
| 67 |
|
} |
| 125 |
|
/* FALL THROUGH */ |
| 126 |
|
case 's': |
| 127 |
|
case 'P': |
| 128 |
+ |
case 'n': |
| 129 |
|
rtargv[rtargc++] = argv[i]; |
| 130 |
|
rtargv[rtargc++] = argv[++i]; |
| 131 |
|
break; |
| 132 |
|
case 'w': |
| 133 |
+ |
case 'u': |
| 134 |
+ |
case 'b': |
| 135 |
|
rtargv[rtargc++] = argv[i]; |
| 136 |
|
break; |
| 137 |
|
case 'a': |
| 142 |
|
} |
| 143 |
|
rtargv[rtargc++] = argv[++i]; |
| 144 |
|
break; |
| 145 |
+ |
case 'm': |
| 146 |
+ |
rtargv[rtargc++] = argv[i]; |
| 147 |
+ |
if ((argv[i][2] == 'e') | (argv[i][2] == 'a')) { |
| 148 |
+ |
rtargv[rtargc++] = argv[++i]; |
| 149 |
+ |
rtargv[rtargc++] = argv[++i]; |
| 150 |
+ |
} |
| 151 |
+ |
rtargv[rtargc++] = argv[++i]; |
| 152 |
+ |
break; |
| 153 |
|
default: |
| 154 |
|
goto userr; |
| 155 |
|
} |
| 191 |
|
exit(1); |
| 192 |
|
} |
| 193 |
|
ourview = pictview; |
| 194 |
< |
} else if (picture != NULL && !VEQ(ourview.vp, pictview.vp)) { |
| 194 |
> |
} else if (picture != NULL && !VABSEQ(ourview.vp, pictview.vp)) { |
| 195 |
|
fprintf(stderr, "%s: picture must have same viewpoint\n", |
| 196 |
|
progname); |
| 197 |
|
exit(1); |
| 237 |
|
} |
| 238 |
|
|
| 239 |
|
|
| 240 |
< |
int |
| 241 |
< |
angcmp(ap1, ap2) /* compare two angles */ |
| 242 |
< |
ANGLE *ap1, *ap2; |
| 240 |
> |
static int |
| 241 |
> |
angcmp( /* compare two angles */ |
| 242 |
> |
const void *ap1, |
| 243 |
> |
const void *ap2 |
| 244 |
> |
) |
| 245 |
|
{ |
| 246 |
|
register int a1, a2; |
| 247 |
|
|
| 248 |
< |
a1 = *ap1; |
| 249 |
< |
a2 = *ap2; |
| 248 |
> |
a1 = *(ANGLE *)ap1; |
| 249 |
> |
a2 = *(ANGLE *)ap2; |
| 250 |
|
if (a1 == a2) { |
| 251 |
|
fprintf(stderr, "%s: duplicate glare angle (%d)\n", |
| 252 |
|
progname, a1); |
| 256 |
|
} |
| 257 |
|
|
| 258 |
|
|
| 259 |
< |
init() /* initialize global variables */ |
| 259 |
> |
static void |
| 260 |
> |
init(void) /* initialize global variables */ |
| 261 |
|
{ |
| 262 |
|
double d; |
| 263 |
|
register int i; |
| 333 |
|
} |
| 334 |
|
|
| 335 |
|
|
| 336 |
< |
cleanup() /* close files, wait for children */ |
| 336 |
> |
static void |
| 337 |
> |
cleanup(void) /* close files, wait for children */ |
| 338 |
|
{ |
| 339 |
|
if (verbose) |
| 340 |
|
fprintf(stderr, "%s: cleaning up... \n", progname); |
| 348 |
|
} |
| 349 |
|
|
| 350 |
|
|
| 351 |
< |
compdir(vd, x, y) /* compute direction for x,y */ |
| 352 |
< |
FVECT vd; |
| 353 |
< |
int x, y; |
| 351 |
> |
extern int |
| 352 |
> |
compdir( /* compute direction for x,y */ |
| 353 |
> |
FVECT vd, |
| 354 |
> |
int x, |
| 355 |
> |
int y |
| 356 |
> |
) |
| 357 |
|
{ |
| 358 |
|
int hl; |
| 359 |
|
FVECT org; /* dummy variable */ |
| 381 |
|
} |
| 382 |
|
|
| 383 |
|
|
| 384 |
< |
double |
| 385 |
< |
pixsize(x, y) /* return the solid angle of pixel at (x,y) */ |
| 386 |
< |
int x, y; |
| 384 |
> |
extern double |
| 385 |
> |
pixsize( /* return the solid angle of pixel at (x,y) */ |
| 386 |
> |
int x, |
| 387 |
> |
int y |
| 388 |
> |
) |
| 389 |
|
{ |
| 390 |
|
register int hl, xo; |
| 391 |
|
double disc; |
| 404 |
|
} |
| 405 |
|
|
| 406 |
|
|
| 407 |
< |
memerr(s) /* malloc failure */ |
| 408 |
< |
char *s; |
| 407 |
> |
extern void |
| 408 |
> |
memerr( /* malloc failure */ |
| 409 |
> |
char *s |
| 410 |
> |
) |
| 411 |
|
{ |
| 412 |
|
fprintf(stderr, "%s: out of memory for %s\n", progname, s); |
| 413 |
|
exit(1); |
| 414 |
|
} |
| 415 |
|
|
| 416 |
|
|
| 417 |
< |
printsources() /* print out glare sources */ |
| 417 |
> |
static void |
| 418 |
> |
printsources(void) /* print out glare sources */ |
| 419 |
|
{ |
| 420 |
|
register struct source *sp; |
| 421 |
|
|
| 428 |
|
} |
| 429 |
|
|
| 430 |
|
|
| 431 |
< |
printillum() /* print out indirect illuminances */ |
| 431 |
> |
static void |
| 432 |
> |
printillum(void) /* print out indirect illuminances */ |
| 433 |
|
{ |
| 434 |
|
register int i; |
| 435 |
|
|
