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.46 by greg, Mon Oct 1 15:51:48 2018 UTC

# Line 18 | Line 18 | static const char RCSid[] = "$Id$";
18   #include "triangulate.h"
19   #include "platform.h"
20  
21 < #define MAXRCARG        512
21 > #ifndef MAXRCARG
22 > #define MAXRCARG        10000
23 > #endif
24  
25   char            *progname;              /* global argv[0] */
26  
# Line 383 | Line 385 | finish_receiver(void)
385                          curparams.vup[1] = 1;
386          }
387                                          /* determine sample type/bin */
388 <        if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1') {
388 >        if ((tolower(curparams.hemis[0]) == 'u') | (curparams.hemis[0] == '1')) {
389                  sprintf(sbuf, "if(-Dx*%g-Dy*%g-Dz*%g,0,-1)",
390                          curparams.nrm[0], curparams.nrm[1], curparams.nrm[2]);
391                  binv = savqstr(sbuf);
# Line 760 | Line 762 | sample_reinhart(PARAMS *p, int b, FILE *fp)
762          }
763          while (n--) {                   /* stratified sampling */
764                  SDmultiSamp(samp3, 3, (n+frandom())/sampcnt);
765 +                if (row >= RowMax-1)    /* avoid crowding at zenith */
766 +                        samp3[1] *= samp3[1];
767                  alt = (row+samp3[1])*RAH;
768                  azi = (2.*PI)*(col+samp3[2]-.5)/rnaz(row);
769                  duvw[2] = cos(alt);     /* measured from horizon */
770                  duvw[0] = tsin(azi)*duvw[2];
771 <                duvw[1] = tcos(azi)*duvw[2];
771 >                duvw[1] = -tcos(azi)*duvw[2];
772                  duvw[2] = sqrt(1. - duvw[2]*duvw[2]);
773                  for (i = 3; i--; )
774                          orig_dir[1][i] = -duvw[0]*p->udir[i] -
# Line 871 | Line 875 | prepare_sampler(void)
875                  curparams.udir[1] *= -1.;
876                  curparams.udir[2] *= -1.;
877          }
878 <        if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1')
878 >        if ((tolower(curparams.hemis[0]) == 'u') | (curparams.hemis[0] == '1'))
879                  curparams.sample_basis = sample_uniform;
880          else if (tolower(curparams.hemis[0]) == 's' &&
881                                  tolower(curparams.hemis[1]) == 'c')

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines