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.42 by greg, Thu Dec 22 17:28:06 2016 UTC vs.
Revision 2.44 by greg, Thu Apr 13 22:47:17 2017 UTC

# Line 138 | Line 138 | oconv_command(int ac, char *av[])
138          
139          if (ac-- <= 0)
140                  return(NULL);
141 +        if (verbose < 0) {      /* turn off warnings */
142 +                strcpy(cp, "-w- ");
143 +                cp += 4;
144 +        }
145          while (ac-- > 0) {
146                  strcpy(cp, *av++);
147                  while (*cp) cp++;
# Line 379 | 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 867 | Line 871 | prepare_sampler(void)
871                  curparams.udir[1] *= -1.;
872                  curparams.udir[2] *= -1.;
873          }
874 <        if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1')
874 >        if ((tolower(curparams.hemis[0]) == 'u') | (curparams.hemis[0] == '1'))
875                  curparams.sample_basis = sample_uniform;
876          else if (tolower(curparams.hemis[0]) == 's' &&
877                                  tolower(curparams.hemis[1]) == 'c')

Diff Legend

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