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

Comparing ray/src/common/readmesh.c (file contents):
Revision 2.7 by greg, Wed Jul 16 01:32:53 2003 UTC vs.
Revision 2.10 by greg, Wed Oct 22 02:06:34 2003 UTC

# Line 7 | Line 7 | static const char RCSid[] = "$Id$";
7  
8   #include  <time.h>
9  
10 – #include  "standard.h"
10   #include  "platform.h"
11 + #include  "standard.h"
12   #include  "octree.h"
13   #include  "object.h"
14   #include  "mesh.h"
# Line 92 | Line 92 | gettree()                              /* get a pre-ordered octree */
92                  default:
93                          mesherror(USER, "damaged mesh octree");
94          }
95 <        return NULL; /* pro forma return */
95 >        return (OCTREE)NULL; /* pro forma return */
96   }
97  
98  
# Line 145 | Line 145 | register MESHPATCH     *pp;
145          } else
146                  pp->norm = NULL;
147          if (flags & MT_UV) {
148 <                pp->uv = (uint32 (*)[2])calloc(pp->nverts, 2*sizeof(uint32));
148 >                pp->uv = (uint16 (*)[2])calloc(pp->nverts, 2*sizeof(uint16));
149                  if (pp->uv == NULL)
150                          goto nomem;
151          } else
# Line 162 | Line 162 | register MESHPATCH     *pp;
162          if (flags & MT_UV)
163                  for (i = 0; i < pp->nverts; i++)
164                          for (j = 0; j < 2; j++)
165 <                                pp->uv[i][j] = mgetint(4);
165 >                                pp->uv[i][j] = mgetint(2);
166                                          /* local triangles */
167          pp->ntris = mgetint(2);
168          if (pp->ntris < 0 || pp->ntris > 512)

Diff Legend

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