740 |
|
{ |
741 |
|
int n = sampcnt; |
742 |
|
double samp3[3]; |
743 |
< |
double duvw[3]; |
744 |
< |
FVECT orig_dir[2]; |
743 |
> |
FVECT duvw, orig_dir[2]; |
744 |
|
int i; |
745 |
|
|
746 |
|
if (fp == NULL) /* just requesting number of bins? */ |
748 |
|
|
749 |
|
while (n--) { /* stratified hemisphere sampling */ |
750 |
|
SDmultiSamp(samp3, 3, (n+frandom())/sampcnt); |
751 |
< |
SDsquare2disk(duvw, samp3[1], samp3[2]); |
751 |
> |
square2disk(duvw, samp3[1], samp3[2]); |
752 |
|
duvw[2] = -sqrt(1. - duvw[0]*duvw[0] - duvw[1]*duvw[1]); |
753 |
|
for (i = 3; i--; ) |
754 |
|
orig_dir[1][i] = duvw[0]*p->udir[i] + |
768 |
|
{ |
769 |
|
int n = sampcnt; |
770 |
|
double samp3[3]; |
771 |
< |
double duvw[3]; |
773 |
< |
FVECT orig_dir[2]; |
771 |
> |
FVECT duvw, orig_dir[2]; |
772 |
|
int i; |
773 |
|
|
774 |
|
if (fp == NULL) /* just requesting number of bins? */ |
776 |
|
|
777 |
|
while (n--) { /* stratified sampling */ |
778 |
|
SDmultiSamp(samp3, 3, (n+frandom())/sampcnt); |
779 |
< |
SDsquare2disk(duvw, (b/p->hsiz + samp3[1])/curparams.hsiz, |
779 |
> |
square2disk(duvw, (b/p->hsiz + samp3[1])/curparams.hsiz, |
780 |
|
(b%p->hsiz + samp3[2])/curparams.hsiz); |
781 |
|
duvw[2] = sqrt(1. - duvw[0]*duvw[0] - duvw[1]*duvw[1]); |
782 |
|
for (i = 3; i--; ) |
1306 |
|
case 'n': /* options with 1 argument */ |
1307 |
|
case 's': |
1308 |
|
case 'o': |
1309 |
+ |
case 't': |
1310 |
|
na = 2; |
1311 |
|
break; |
1312 |
|
case 'b': /* special case */ |