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.5 by schorsch, Sun Jun 8 12:03:09 2003 UTC vs.
Revision 2.9 by greg, Thu Sep 18 16:53:53 2003 UTC

# Line 5 | Line 5 | static const char RCSid[] = "$Id$";
5   *  Routines for reading a compiled mesh from a file
6   */
7  
8 + #include  <time.h>
9 +
10   #include  "standard.h"
11   #include  "platform.h"
12   #include  "octree.h"
# Line 90 | 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 133 | Line 135 | register MESHPATCH     *pp;
135          pp->nverts = mgetint(2);
136          if (pp->nverts <= 0 || pp->nverts > 256)
137                  mesherror(USER, "bad number of patch vertices");
138 <        pp->xyz = (uint4 (*)[3])malloc(pp->nverts*3*sizeof(uint4));
138 >        pp->xyz = (uint32 (*)[3])malloc(pp->nverts*3*sizeof(uint32));
139          if (pp->xyz == NULL)
140                  goto nomem;
141          if (flags & MT_N) {
142 <                pp->norm = (int4 *)calloc(pp->nverts, sizeof(int4));
142 >                pp->norm = (int32 *)calloc(pp->nverts, sizeof(int32));
143                  if (pp->norm == NULL)
144                          goto nomem;
145          } else
146                  pp->norm = NULL;
147          if (flags & MT_UV) {
148 <                pp->uv = (uint4 (*)[2])calloc(pp->nverts, 2*sizeof(uint4));
148 >                pp->uv = (uint16 (*)[2])calloc(pp->nverts, 2*sizeof(uint16));
149                  if (pp->uv == NULL)
150                          goto nomem;
151          } else
# Line 160 | 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)
# Line 179 | Line 181 | register MESHPATCH     *pp;
181                  pp->tri = NULL;
182                                          /* local triangle material(s) */
183          if (mgetint(2) > 1) {
184 <                pp->trimat = (int2 *)malloc(pp->ntris*sizeof(int2));
184 >                pp->trimat = (int16 *)malloc(pp->ntris*sizeof(int16));
185                  if (pp->trimat == NULL)
186                          goto nomem;
187                  for (i = 0; i < pp->ntris; i++)

Diff Legend

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