ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/hd/rhd_x11.c
(Generate patch)

Comparing ray/src/hd/rhd_x11.c (file contents):
Revision 3.27 by gwlarson, Wed Aug 19 17:43:08 1998 UTC vs.
Revision 3.28 by gwlarson, Thu Aug 27 19:32:27 1998 UTC

# Line 464 | Line 464 | ilclip(dp, wp)                 /* clip world coordinates to device *
464   int     dp[2][2];
465   FVECT   wp[2];
466   {
467 <        static FVECT    vmin = {0.,0.,0.}, vmax = {1.,1.,FHUGE};
468 <        FVECT   ip[2];
469 <                                /* not exactly right, but who cares? */
470 <        viewloc(ip[0], &odev.v, wp[0]);
471 <        viewloc(ip[1], &odev.v, wp[1]);
467 >        static FVECT    vmin = {0.,0.,0.}, vmax = {1.-FTINY,1.-FTINY,FHUGE};
468 >        FVECT   wpc[2], ip[2];
469 >        double  d, d0, d1;
470 >                                /* check for points behind view */
471 >        d = DOT(odev.v.vp, odev.v.vdir);
472 >        d0 = DOT(wp[0], odev.v.vdir) - d;
473 >        d1 = DOT(wp[1], odev.v.vdir) - d;
474 >                                /* work on copy of world points */
475 >        if (d0 <= d1) {
476 >                VCOPY(wpc[0], wp[0]); VCOPY(wpc[1], wp[1]);
477 >        } else {
478 >                d = d0; d0 = d1; d1 = d;
479 >                VCOPY(wpc[1], wp[0]); VCOPY(wpc[0], wp[1]);
480 >        }
481 >        if (d0 <= FTINY) {
482 >                if (d1 <= FTINY) return(0);
483 >                VSUB(wpc[0], wpc[0], wpc[1]);
484 >                d = .99*d1/(d1-d0);
485 >                VSUM(wpc[0], wpc[1], wpc[0], d);
486 >        }
487 >                                /* get view coordinates and clip to window */
488 >        viewloc(ip[0], &odev.v, wpc[0]);
489 >        viewloc(ip[1], &odev.v, wpc[1]);
490          if (!clip(ip[0], ip[1], vmin, vmax))
491                  return(0);
492          dp[0][0] = ip[0][0]*odev.hres;
# Line 499 | Line 517 | draw_grids()                   /* draw holodeck section grids */
517          static BYTE     gridrgb[3] = {0x0, 0xff, 0xff};
518          unsigned long  pixel;
519  
502        if (!mapped)
503                return;
520          if (ncolors > 0)
521                  pixel = pixval[get_pixel(gridrgb, xnewcolr)];
522          else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines