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.53 by greg, Wed Sep 9 21:28:19 2020 UTC vs.
Revision 2.54 by greg, Wed Dec 15 01:38:50 2021 UTC

# Line 740 | Line 740 | sample_uniform(PARAMS *p, int b, FILE *fp)
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? */
# Line 749 | Line 748 | sample_uniform(PARAMS *p, int b, FILE *fp)
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] +
# Line 769 | Line 768 | sample_shirchiu(PARAMS *p, int b, FILE *fp)
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? */
# Line 778 | Line 776 | sample_shirchiu(PARAMS *p, int b, FILE *fp)
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--; )

Diff Legend

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