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

Comparing ray/src/rt/srcsupp.c (file contents):
Revision 2.17 by greg, Sat Dec 6 01:08:53 2008 UTC vs.
Revision 2.18 by greg, Mon Oct 25 22:57:45 2010 UTC

# Line 399 | Line 399 | FVECT  dir;
399   {
400          FVECT  cent, c1, c2;
401          double  rad2, d;
402 –        register int  i;
402                                          /* move centers to common plane */
403          d = DOT(sp1->aim, dir);
404 <        for (i = 0; i < 3; i++)
406 <                c1[i] = sp1->aim[i] - d*dir[i];
404 >        VSUM(c1, sp1->aim, dir, -d);
405          d = DOT(sp2->aim, dir);
406 <        for (i = 0; i < 3; i++)
409 <                c2[i] = sp2->aim[i] - d*dir[i];
406 >        VSUM(c2, sp2->aim, dir, -d);
407                                          /* compute overlap */
408          rad2 = intercircle(cent, c1, c2, sp1->siz/PI, sp2->siz/PI);
409          if (rad2 <= FTINY)
# Line 442 | Line 439 | FVECT  pos;
439   {
440          FVECT  onorm;
441          double  offs, d, dist;
445 –        register int  i;
442  
443          offs = getplaneq(onorm, op);
444          d = -DOT(onorm, sp->aim);
# Line 451 | Line 447 | FVECT  pos;
447          dist = (DOT(pos, onorm) - offs)/d;
448          if (dist < 0.)
449                  return(0.);
450 <        for (i = 0; i < 3; i++)
455 <                oc[i] = pos[i] + dist*sp->aim[i];
450 >        VSUM(oc, pos, sp->aim, dist);
451          return(sp->siz*dist*dist/PI/(d*d));
452   }
453  
# Line 466 | Line 461 | FVECT  dir;
461   {
462          FVECT  onorm;
463          double  offs, d, dist;
469 –        register int  i;
464  
465          offs = getplaneq(onorm, op);
466          d = -DOT(onorm, dir);
467          if (d >= -FTINY && d <= FTINY)
468                  return(0.);
469          dist = (DOT(sp->aim, onorm) - offs)/d;
470 <        for (i = 0; i < 3; i++)
477 <                oc[i] = sp->aim[i] + dist*dir[i];
470 >        VSUM(oc, sp->aim, dir, dist);
471          return(sp->siz/PI/(d*d));
472   }
473  
# Line 487 | Line 480 | double  r1s, r2s;              /* radii squared */
480   {
481          double  a2, d2, l;
482          FVECT  disp;
490 –        register int  i;
483  
484 <        for (i = 0; i < 3; i++)
493 <                disp[i] = c2[i] - c1[i];
484 >        VSUB(disp, c2, c1);
485          d2 = DOT(disp,disp);
486                                          /* circle within overlap? */
487          if (r1s < r2s) {
# Line 510 | Line 501 | double  r1s, r2s;              /* radii squared */
501                  return(0.);
502                                          /* overlap, compute center */
503          l = sqrt((r1s - a2)/d2);
504 <        for (i = 0; i < 3; i++)
514 <                cc[i] = c1[i] + l*disp[i];
504 >        VSUM(cc, c1, disp, l);
505          return(a2);
506   }

Diff Legend

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