5 |
|
* Mesh support routines |
6 |
|
*/ |
7 |
|
|
8 |
+ |
#include <string.h> |
9 |
+ |
|
10 |
|
#include "standard.h" |
11 |
|
#include "octree.h" |
12 |
|
#include "object.h" |
70 |
|
|
71 |
|
|
72 |
|
MESH * |
73 |
< |
getmesh(mname, flags) /* get mesh data */ |
73 |
> |
getmesh(mname, flags) /* get new mesh data reference */ |
74 |
|
char *mname; |
75 |
|
int flags; |
76 |
|
{ |
80 |
|
flags &= IO_LEGAL; |
81 |
|
for (ms = mlist; ms != NULL; ms = ms->next) |
82 |
|
if (!strcmp(mname, ms->name)) { |
83 |
< |
if ((ms->ldflags & flags) == flags) { |
84 |
< |
ms->nref++; |
83 |
< |
return(ms); /* loaded */ |
84 |
< |
} |
85 |
< |
break; /* load the rest */ |
83 |
> |
ms->nref++; /* increase reference count */ |
84 |
> |
break; |
85 |
|
} |
86 |
< |
if (ms == NULL) { |
86 |
> |
if (ms == NULL) { /* load first time */ |
87 |
|
ms = (MESH *)calloc(1, sizeof(MESH)); |
88 |
|
if (ms == NULL) |
89 |
|
error(SYSTEM, "out of memory in getmesh"); |
127 |
|
ins->msh = NULL; |
128 |
|
o->os = (char *)ins; |
129 |
|
} |
130 |
< |
if (ins->msh == NULL || (ins->msh->ldflags & flags) != flags) |
130 |
> |
if (ins->msh == NULL) |
131 |
|
ins->msh = getmesh(o->oargs.sarg[0], flags); |
132 |
+ |
else if ((flags &= ~ins->msh->ldflags)) |
133 |
+ |
readmesh(ins->msh, |
134 |
+ |
getpath(o->oargs.sarg[0], getrlibpath(), R_OK), |
135 |
+ |
flags); |
136 |
|
return(ins); |
137 |
|
} |
138 |
|
|
332 |
|
goto nomem; |
333 |
|
if (lvp->key == NULL) { |
334 |
|
lvp->key = (char *)malloc(sizeof(MCVERT)+sizeof(int32)); |
335 |
< |
bcopy((void *)&cv, (void *)lvp->key, sizeof(MCVERT)); |
335 |
> |
memcpy((void *)lvp->key, (void *)&cv, sizeof(MCVERT)); |
336 |
|
} |
337 |
|
if (lvp->data == NULL) { /* new vertex */ |
338 |
|
register MESHPATCH *pp; |
348 |
|
(void *)mp->patch, |
349 |
|
(mp->npatches + MPATCHBLKSIZ)* |
350 |
|
sizeof(MESHPATCH)); |
351 |
< |
bzero((void *)(mp->patch + mp->npatches), |
351 |
> |
memset((void *)(mp->patch + mp->npatches), '\0', |
352 |
|
MPATCHBLKSIZ*sizeof(MESHPATCH)); |
353 |
|
} |
354 |
|
if (mp->npatches++ >= 1L<<22) |
611 |
|
t2cnt += pp->nj2tris; |
612 |
|
} |
613 |
|
fprintf(fp, "Mesh statistics:\n"); |
614 |
< |
fprintf(fp, "\t%d materials\n", ms->nmats); |
614 |
> |
fprintf(fp, "\t%ld materials\n", ms->nmats); |
615 |
|
fprintf(fp, "\t%d patches (%.2f MBytes)\n", ms->npatches, |
616 |
|
(ms->npatches*sizeof(MESHPATCH) + |
617 |
|
vcnt*3*sizeof(uint32) + |