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.6 by greg, Fri Jun 20 00:25:49 2003 UTC

# Line 133 | Line 133 | register MESHPATCH     *pp;
133          pp->nverts = mgetint(2);
134          if (pp->nverts <= 0 || pp->nverts > 256)
135                  mesherror(USER, "bad number of patch vertices");
136 <        pp->xyz = (uint4 (*)[3])malloc(pp->nverts*3*sizeof(uint4));
136 >        pp->xyz = (uint32 (*)[3])malloc(pp->nverts*3*sizeof(uint32));
137          if (pp->xyz == NULL)
138                  goto nomem;
139          if (flags & MT_N) {
140 <                pp->norm = (int4 *)calloc(pp->nverts, sizeof(int4));
140 >                pp->norm = (int32 *)calloc(pp->nverts, sizeof(int32));
141                  if (pp->norm == NULL)
142                          goto nomem;
143          } else
144                  pp->norm = NULL;
145          if (flags & MT_UV) {
146 <                pp->uv = (uint4 (*)[2])calloc(pp->nverts, 2*sizeof(uint4));
146 >                pp->uv = (uint32 (*)[2])calloc(pp->nverts, 2*sizeof(uint32));
147                  if (pp->uv == NULL)
148                          goto nomem;
149          } else
# Line 179 | Line 179 | register MESHPATCH     *pp;
179                  pp->tri = NULL;
180                                          /* local triangle material(s) */
181          if (mgetint(2) > 1) {
182 <                pp->trimat = (int2 *)malloc(pp->ntris*sizeof(int2));
182 >                pp->trimat = (int16 *)malloc(pp->ntris*sizeof(int16));
183                  if (pp->trimat == NULL)
184                          goto nomem;
185                  for (i = 0; i < pp->ntris; i++)

Diff Legend

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