5 |
|
* Mesh support routines |
6 |
|
*/ |
7 |
|
|
8 |
– |
#include <string.h> |
9 |
– |
|
8 |
|
#include "rtio.h" |
9 |
|
#include "rtmath.h" |
10 |
|
#include "rterror.h" |
285 |
|
OBJECT mo |
286 |
|
) |
287 |
|
{ |
288 |
< |
if (mo < mp->mat0 || mo >= mp->mat0 + mp->nmats) |
288 |
> |
if ((mo < mp->mat0) | (mo >= mp->mat0 + mp->nmats)) |
289 |
|
error(INTERNAL, "modifier out of range in getmeshpseudo"); |
290 |
|
if (mp->pseudo == NULL) { |
291 |
|
int i; |
372 |
|
goto nomem; |
373 |
|
if (lvp->key == NULL) { |
374 |
|
lvp->key = (char *)malloc(sizeof(MCVERT)+sizeof(int32)); |
375 |
< |
memcpy((void *)lvp->key, (void *)&cv, sizeof(MCVERT)); |
375 |
> |
memcpy(lvp->key, &cv, sizeof(MCVERT)); |
376 |
|
} |
377 |
|
if (lvp->data == NULL) { /* new vertex */ |
378 |
|
MESHPATCH *pp; |
383 |
|
goto nomem; |
384 |
|
mp->npatches = 1; |
385 |
|
} else if (mp->patch[mp->npatches-1].nverts >= 256) { |
386 |
+ |
if (mp->npatches >= 1L<<22) |
387 |
+ |
error(INTERNAL, "too many mesh patches"); |
388 |
|
if (mp->npatches % MPATCHBLKSIZ == 0) { |
389 |
< |
mp->patch = (MESHPATCH *)realloc( |
390 |
< |
(void *)mp->patch, |
391 |
< |
(mp->npatches + MPATCHBLKSIZ)* |
392 |
< |
sizeof(MESHPATCH)); |
393 |
< |
memset((void *)(mp->patch + mp->npatches), '\0', |
389 |
> |
mp->patch = (MESHPATCH *)realloc(mp->patch, |
390 |
> |
(mp->npatches + MPATCHBLKSIZ)* |
391 |
> |
sizeof(MESHPATCH)); |
392 |
> |
memset((mp->patch + mp->npatches), '\0', |
393 |
|
MPATCHBLKSIZ*sizeof(MESHPATCH)); |
394 |
|
} |
395 |
< |
if (mp->npatches++ >= 1L<<22) |
397 |
< |
error(INTERNAL, "too many mesh patches"); |
395 |
> |
mp->npatches++; |
396 |
|
} |
397 |
|
pp = &mp->patch[mp->npatches-1]; |
398 |
|
if (pp->xyz == NULL) { |
508 |
|
} |
509 |
|
} |
510 |
|
/* double link */ |
511 |
< |
pp = &mp->patch[pn[2]]; |
511 |
> |
pp = &mp->patch[pn[i=0]]; |
512 |
> |
if (pp->nj2tris >= 256) |
513 |
> |
pp = &mp->patch[pn[i=1]]; |
514 |
> |
if (pp->nj2tris >= 256) |
515 |
> |
pp = &mp->patch[pn[i=2]]; |
516 |
> |
if (pp->nj2tris >= 256) |
517 |
> |
error(INTERNAL, "too many patch triangles in addmeshtri"); |
518 |
|
if (pp->j2tri == NULL) { |
519 |
|
pp->j2tri = (struct PJoin2 *)malloc( |
520 |
|
256*sizeof(struct PJoin2)); |
521 |
|
if (pp->j2tri == NULL) |
522 |
|
goto nomem; |
523 |
|
} |
520 |
– |
if (pp->nj2tris >= 256) |
521 |
– |
error(INTERNAL, "too many patch triangles in addmeshtri"); |
522 |
– |
pp->j2tri[pp->nj2tris].v1j = vid[0]; |
523 |
– |
pp->j2tri[pp->nj2tris].v2j = vid[1]; |
524 |
– |
pp->j2tri[pp->nj2tris].v3 = vid[2] & 0xff; |
524 |
|
pp->j2tri[pp->nj2tris].mat = mo; |
525 |
< |
return(pn[2] << 10 | 0x300 | pp->nj2tris++); |
525 |
> |
switch (i) { |
526 |
> |
case 0: |
527 |
> |
pp->j2tri[pp->nj2tris].v3 = vid[0] & 0xff; |
528 |
> |
pp->j2tri[pp->nj2tris].v1j = vid[1]; |
529 |
> |
pp->j2tri[pp->nj2tris].v2j = vid[2]; |
530 |
> |
return(pn[0] << 10 | 0x300 | pp->nj2tris++); |
531 |
> |
case 1: |
532 |
> |
pp->j2tri[pp->nj2tris].v2j = vid[0]; |
533 |
> |
pp->j2tri[pp->nj2tris].v3 = vid[1] & 0xff; |
534 |
> |
pp->j2tri[pp->nj2tris].v1j = vid[2]; |
535 |
> |
return(pn[1] << 10 | 0x300 | pp->nj2tris++); |
536 |
> |
case 2: |
537 |
> |
pp->j2tri[pp->nj2tris].v1j = vid[0]; |
538 |
> |
pp->j2tri[pp->nj2tris].v2j = vid[1]; |
539 |
> |
pp->j2tri[pp->nj2tris].v3 = vid[2] & 0xff; |
540 |
> |
return(pn[2] << 10 | 0x300 | pp->nj2tris++); |
541 |
> |
} |
542 |
|
nomem: |
543 |
|
error(SYSTEM, "out of memory in addmeshtri"); |
544 |
|
return(OVOID); |
724 |
|
MESHPATCH *pp = ms->patch + ms->npatches; |
725 |
|
while (pp-- > ms->patch) { |
726 |
|
if (pp->j2tri != NULL) |
727 |
< |
free((void *)pp->j2tri); |
727 |
> |
free(pp->j2tri); |
728 |
|
if (pp->j1tri != NULL) |
729 |
< |
free((void *)pp->j1tri); |
729 |
> |
free(pp->j1tri); |
730 |
|
if (pp->tri != NULL) |
731 |
< |
free((void *)pp->tri); |
731 |
> |
free(pp->tri); |
732 |
|
if (pp->uv != NULL) |
733 |
< |
free((void *)pp->uv); |
733 |
> |
free(pp->uv); |
734 |
|
if (pp->norm != NULL) |
735 |
< |
free((void *)pp->norm); |
735 |
> |
free(pp->norm); |
736 |
|
if (pp->xyz != NULL) |
737 |
< |
free((void *)pp->xyz); |
737 |
> |
free(pp->xyz); |
738 |
> |
if (pp->trimat != NULL) |
739 |
> |
free(pp->trimat); |
740 |
|
} |
741 |
< |
free((void *)ms->patch); |
741 |
> |
free(ms->patch); |
742 |
|
} |
743 |
|
if (ms->pseudo != NULL) |
744 |
< |
free((void *)ms->pseudo); |
745 |
< |
free((void *)ms); |
744 |
> |
free(ms->pseudo); |
745 |
> |
free(ms); |
746 |
|
} |
747 |
|
|
748 |
|
|
752 |
|
if (o->os == NULL) |
753 |
|
return; |
754 |
|
freemesh((*(MESHINST *)o->os).msh); |
755 |
< |
free((void *)o->os); |
755 |
> |
free(o->os); |
756 |
|
o->os = NULL; |
757 |
|
} |