| 1 |
– |
/* Copyright (c) 1994 Regents of the University of California */ |
| 2 |
– |
|
| 1 |
|
#ifndef lint |
| 2 |
< |
static char SCCSid[] = "$SunId$ LBL"; |
| 2 |
> |
static const char RCSid[] = "$Id$"; |
| 3 |
|
#endif |
| 6 |
– |
|
| 4 |
|
/* |
| 5 |
|
* Convert a Wavefront .obj file to Radiance format. |
| 6 |
|
* |
| 14 |
|
|
| 15 |
|
#include "trans.h" |
| 16 |
|
|
| 17 |
+ |
#include "tmesh.h" |
| 18 |
+ |
|
| 19 |
|
#include <ctype.h> |
| 20 |
|
|
| 22 |
– |
#define TCALNAME "tmesh.cal" /* triangle interp. file */ |
| 23 |
– |
#define QCALNAME "surf.cal" /* quad interp. file */ |
| 21 |
|
#define PATNAME "M-pat" /* mesh pattern name (reused) */ |
| 22 |
|
#define TEXNAME "M-nor" /* mesh texture name (reused) */ |
| 23 |
|
#define DEFOBJ "unnamed" /* default object name */ |
| 24 |
|
#define DEFMAT "white" /* default material name */ |
| 25 |
|
|
| 29 |
– |
#define ABS(x) ((x)>=0 ? (x) : -(x)) |
| 30 |
– |
|
| 26 |
|
#define pvect(v) printf("%18.12g %18.12g %18.12g\n",(v)[0],(v)[1],(v)[2]) |
| 27 |
|
|
| 28 |
|
FVECT *vlist; /* our vertex list */ |
| 29 |
|
int nvs; /* number of vertices in our list */ |
| 30 |
|
FVECT *vnlist; /* vertex normal list */ |
| 31 |
|
int nvns; |
| 32 |
< |
FLOAT (*vtlist)[2]; /* map vertex list */ |
| 32 |
> |
RREAL (*vtlist)[2]; /* map vertex list */ |
| 33 |
|
int nvts; |
| 34 |
|
|
| 40 |
– |
typedef FLOAT BARYCCM[3][4]; /* barycentric coordinate system */ |
| 41 |
– |
|
| 35 |
|
typedef int VNDX[3]; /* vertex index (point,map,normal) */ |
| 36 |
|
|
| 37 |
|
#define CHUNKSIZ 256 /* vertex allocation chunk size */ |
| 230 |
|
if (!puttri(argv[1], argv[2], argv[3])) |
| 231 |
|
syntax("Bad triangle"); |
| 232 |
|
break; |
| 240 |
– |
case 4: |
| 241 |
– |
if (!putquad(argv[1], argv[2], |
| 242 |
– |
argv[3], argv[4])) |
| 243 |
– |
syntax("Bad quad"); |
| 244 |
– |
break; |
| 233 |
|
default: |
| 234 |
|
if (!putface(argc-1, argv+1)) |
| 235 |
|
syntax("Bad face"); |
| 470 |
|
register char **av; |
| 471 |
|
{ |
| 472 |
|
VNDX vi; |
| 473 |
< |
FLOAT *p0, *p1; |
| 473 |
> |
RREAL *p0, *p1; |
| 474 |
|
FVECT v1, v2, nsum, newn; |
| 475 |
|
double d; |
| 476 |
|
register int i; |
| 477 |
|
|
| 478 |
|
if (!cvtndx(vi, av[0])) |
| 479 |
|
return(0); |
| 480 |
< |
if (vi[2] >= 0) |
| 480 |
> |
if (!flatten && vi[2] >= 0) |
| 481 |
|
return(1); /* has interpolated normals */ |
| 482 |
|
if (ac < 4) |
| 483 |
|
return(0); /* it's a triangle! */ |
| 524 |
|
char *cp; |
| 525 |
|
register int i; |
| 526 |
|
|
| 527 |
< |
if (nonplanar(ac, av)) { /* break into quads and triangles */ |
| 528 |
< |
while (ac > 3) { |
| 529 |
< |
if (!putquad(av[0], av[1], av[2], av[3])) |
| 527 |
> |
if (nonplanar(ac, av)) { /* break into triangles */ |
| 528 |
> |
while (ac > 2) { |
| 529 |
> |
if (!puttri(av[0], av[1], av[2])) |
| 530 |
|
return(0); |
| 531 |
< |
ac -= 2; /* remove two vertices & rotate */ |
| 531 |
> |
ac--; /* remove vertex & rotate */ |
| 532 |
|
cp = av[0]; |
| 533 |
|
for (i = 0; i < ac-1; i++) |
| 534 |
< |
av[i] = av[i+3]; |
| 534 |
> |
av[i] = av[i+2]; |
| 535 |
|
av[i] = cp; |
| 536 |
|
} |
| 549 |
– |
if (ac == 3 && !puttri(av[0], av[1], av[2])) |
| 550 |
– |
return(0); |
| 537 |
|
return(1); |
| 538 |
|
} |
| 539 |
|
if ((cp = getmtl()) == NULL) |
| 555 |
|
char *mod; |
| 556 |
|
VNDX v1i, v2i, v3i; |
| 557 |
|
BARYCCM bvecs; |
| 558 |
+ |
RREAL bcoor[3][3]; |
| 559 |
|
int texOK, patOK; |
| 560 |
+ |
int flatness; |
| 561 |
+ |
register int i; |
| 562 |
|
|
| 563 |
|
if ((mod = getmtl()) == NULL) |
| 564 |
|
return(-1); |
| 566 |
|
if (!cvtndx(v1i, v1) || !cvtndx(v2i, v2) || !cvtndx(v3i, v3)) |
| 567 |
|
return(0); |
| 568 |
|
/* compute barycentric coordinates */ |
| 569 |
< |
texOK = !flatten && (v1i[2]>=0 && v2i[2]>=0 && v3i[2]>=0); |
| 569 |
> |
if (v1i[2]>=0 && v2i[2]>=0 && v3i[2]>=0) |
| 570 |
> |
flatness = flat_tri(vlist[v1i[0]], vlist[v2i[0]], vlist[v3i[0]], |
| 571 |
> |
vnlist[v1i[2]], vnlist[v2i[2]], vnlist[v3i[2]]); |
| 572 |
> |
else |
| 573 |
> |
flatness = ISFLAT; |
| 574 |
> |
|
| 575 |
> |
switch (flatness) { |
| 576 |
> |
case DEGEN: /* zero area */ |
| 577 |
> |
return(-1); |
| 578 |
> |
case RVFLAT: /* reversed normals, but flat */ |
| 579 |
> |
case ISFLAT: /* smoothing unnecessary */ |
| 580 |
> |
texOK = 0; |
| 581 |
> |
break; |
| 582 |
> |
case RVBENT: /* reversed normals with smoothing */ |
| 583 |
> |
case ISBENT: /* proper smoothing */ |
| 584 |
> |
texOK = 1; |
| 585 |
> |
break; |
| 586 |
> |
} |
| 587 |
> |
if (flatten) |
| 588 |
> |
texOK = 0; |
| 589 |
|
#ifdef TEXMAPS |
| 590 |
|
patOK = mapname[0] && (v1i[1]>=0 && v2i[1]>=0 && v3i[1]>=0); |
| 591 |
|
#else |
| 592 |
|
patOK = 0; |
| 593 |
|
#endif |
| 594 |
|
if (texOK | patOK) |
| 595 |
< |
if (comp_baryc(bvecs, vlist[v1i[0]], vlist[v2i[0]], |
| 595 |
> |
if (comp_baryc(&bvecs, vlist[v1i[0]], vlist[v2i[0]], |
| 596 |
|
vlist[v3i[0]]) < 0) |
| 597 |
|
return(-1); |
| 598 |
|
/* put out texture (if any) */ |
| 600 |
|
printf("\n%s texfunc %s\n", mod, TEXNAME); |
| 601 |
|
mod = TEXNAME; |
| 602 |
|
printf("4 dx dy dz %s\n", TCALNAME); |
| 603 |
< |
printf("0\n21\n"); |
| 604 |
< |
put_baryc(bvecs); |
| 605 |
< |
printf("\t%14.12g %14.12g %14.12g\n", |
| 606 |
< |
vnlist[v1i[2]][0], vnlist[v2i[2]][0], |
| 607 |
< |
vnlist[v3i[2]][0]); |
| 608 |
< |
printf("\t%14.12g %14.12g %14.12g\n", |
| 609 |
< |
vnlist[v1i[2]][1], vnlist[v2i[2]][1], |
| 602 |
< |
vnlist[v3i[2]][1]); |
| 603 |
< |
printf("\t%14.12g %14.12g %14.12g\n", |
| 604 |
< |
vnlist[v1i[2]][2], vnlist[v2i[2]][2], |
| 605 |
< |
vnlist[v3i[2]][2]); |
| 603 |
> |
printf("0\n"); |
| 604 |
> |
for (i = 0; i < 3; i++) { |
| 605 |
> |
bcoor[i][0] = vnlist[v1i[2]][i]; |
| 606 |
> |
bcoor[i][1] = vnlist[v2i[2]][i]; |
| 607 |
> |
bcoor[i][2] = vnlist[v3i[2]][i]; |
| 608 |
> |
} |
| 609 |
> |
put_baryc(&bvecs, bcoor, 3); |
| 610 |
|
} |
| 611 |
|
#ifdef TEXMAPS |
| 612 |
|
/* put out pattern (if any) */ |
| 614 |
|
printf("\n%s colorpict %s\n", mod, PATNAME); |
| 615 |
|
mod = PATNAME; |
| 616 |
|
printf("7 noneg noneg noneg %s %s u v\n", mapname, TCALNAME); |
| 617 |
< |
printf("0\n18\n"); |
| 618 |
< |
put_baryc(bvecs); |
| 619 |
< |
printf("\t%f %f %f\n", vtlist[v1i[1]][0], |
| 620 |
< |
vtlist[v2i[1]][0], vtlist[v3i[1]][0]); |
| 621 |
< |
printf("\t%f %f %f\n", vtlist[v1i[1]][1], |
| 622 |
< |
vtlist[v2i[1]][1], vtlist[v3i[1]][1]); |
| 617 |
> |
printf("0\n"); |
| 618 |
> |
for (i = 0; i < 2; i++) { |
| 619 |
> |
bcoor[i][0] = vtlist[v1i[1]][i]; |
| 620 |
> |
bcoor[i][1] = vtlist[v2i[1]][i]; |
| 621 |
> |
bcoor[i][2] = vtlist[v3i[1]][i]; |
| 622 |
> |
} |
| 623 |
> |
put_baryc(&bvecs, bcoor, 2); |
| 624 |
|
} |
| 625 |
|
#endif |
| 626 |
< |
/* put out triangle */ |
| 626 |
> |
/* put out (reversed) triangle */ |
| 627 |
|
printf("\n%s polygon %s.%d\n", mod, getonm(), faceno); |
| 628 |
|
printf("0\n0\n9\n"); |
| 629 |
< |
pvect(vlist[v1i[0]]); |
| 630 |
< |
pvect(vlist[v2i[0]]); |
| 631 |
< |
pvect(vlist[v3i[0]]); |
| 632 |
< |
|
| 633 |
< |
return(1); |
| 634 |
< |
} |
| 635 |
< |
|
| 636 |
< |
|
| 632 |
< |
int |
| 633 |
< |
comp_baryc(bcm, v1, v2, v3) /* compute barycentric vectors */ |
| 634 |
< |
register BARYCCM bcm; |
| 635 |
< |
FLOAT *v1, *v2, *v3; |
| 636 |
< |
{ |
| 637 |
< |
FLOAT *vt; |
| 638 |
< |
FVECT va, vab, vcb; |
| 639 |
< |
double d; |
| 640 |
< |
register int i, j; |
| 641 |
< |
|
| 642 |
< |
for (j = 0; j < 3; j++) { |
| 643 |
< |
for (i = 0; i < 3; i++) { |
| 644 |
< |
vab[i] = v1[i] - v2[i]; |
| 645 |
< |
vcb[i] = v3[i] - v2[i]; |
| 646 |
< |
} |
| 647 |
< |
d = DOT(vcb,vcb); |
| 648 |
< |
if (d <= FTINY) |
| 649 |
< |
return(-1); |
| 650 |
< |
d = DOT(vcb,vab)/d; |
| 651 |
< |
for (i = 0; i < 3; i++) |
| 652 |
< |
va[i] = vab[i] - vcb[i]*d; |
| 653 |
< |
d = DOT(va,va); |
| 654 |
< |
if (d <= FTINY) |
| 655 |
< |
return(-1); |
| 656 |
< |
for (i = 0; i < 3; i++) { |
| 657 |
< |
va[i] /= d; |
| 658 |
< |
bcm[j][i] = va[i]; |
| 659 |
< |
} |
| 660 |
< |
bcm[j][3] = -DOT(v2,va); |
| 661 |
< |
/* rotate vertices */ |
| 662 |
< |
vt = v1; |
| 663 |
< |
v1 = v2; |
| 664 |
< |
v2 = v3; |
| 665 |
< |
v3 = vt; |
| 629 |
> |
if (flatness == RVFLAT || flatness == RVBENT) { |
| 630 |
> |
pvect(vlist[v3i[0]]); |
| 631 |
> |
pvect(vlist[v2i[0]]); |
| 632 |
> |
pvect(vlist[v1i[0]]); |
| 633 |
> |
} else { |
| 634 |
> |
pvect(vlist[v1i[0]]); |
| 635 |
> |
pvect(vlist[v2i[0]]); |
| 636 |
> |
pvect(vlist[v3i[0]]); |
| 637 |
|
} |
| 667 |
– |
return(0); |
| 668 |
– |
} |
| 669 |
– |
|
| 670 |
– |
|
| 671 |
– |
put_baryc(bcm) /* put barycentric coord. vectors */ |
| 672 |
– |
register BARYCCM bcm; |
| 673 |
– |
{ |
| 674 |
– |
register int i; |
| 675 |
– |
|
| 676 |
– |
for (i = 0; i < 3; i++) |
| 677 |
– |
printf("%14.8f %14.8f %14.8f %14.8f\n", |
| 678 |
– |
bcm[i][0], bcm[i][1], bcm[i][2], bcm[i][3]); |
| 679 |
– |
} |
| 680 |
– |
|
| 681 |
– |
|
| 682 |
– |
putquad(p0, p1, p3, p2) /* put out a quadrilateral */ |
| 683 |
– |
char *p0, *p1, *p3, *p2; /* names correspond to binary pos. */ |
| 684 |
– |
{ |
| 685 |
– |
VNDX p0i, p1i, p2i, p3i; |
| 686 |
– |
FVECT norm[4]; |
| 687 |
– |
char *mod, *name; |
| 688 |
– |
int axis; |
| 689 |
– |
FVECT v1, v2, vc1, vc2; |
| 690 |
– |
int ok1, ok2; |
| 691 |
– |
|
| 692 |
– |
#ifdef TEXMAPS |
| 693 |
– |
/* also should output texture index coordinates, |
| 694 |
– |
* which will require new .cal file |
| 695 |
– |
*/ |
| 696 |
– |
#endif |
| 697 |
– |
if ((mod = getmtl()) == NULL) |
| 698 |
– |
return(-1); |
| 699 |
– |
name = getonm(); |
| 700 |
– |
/* get actual indices */ |
| 701 |
– |
if (!cvtndx(p0i,p0) || !cvtndx(p1i,p1) || |
| 702 |
– |
!cvtndx(p2i,p2) || !cvtndx(p3i,p3)) |
| 703 |
– |
return(0); |
| 704 |
– |
/* compute exact normals */ |
| 705 |
– |
fvsum(v1, vlist[p1i[0]], vlist[p0i[0]], -1.0); |
| 706 |
– |
fvsum(v2, vlist[p2i[0]], vlist[p0i[0]], -1.0); |
| 707 |
– |
fcross(vc1, v1, v2); |
| 708 |
– |
ok1 = normalize(vc1) != 0.0; |
| 709 |
– |
fvsum(v1, vlist[p2i[0]], vlist[p3i[0]], -1.0); |
| 710 |
– |
fvsum(v2, vlist[p1i[0]], vlist[p3i[0]], -1.0); |
| 711 |
– |
fcross(vc2, v1, v2); |
| 712 |
– |
ok2 = normalize(vc2) != 0.0; |
| 713 |
– |
if (!(ok1 | ok2)) |
| 714 |
– |
return(-1); |
| 715 |
– |
/* compute normal interpolation */ |
| 716 |
– |
axis = norminterp(norm, p0i, p1i, p2i, p3i); |
| 717 |
– |
|
| 718 |
– |
/* put out quadrilateral? */ |
| 719 |
– |
if (ok1 & ok2 && fabs(fdot(vc1,vc2)) >= 1.0-FTINY) { |
| 720 |
– |
printf("\n%s ", mod); |
| 721 |
– |
if (axis != -1) { |
| 722 |
– |
printf("texfunc %s\n", TEXNAME); |
| 723 |
– |
printf("4 surf_dx surf_dy surf_dz %s\n", QCALNAME); |
| 724 |
– |
printf("0\n13\t%d\n", axis); |
| 725 |
– |
pvect(norm[0]); |
| 726 |
– |
pvect(norm[1]); |
| 727 |
– |
pvect(norm[2]); |
| 728 |
– |
fvsum(v1, norm[3], vc1, -0.5); |
| 729 |
– |
fvsum(v1, v1, vc2, -0.5); |
| 730 |
– |
pvect(v1); |
| 731 |
– |
printf("\n%s ", TEXNAME); |
| 732 |
– |
} |
| 733 |
– |
printf("polygon %s.%d\n", name, faceno); |
| 734 |
– |
printf("0\n0\n12\n"); |
| 735 |
– |
pvect(vlist[p0i[0]]); |
| 736 |
– |
pvect(vlist[p1i[0]]); |
| 737 |
– |
pvect(vlist[p3i[0]]); |
| 738 |
– |
pvect(vlist[p2i[0]]); |
| 739 |
– |
return(1); |
| 740 |
– |
} |
| 741 |
– |
/* put out triangles? */ |
| 742 |
– |
if (ok1) { |
| 743 |
– |
printf("\n%s ", mod); |
| 744 |
– |
if (axis != -1) { |
| 745 |
– |
printf("texfunc %s\n", TEXNAME); |
| 746 |
– |
printf("4 surf_dx surf_dy surf_dz %s\n", QCALNAME); |
| 747 |
– |
printf("0\n13\t%d\n", axis); |
| 748 |
– |
pvect(norm[0]); |
| 749 |
– |
pvect(norm[1]); |
| 750 |
– |
pvect(norm[2]); |
| 751 |
– |
fvsum(v1, norm[3], vc1, -1.0); |
| 752 |
– |
pvect(v1); |
| 753 |
– |
printf("\n%s ", TEXNAME); |
| 754 |
– |
} |
| 755 |
– |
printf("polygon %s.%da\n", name, faceno); |
| 756 |
– |
printf("0\n0\n9\n"); |
| 757 |
– |
pvect(vlist[p0i[0]]); |
| 758 |
– |
pvect(vlist[p1i[0]]); |
| 759 |
– |
pvect(vlist[p2i[0]]); |
| 760 |
– |
} |
| 761 |
– |
if (ok2) { |
| 762 |
– |
printf("\n%s ", mod); |
| 763 |
– |
if (axis != -1) { |
| 764 |
– |
printf("texfunc %s\n", TEXNAME); |
| 765 |
– |
printf("4 surf_dx surf_dy surf_dz %s\n", QCALNAME); |
| 766 |
– |
printf("0\n13\t%d\n", axis); |
| 767 |
– |
pvect(norm[0]); |
| 768 |
– |
pvect(norm[1]); |
| 769 |
– |
pvect(norm[2]); |
| 770 |
– |
fvsum(v2, norm[3], vc2, -1.0); |
| 771 |
– |
pvect(v2); |
| 772 |
– |
printf("\n%s ", TEXNAME); |
| 773 |
– |
} |
| 774 |
– |
printf("polygon %s.%db\n", name, faceno); |
| 775 |
– |
printf("0\n0\n9\n"); |
| 776 |
– |
pvect(vlist[p2i[0]]); |
| 777 |
– |
pvect(vlist[p1i[0]]); |
| 778 |
– |
pvect(vlist[p3i[0]]); |
| 779 |
– |
} |
| 638 |
|
return(1); |
| 639 |
|
} |
| 640 |
|
|
| 641 |
|
|
| 784 |
– |
int |
| 785 |
– |
norminterp(resmat, p0i, p1i, p2i, p3i) /* compute normal interpolation */ |
| 786 |
– |
register FVECT resmat[4]; |
| 787 |
– |
register VNDX p0i, p1i, p2i, p3i; |
| 788 |
– |
{ |
| 789 |
– |
#define u ((ax+1)%3) |
| 790 |
– |
#define v ((ax+2)%3) |
| 791 |
– |
|
| 792 |
– |
register int ax; |
| 793 |
– |
MAT4 eqnmat; |
| 794 |
– |
FVECT v1; |
| 795 |
– |
register int i, j; |
| 796 |
– |
|
| 797 |
– |
#ifdef TEXMAPS |
| 798 |
– |
/* also check for texture indices */ |
| 799 |
– |
#endif |
| 800 |
– |
if (flatten || !(p0i[2]>=0 && p1i[2]>=0 && p2i[2]>=0 && p3i[2]>=0)) |
| 801 |
– |
return(-1); |
| 802 |
– |
/* find dominant axis */ |
| 803 |
– |
VCOPY(v1, vnlist[p0i[2]]); |
| 804 |
– |
fvsum(v1, v1, vnlist[p1i[2]], 1.0); |
| 805 |
– |
fvsum(v1, v1, vnlist[p2i[2]], 1.0); |
| 806 |
– |
fvsum(v1, v1, vnlist[p3i[2]], 1.0); |
| 807 |
– |
ax = ABS(v1[0]) > ABS(v1[1]) ? 0 : 1; |
| 808 |
– |
ax = ABS(v1[ax]) > ABS(v1[2]) ? ax : 2; |
| 809 |
– |
/* assign equation matrix */ |
| 810 |
– |
eqnmat[0][0] = vlist[p0i[0]][u]*vlist[p0i[0]][v]; |
| 811 |
– |
eqnmat[0][1] = vlist[p0i[0]][u]; |
| 812 |
– |
eqnmat[0][2] = vlist[p0i[0]][v]; |
| 813 |
– |
eqnmat[0][3] = 1.0; |
| 814 |
– |
eqnmat[1][0] = vlist[p1i[0]][u]*vlist[p1i[0]][v]; |
| 815 |
– |
eqnmat[1][1] = vlist[p1i[0]][u]; |
| 816 |
– |
eqnmat[1][2] = vlist[p1i[0]][v]; |
| 817 |
– |
eqnmat[1][3] = 1.0; |
| 818 |
– |
eqnmat[2][0] = vlist[p2i[0]][u]*vlist[p2i[0]][v]; |
| 819 |
– |
eqnmat[2][1] = vlist[p2i[0]][u]; |
| 820 |
– |
eqnmat[2][2] = vlist[p2i[0]][v]; |
| 821 |
– |
eqnmat[2][3] = 1.0; |
| 822 |
– |
eqnmat[3][0] = vlist[p3i[0]][u]*vlist[p3i[0]][v]; |
| 823 |
– |
eqnmat[3][1] = vlist[p3i[0]][u]; |
| 824 |
– |
eqnmat[3][2] = vlist[p3i[0]][v]; |
| 825 |
– |
eqnmat[3][3] = 1.0; |
| 826 |
– |
/* invert matrix (solve system) */ |
| 827 |
– |
if (!invmat4(eqnmat, eqnmat)) |
| 828 |
– |
return(-1); /* no solution */ |
| 829 |
– |
/* compute result matrix */ |
| 830 |
– |
for (j = 0; j < 4; j++) |
| 831 |
– |
for (i = 0; i < 3; i++) |
| 832 |
– |
resmat[j][i] = eqnmat[j][0]*vnlist[p0i[2]][i] + |
| 833 |
– |
eqnmat[j][1]*vnlist[p1i[2]][i] + |
| 834 |
– |
eqnmat[j][2]*vnlist[p2i[2]][i] + |
| 835 |
– |
eqnmat[j][3]*vnlist[p3i[2]][i]; |
| 836 |
– |
#ifdef TEXMAPS |
| 837 |
– |
/* compute result matrix for texture indices */ |
| 838 |
– |
#endif |
| 839 |
– |
return(ax); |
| 840 |
– |
|
| 841 |
– |
#undef u |
| 842 |
– |
#undef v |
| 843 |
– |
} |
| 844 |
– |
|
| 845 |
– |
|
| 642 |
|
freeverts() /* free all vertices */ |
| 643 |
|
{ |
| 644 |
|
if (nvs) { |
| 645 |
< |
free((char *)vlist); |
| 645 |
> |
free((void *)vlist); |
| 646 |
|
nvs = 0; |
| 647 |
|
} |
| 648 |
|
if (nvts) { |
| 649 |
< |
free((char *)vtlist); |
| 649 |
> |
free((void *)vtlist); |
| 650 |
|
nvts = 0; |
| 651 |
|
} |
| 652 |
|
if (nvns) { |
| 653 |
< |
free((char *)vnlist); |
| 653 |
> |
free((void *)vnlist); |
| 654 |
|
nvns = 0; |
| 655 |
|
} |
| 656 |
|
} |
| 664 |
|
if (nvs == 0) |
| 665 |
|
vlist = (FVECT *)malloc(CHUNKSIZ*sizeof(FVECT)); |
| 666 |
|
else |
| 667 |
< |
vlist = (FVECT *)realloc((char *)vlist, |
| 667 |
> |
vlist = (FVECT *)realloc((void *)vlist, |
| 668 |
|
(nvs+CHUNKSIZ)*sizeof(FVECT)); |
| 669 |
|
if (vlist == NULL) { |
| 670 |
|
fprintf(stderr, |
| 688 |
|
if (nvns == 0) |
| 689 |
|
vnlist = (FVECT *)malloc(CHUNKSIZ*sizeof(FVECT)); |
| 690 |
|
else |
| 691 |
< |
vnlist = (FVECT *)realloc((char *)vnlist, |
| 691 |
> |
vnlist = (FVECT *)realloc((void *)vnlist, |
| 692 |
|
(nvns+CHUNKSIZ)*sizeof(FVECT)); |
| 693 |
|
if (vnlist == NULL) { |
| 694 |
|
fprintf(stderr, |
| 712 |
|
{ |
| 713 |
|
if (!(nvts%CHUNKSIZ)) { /* allocate next block */ |
| 714 |
|
if (nvts == 0) |
| 715 |
< |
vtlist = (FLOAT (*)[2])malloc(CHUNKSIZ*2*sizeof(FLOAT)); |
| 715 |
> |
vtlist = (RREAL (*)[2])malloc(CHUNKSIZ*2*sizeof(RREAL)); |
| 716 |
|
else |
| 717 |
< |
vtlist = (FLOAT (*)[2])realloc((char *)vtlist, |
| 718 |
< |
(nvts+CHUNKSIZ)*2*sizeof(FLOAT)); |
| 717 |
> |
vtlist = (RREAL (*)[2])realloc((void *)vtlist, |
| 718 |
> |
(nvts+CHUNKSIZ)*2*sizeof(RREAL)); |
| 719 |
|
if (vtlist == NULL) { |
| 720 |
|
fprintf(stderr, |
| 721 |
|
"Out of memory while allocating texture vertex %d\n", |