| 7 |
|
|
| 8 |
|
#include <string.h> |
| 9 |
|
|
| 10 |
< |
#include "standard.h" |
| 10 |
> |
#include "rtio.h" |
| 11 |
> |
#include "rtmath.h" |
| 12 |
> |
#include "rterror.h" |
| 13 |
> |
#include "paths.h" |
| 14 |
|
#include "octree.h" |
| 15 |
|
#include "object.h" |
| 16 |
|
#include "otypes.h" |
| 21 |
|
int fl; |
| 22 |
|
uint32 xyz[3]; |
| 23 |
|
int32 norm; |
| 24 |
< |
uint16 uv[2]; |
| 24 |
> |
uint32 uv[2]; |
| 25 |
|
} MCVERT; |
| 26 |
|
|
| 27 |
|
#define MPATCHBLKSIZ 128 /* patch allocation block size */ |
| 32 |
|
|
| 33 |
|
|
| 34 |
|
static unsigned long |
| 35 |
< |
cvhash(cvp) /* hash an encoded vertex */ |
| 33 |
< |
MCVERT *cvp; |
| 35 |
> |
cvhash(const char *p) /* hash an encoded vertex */ |
| 36 |
|
{ |
| 37 |
+ |
const MCVERT *cvp = (const MCVERT *)p; |
| 38 |
|
unsigned long hval; |
| 39 |
|
|
| 40 |
|
if (!(cvp->fl & MT_V)) |
| 49 |
|
|
| 50 |
|
|
| 51 |
|
static int |
| 52 |
< |
cvcmp(v1, v2) /* compare encoded vertices */ |
| 50 |
< |
register MCVERT *v1, *v2; |
| 52 |
> |
cvcmp(const char *vv1, const char *vv2) /* compare encoded vertices */ |
| 53 |
|
{ |
| 54 |
+ |
const MCVERT *v1 = (const MCVERT *)vv1, *v2 = (const MCVERT *)vv2; |
| 55 |
|
if (v1->fl != v2->fl) |
| 56 |
|
return(1); |
| 57 |
|
if (v1->xyz[0] != v2->xyz[0]) |
| 238 |
|
for (i = 0; i < 2; i++) |
| 239 |
|
vp->uv[i] = mp->uvlim[0][i] + |
| 240 |
|
(mp->uvlim[1][i] - mp->uvlim[0][i])* |
| 241 |
< |
(pp->uv[vid][i] + .5)*(1./65536.); |
| 241 |
> |
(pp->uv[vid][i] + .5)*(1./4294967296.); |
| 242 |
|
vp->fl |= MT_UV; |
| 243 |
|
} |
| 244 |
|
return(vp->fl); |
| 309 |
|
(vp->v[i] - mp->mcube.cuorg[i]) / |
| 310 |
|
mp->mcube.cusize); |
| 311 |
|
} |
| 312 |
< |
if (vp->fl & MT_N) |
| 312 |
> |
if (vp->fl & MT_N) /* assumes normalized! */ |
| 313 |
|
cv.norm = encodedir(vp->n); |
| 314 |
|
if (vp->fl & MT_UV) |
| 315 |
|
for (i = 0; i < 2; i++) { |
| 317 |
|
return(-1); |
| 318 |
|
if (vp->uv[i] >= mp->uvlim[1][i]) |
| 319 |
|
return(-1); |
| 320 |
< |
cv.uv[i] = (uint32)(65536. * |
| 320 |
> |
cv.uv[i] = (uint32)(4294967296. * |
| 321 |
|
(vp->uv[i] - mp->uvlim[0][i]) / |
| 322 |
|
(mp->uvlim[1][i] - mp->uvlim[0][i])); |
| 323 |
|
} |
| 375 |
|
} |
| 376 |
|
if (cv.fl & MT_UV) { |
| 377 |
|
if (pp->uv == NULL) { |
| 378 |
< |
pp->uv = (uint16 (*)[2])calloc(256, |
| 379 |
< |
2*sizeof(uint16)); |
| 378 |
> |
pp->uv = (uint32 (*)[2])calloc(256, |
| 379 |
> |
2*sizeof(uint32)); |
| 380 |
|
if (pp->uv == NULL) |
| 381 |
|
goto nomem; |
| 382 |
|
} |
| 546 |
|
if (nouvbounds && pp->uv != NULL) |
| 547 |
|
return("unreferenced uv coordinates"); |
| 548 |
|
} |
| 546 |
– |
if (pp->ntris + pp->nj1tris + pp->nj2tris <= 0) |
| 547 |
– |
error(WARNING, "no triangles in patch"); |
| 549 |
|
if (pp->ntris > 0 && pp->tri == NULL) |
| 550 |
|
return("missing patch triangle list"); |
| 551 |
|
if (pp->nj1tris > 0 && pp->j1tri == NULL) |
| 613 |
|
t2cnt += pp->nj2tris; |
| 614 |
|
} |
| 615 |
|
fprintf(fp, "Mesh statistics:\n"); |
| 616 |
< |
fprintf(fp, "\t%ld materials\n", ms->nmats); |
| 616 |
> |
fprintf(fp, "\t%ld materials\n", (long)ms->nmats); |
| 617 |
|
fprintf(fp, "\t%d patches (%.2f MBytes)\n", ms->npatches, |
| 618 |
|
(ms->npatches*sizeof(MESHPATCH) + |
| 619 |
|
vcnt*3*sizeof(uint32) + |
| 620 |
|
nscnt*sizeof(int32) + |
| 621 |
< |
uvscnt*2*sizeof(uint16) + |
| 621 |
> |
uvscnt*2*sizeof(uint32) + |
| 622 |
|
tcnt*sizeof(struct PTri) + |
| 623 |
|
t1cnt*sizeof(struct PJoin1) + |
| 624 |
|
t2cnt*sizeof(struct PJoin2))/(1024.*1024.)); |
