| 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" |
| 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]) |
| 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++) { |
| 413 |
|
pn[i] = vid[i] >> 8; |
| 414 |
|
} |
| 415 |
|
/* normalize material index */ |
| 416 |
< |
if (mo != OVOID) |
| 416 |
> |
if (mo != OVOID) { |
| 417 |
|
if ((mo -= mp->mat0) >= mp->nmats) |
| 418 |
|
mp->nmats = mo+1; |
| 419 |
|
else if (mo < 0) |
| 420 |
|
error(INTERNAL, "modifier range error in addmeshtri"); |
| 421 |
+ |
} |
| 422 |
|
/* assign triangle */ |
| 423 |
|
if (pn[0] == pn[1] && pn[1] == pn[2]) { /* local case */ |
| 424 |
|
pp = &mp->patch[pn[0]]; |
| 546 |
|
if (nouvbounds && pp->uv != NULL) |
| 547 |
|
return("unreferenced uv coordinates"); |
| 548 |
|
} |
| 545 |
– |
if (pp->ntris + pp->nj1tris + pp->nj2tris <= 0) |
| 546 |
– |
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%d 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) + |
