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

Comparing ray/src/hd/rhdisp3.c (file contents):
Revision 3.10 by gwlarson, Tue Jul 7 11:07:42 1998 UTC vs.
Revision 3.17 by greg, Wed Jan 24 04:39:52 2018 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1998 Silicon Graphics, Inc. */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Holodeck beam support for display process
6   */
7  
8   #include "rholo.h"
9   #include "rhdisp.h"
13 – #include "view.h"
10  
11   struct cellist {
12          GCOORD  *cl;
# Line 30 | Line 26 | int    bi;
26          FVECT   cp[4], ip[4], pf, pb;
27          double  af, ab, sf2, sb2, dfb2, df2, db2, penalty;
28          register int    i;
29 +                                        /* special case */
30 +        if (hr <= 0 | vr <= 0)
31 +                return(0);
32                                          /* compute cell corners in image */
33          if (!hdbcoord(gc, hp, bi))
34                  error(CONSISTENCY, "bad beam index in npixels");
# Line 38 | Line 37 | int    bi;
37                  pf[i] = 0.5*(cp[0][i] + cp[2][i]);
38          sf2 = 0.25*dist2(cp[0], cp[2]); /* compute half diagonal length */
39          for (i = 0; i < 4; i++) {       /* compute visible quad */
40 <                viewloc(ip[i], vp, cp[i]);
42 <                if (ip[i][2] < 0.) {
40 >                if (viewloc(ip[i], vp, cp[i]) <= 0) {
41                          af = 0;
42                          goto getback;
43                  }
# Line 53 | Line 51 | int    bi;
51                  (ip[1][0]-ip[3][0])*(ip[2][1]-ip[3][1]);
52          af *= af >= 0 ? 0.5 : -0.5;
53   getback:
54 <        copystruct(&vrev, vp);          /* compute reverse view */
54 >        vrev = *vp;             /* compute reverse view */
55          for (i = 0; i < 3; i++) {
56                  vrev.vdir[i] = -vp->vdir[i];
57                  vrev.vup[i] = -vp->vup[i];
# Line 65 | Line 63 | getback:
63                  pb[i] = 0.5*(cp[0][i] + cp[2][i]);
64          sb2 = 0.25*dist2(cp[0], cp[2]); /* compute half diagonal length */
65          for (i = 0; i < 4; i++) {       /* compute visible quad */
66 <                viewloc(ip[i], &vrev, cp[i]);
69 <                if (ip[i][2] < 0.) {
66 >                if (viewloc(ip[i], &vrev, cp[i]) <= 0) {
67                          ab = 0;
68                          goto finish;
69                  }
# Line 239 | Line 236 | addcell(gcp, cl)               /* add a cell to a list */
236   GCOORD  *gcp;
237   register struct cellist *cl;
238   {
239 <        copystruct(cl->cl+cl->n, gcp);
239 >        *(cl->cl+cl->n) = *gcp;
240          cl->n++;
241          return(1);
242   }
# Line 281 | Line 278 | VIEW   *vp;
278          if (cl.cl == NULL)
279                  goto memerr;
280          cl.n = 0;                       /* add cells within pyramid */
281 <        visit_cells(org, dir, hp, addcell, &cl);
281 >        visit_cells(org, dir, hp, addcell, (char *)&cl);
282          if (!cl.n) {
283 <                free((char *)cl.cl);
283 >                free((void *)cl.cl);
284                  return(NULL);
285          }
286          *np = cl.n * orient;
# Line 292 | Line 289 | VIEW   *vp;
289           * sorted automatically by visit_cells(), so we don't need this.
290           */
291                                          /* optimize memory use */
292 <        cl.cl = (GCOORD *)realloc((char *)cl.cl, cl.n*sizeof(GCOORD));
292 >        cl.cl = (GCOORD *)realloc((void *)cl.cl, cl.n*sizeof(GCOORD));
293          if (cl.cl == NULL)
294                  goto memerr;
295                                          /* sort the list */
# Line 304 | Line 301 | memerr:
301   }
302  
303  
304 < gridlines(f)                    /* run through holodeck section grid lines */
305 < int     (*f)();
304 > extern void
305 > gridlines(                      /* run through holodeck section grid lines */
306 >        void    (*f)(FVECT wp[2])
307 > )
308   {
309          register int    hd, w, i;
310          int     g0, g1;

Diff Legend

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