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

Comparing ray/src/common/mesh.c (file contents):
Revision 2.17 by greg, Thu Feb 12 18:55:50 2004 UTC vs.
Revision 2.19 by schorsch, Sun Mar 28 20:33:12 2004 UTC

# Line 30 | Line 30 | typedef struct {
30  
31   static MESH     *mlist = NULL;          /* list of loaded meshes */
32  
33 + static lut_keycmpf_t cvcmp;
34 + static lut_hashf_t cvhash;
35  
36 +
37   static unsigned long
38 < cvhash(cvp)                             /* hash an encoded vertex */
39 < MCVERT  *cvp;
38 > cvhash(p)                               /* hash an encoded vertex */
39 > //MCVERT        *cvp;
40 > void    *p;
41   {
42 +        MCVERT  *cvp = p;
43          unsigned long   hval;
44          
45          if (!(cvp->fl & MT_V))
# Line 49 | Line 54 | MCVERT *cvp;
54  
55  
56   static int
57 < cvcmp(v1, v2)                           /* compare encoded vertices */
58 < register MCVERT *v1, *v2;
57 > cvcmp(vv1, vv2)                         /* compare encoded vertices */
58 > //register MCVERT       *v1, *v2;
59 > const void      *vv1, *vv2;
60   {
61 +        const MCVERT    *v1 = vv1, *v2 = vv2;
62          if (v1->fl != v2->fl)
63                  return(1);
64          if (v1->xyz[0] != v2->xyz[0])
# Line 546 | Line 553 | register MESH  *mp;
553                                  if (nouvbounds && pp->uv != NULL)
554                                          return("unreferenced uv coordinates");
555                          }
549                        if (pp->ntris + pp->nj1tris + pp->nj2tris <= 0)
550                                error(WARNING, "no triangles in patch");
556                          if (pp->ntris > 0 && pp->tri == NULL)
557                                  return("missing patch triangle list");
558                          if (pp->nj1tris > 0 && pp->j1tri == NULL)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines