18 |
|
int fl; |
19 |
|
uint32 xyz[3]; |
20 |
|
int32 norm; |
21 |
< |
uint32 uv[2]; |
21 |
> |
uint16 uv[2]; |
22 |
|
} MCVERT; |
23 |
|
|
24 |
|
#define MPATCHBLKSIZ 128 /* patch allocation block size */ |
235 |
|
for (i = 0; i < 2; i++) |
236 |
|
vp->uv[i] = mp->uvlim[0][i] + |
237 |
|
(mp->uvlim[1][i] - mp->uvlim[0][i])* |
238 |
< |
(pp->uv[vid][i] + .5)*(1./4294967296.); |
238 |
> |
(pp->uv[vid][i] + .5)*(1./65536.); |
239 |
|
vp->fl |= MT_UV; |
240 |
|
} |
241 |
|
return(vp->fl); |
314 |
|
return(-1); |
315 |
|
if (vp->uv[i] >= mp->uvlim[1][i]) |
316 |
|
return(-1); |
317 |
< |
cv.uv[i] = (uint32)(4294967296. * |
317 |
> |
cv.uv[i] = (uint32)(65536. * |
318 |
|
(vp->uv[i] - mp->uvlim[0][i]) / |
319 |
|
(mp->uvlim[1][i] - mp->uvlim[0][i])); |
320 |
|
} |
372 |
|
} |
373 |
|
if (cv.fl & MT_UV) { |
374 |
|
if (pp->uv == NULL) { |
375 |
< |
pp->uv = (uint32 (*)[2])calloc(256, |
376 |
< |
2*sizeof(uint32)); |
375 |
> |
pp->uv = (uint16 (*)[2])calloc(256, |
376 |
> |
2*sizeof(uint16)); |
377 |
|
if (pp->uv == NULL) |
378 |
|
goto nomem; |
379 |
|
} |
617 |
|
(ms->npatches*sizeof(MESHPATCH) + |
618 |
|
vcnt*3*sizeof(uint32) + |
619 |
|
nscnt*sizeof(int32) + |
620 |
< |
uvscnt*2*sizeof(uint32) + |
620 |
> |
uvscnt*2*sizeof(uint16) + |
621 |
|
tcnt*sizeof(struct PTri) + |
622 |
|
t1cnt*sizeof(struct PJoin1) + |
623 |
|
t2cnt*sizeof(struct PJoin2))/(1024.*1024.)); |