ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/rfluxmtx.c
(Generate patch)

Comparing ray/src/util/rfluxmtx.c (file contents):
Revision 2.43 by greg, Tue Feb 7 19:53:59 2017 UTC vs.
Revision 2.45 by greg, Sat May 13 01:50:54 2017 UTC

# Line 383 | Line 383 | finish_receiver(void)
383                          curparams.vup[1] = 1;
384          }
385                                          /* determine sample type/bin */
386 <        if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1') {
386 >        if ((tolower(curparams.hemis[0]) == 'u') | (curparams.hemis[0] == '1')) {
387                  sprintf(sbuf, "if(-Dx*%g-Dy*%g-Dz*%g,0,-1)",
388                          curparams.nrm[0], curparams.nrm[1], curparams.nrm[2]);
389                  binv = savqstr(sbuf);
# Line 760 | Line 760 | sample_reinhart(PARAMS *p, int b, FILE *fp)
760          }
761          while (n--) {                   /* stratified sampling */
762                  SDmultiSamp(samp3, 3, (n+frandom())/sampcnt);
763 +                if (row >= RowMax-1)    /* avoid crowding at zenith */
764 +                        samp3[1] *= samp3[1];
765                  alt = (row+samp3[1])*RAH;
766                  azi = (2.*PI)*(col+samp3[2]-.5)/rnaz(row);
767                  duvw[2] = cos(alt);     /* measured from horizon */
768                  duvw[0] = tsin(azi)*duvw[2];
769 <                duvw[1] = tcos(azi)*duvw[2];
769 >                duvw[1] = -tcos(azi)*duvw[2];
770                  duvw[2] = sqrt(1. - duvw[2]*duvw[2]);
771                  for (i = 3; i--; )
772                          orig_dir[1][i] = -duvw[0]*p->udir[i] -
# Line 871 | Line 873 | prepare_sampler(void)
873                  curparams.udir[1] *= -1.;
874                  curparams.udir[2] *= -1.;
875          }
876 <        if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1')
876 >        if ((tolower(curparams.hemis[0]) == 'u') | (curparams.hemis[0] == '1'))
877                  curparams.sample_basis = sample_uniform;
878          else if (tolower(curparams.hemis[0]) == 's' &&
879                                  tolower(curparams.hemis[1]) == 'c')

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines