ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/ambcomp.c
(Generate patch)

Comparing ray/src/rt/ambcomp.c (file contents):
Revision 2.64 by greg, Tue Aug 19 15:04:40 2014 UTC vs.
Revision 2.69 by greg, Thu Dec 4 05:26:28 2014 UTC

# Line 180 | Line 180 | ambsupersamp(AMBHEMI *hp, int cnt)
180          float   *earr = getambdiffs(hp);
181          double  e2rem = 0;
182          AMBSAMP *ap;
183 –        RAY     ar;
183          float   *ep;
184          int     i, j, n, nss;
185  
# Line 236 | Line 235 | samp_hemi(                             /* sample indirect hemisphere */
235          d = 1.0/(n*n);
236          scalecolor(hp->acoef, d);
237                                          /* make tangent plane axes */
238 <        hp->uy[0] = 0.5 - frandom();
240 <        hp->uy[1] = 0.5 - frandom();
241 <        hp->uy[2] = 0.5 - frandom();
242 <        for (i = 3; i--; )
243 <                if ((-0.6 < r->ron[i]) & (r->ron[i] < 0.6))
244 <                        break;
245 <        if (i < 0)
238 >        if (!getperpendicular(hp->ux, r->ron))
239                  error(CONSISTENCY, "bad ray direction in samp_hemi");
247 –        hp->uy[i] = 1.0;
248 –        VCROSS(hp->ux, hp->uy, r->ron);
249 –        normalize(hp->ux);
240          VCROSS(hp->uy, r->ron, hp->ux);
241                                          /* sample divisions */
242          for (i = hp->ns; i--; )
# Line 610 | Line 600 | static uint32
600   ambcorral(AMBHEMI *hp, FVECT uv[2], const double r0, const double r1)
601   {
602          const double    max_d = 1.0/(minarad*ambacc + 0.001);
603 <        const double    ang_res = 0.5*PI/(hp->ns-1);
604 <        const double    ang_step = ang_res/((int)(16/PI*ang_res) + (1+FTINY));
603 >        const double    ang_res = 0.5*PI/hp->ns;
604 >        const double    ang_step = ang_res/((int)(16/PI*ang_res) + 1.01);
605          double          avg_d = 0;
606          uint32          flgs = 0;
607          FVECT           vec;
# Line 642 | Line 632 | ambcorral(AMBHEMI *hp, FVECT uv[2], const double r0, c
632                  if ((r0*r0*u*u + r1*r1*v*v) * ap->d*ap->d <= u*u + v*v)
633                          continue;       /* occluder outside ellipse */
634                  ang = atan2a(v, u);     /* else set direction flags */
635 <                for (a1 = ang-.5*ang_res; a1 <= ang+.5*ang_res; a1 += ang_step)
635 >                for (a1 = ang-ang_res; a1 <= ang+ang_res; a1 += ang_step)
636                          flgs |= 1L<<(int)(16/PI*(a1 + 2.*PI*(a1 < 0)));
637              }
638                                          /* add low-angle incident (< 20deg) */
# Line 695 | Line 685 | doambient(                             /* compute ambient component */
685                  return(0);
686  
687          if ((ra == NULL) & (pg == NULL) & (dg == NULL) ||
688 <                        (hp->sampOK < 0) | (hp->ns < 4)) {
688 >                        (hp->sampOK < 0) | (hp->ns < 6)) {
689                  free(hp);               /* Hessian not requested/possible */
690                  return(-1);             /* value-only return value */
691          }

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)