| 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" |
| 30 |
|
|
| 31 |
|
static MESH *mlist = NULL; /* list of loaded meshes */ |
| 32 |
|
|
| 33 |
+ |
static lut_keycmpf_t cvcmp; |
| 34 |
+ |
static lut_hashf_t cvhash; |
| 35 |
|
|
| 36 |
+ |
|
| 37 |
|
static unsigned long |
| 38 |
< |
cvhash(cvp) /* hash an encoded vertex */ |
| 39 |
< |
MCVERT *cvp; |
| 38 |
> |
cvhash(p) /* hash an encoded vertex */ |
| 39 |
> |
//MCVERT *cvp; |
| 40 |
> |
const void *p; |
| 41 |
|
{ |
| 42 |
+ |
const MCVERT *cvp = (const MCVERT *)p; |
| 43 |
|
unsigned long hval; |
| 44 |
|
|
| 45 |
|
if (!(cvp->fl & MT_V)) |
| 54 |
|
|
| 55 |
|
|
| 56 |
|
static int |
| 57 |
< |
cvcmp(v1, v2) /* compare encoded vertices */ |
| 58 |
< |
register MCVERT *v1, *v2; |
| 57 |
> |
cvcmp(vv1, vv2) /* compare encoded vertices */ |
| 58 |
> |
//register MCVERT *v1, *v2; |
| 59 |
> |
const void *vv1, *vv2; |
| 60 |
|
{ |
| 61 |
+ |
const MCVERT *v1 = vv1, *v2 = vv2; |
| 62 |
|
if (v1->fl != v2->fl) |
| 63 |
|
return(1); |
| 64 |
|
if (v1->xyz[0] != v2->xyz[0]) |
| 316 |
|
(vp->v[i] - mp->mcube.cuorg[i]) / |
| 317 |
|
mp->mcube.cusize); |
| 318 |
|
} |
| 319 |
< |
if (vp->fl & MT_N) |
| 319 |
> |
if (vp->fl & MT_N) /* assumes normalized! */ |
| 320 |
|
cv.norm = encodedir(vp->n); |
| 321 |
|
if (vp->fl & MT_UV) |
| 322 |
|
for (i = 0; i < 2; i++) { |
| 420 |
|
pn[i] = vid[i] >> 8; |
| 421 |
|
} |
| 422 |
|
/* normalize material index */ |
| 423 |
< |
if (mo != OVOID) |
| 423 |
> |
if (mo != OVOID) { |
| 424 |
|
if ((mo -= mp->mat0) >= mp->nmats) |
| 425 |
|
mp->nmats = mo+1; |
| 426 |
|
else if (mo < 0) |
| 427 |
|
error(INTERNAL, "modifier range error in addmeshtri"); |
| 428 |
+ |
} |
| 429 |
|
/* assign triangle */ |
| 430 |
|
if (pn[0] == pn[1] && pn[1] == pn[2]) { /* local case */ |
| 431 |
|
pp = &mp->patch[pn[0]]; |
| 553 |
|
if (nouvbounds && pp->uv != NULL) |
| 554 |
|
return("unreferenced uv coordinates"); |
| 555 |
|
} |
| 545 |
– |
if (pp->ntris + pp->nj1tris + pp->nj2tris <= 0) |
| 546 |
– |
error(WARNING, "no triangles in patch"); |
| 556 |
|
if (pp->ntris > 0 && pp->tri == NULL) |
| 557 |
|
return("missing patch triangle list"); |
| 558 |
|
if (pp->nj1tris > 0 && pp->j1tri == NULL) |
