--- ray/src/util/findglare.c 1991/03/19 17:21:34 1.8 +++ ray/src/util/findglare.c 1991/03/21 17:11:46 1.11 @@ -204,7 +204,7 @@ init() /* initialize global variables */ /* set direction vectors */ for (i = 0; glarang[i] != AEND; i++) ; - if (i > 0 && glarang[0] <= 0 || glarang[i-1] >= 180) { + if (i > 0 && (glarang[0] <= 0 || glarang[i-1] >= 180)) { fprintf(stderr, "%s: glare angles must be between 1 and 179\n", progname); exit(1); @@ -231,22 +231,22 @@ init() /* initialize global variables */ setview(&rightview); indirect[nglarangs].lcos = indirect[nglarangs].rcos = cos(maxtheta); - indirect[nglarangs].lsin = - -(indirect[nglarangs].rsin = sin(maxtheta)); + indirect[nglarangs].rsin = + -(indirect[nglarangs].lsin = sin(maxtheta)); indirect[nglarangs].theta = 0.0; for (i = 0; i < nglarangs; i++) { d = (glarang[nglarangs-1] - glarang[i])*(PI/180.); indirect[nglarangs-i-1].lcos = indirect[nglarangs+i+1].rcos = cos(d); - indirect[nglarangs-i-1].lsin = - -(indirect[nglarangs+i+1].rsin = sin(d)); + indirect[nglarangs+i+1].rsin = + -(indirect[nglarangs-i-1].lsin = sin(d)); d = (glarang[nglarangs-1] + glarang[i])*(PI/180.); indirect[nglarangs-i-1].rcos = indirect[nglarangs+i+1].lcos = cos(d); - indirect[nglarangs+i+1].lsin = - -(indirect[nglarangs-i-1].rsin = sin(d)); - indirect[nglarangs-i-1].theta = -(PI/180.)*glarang[i]; - indirect[nglarangs+i+1].theta = (PI/180.)*glarang[i]; + indirect[nglarangs-i-1].rsin = + -(indirect[nglarangs+i+1].lsin = sin(d)); + indirect[nglarangs-i-1].theta = (PI/180.)*glarang[i]; + indirect[nglarangs+i+1].theta = -(PI/180.)*glarang[i]; } /* open picture */ if (picture != NULL) { @@ -329,6 +329,6 @@ printillum() /* print out indirect illuminances */ printf("BEGIN indirect illuminance\n"); for (i = 0; i < nglardirs; i++) printf("\t%.0f\t%f\n", (180.0/PI)*indirect[i].theta, - PI * indirect[i].sum / (double)indirect[i].n); + PI * indirect[i].sum / indirect[i].n); printf("END indirect illuminance\n"); }