| 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 |
|
* |
| 10 |
|
* I'm not sure they work correctly. (Taken out -- see TEXMAPS defines.) |
| 11 |
|
*/ |
| 12 |
|
|
| 13 |
< |
#include "standard.h" |
| 13 |
> |
#include <stdlib.h> |
| 14 |
> |
#include <stdio.h> |
| 15 |
> |
#include <ctype.h> |
| 16 |
|
|
| 17 |
+ |
#include "rtmath.h" |
| 18 |
+ |
#include "rtio.h" |
| 19 |
+ |
#include "resolu.h" |
| 20 |
|
#include "trans.h" |
| 21 |
+ |
#include "tmesh.h" |
| 22 |
|
|
| 20 |
– |
#include <ctype.h> |
| 23 |
|
|
| 22 |
– |
#define TCALNAME "tmesh.cal" /* triangle interp. file */ |
| 24 |
|
#define PATNAME "M-pat" /* mesh pattern name (reused) */ |
| 25 |
|
#define TEXNAME "M-nor" /* mesh texture name (reused) */ |
| 26 |
|
#define DEFOBJ "unnamed" /* default object name */ |
| 27 |
|
#define DEFMAT "white" /* default material name */ |
| 28 |
|
|
| 28 |
– |
#define ABS(x) ((x)>=0 ? (x) : -(x)) |
| 29 |
– |
|
| 29 |
|
#define pvect(v) printf("%18.12g %18.12g %18.12g\n",(v)[0],(v)[1],(v)[2]) |
| 30 |
|
|
| 31 |
|
FVECT *vlist; /* our vertex list */ |
| 32 |
|
int nvs; /* number of vertices in our list */ |
| 33 |
|
FVECT *vnlist; /* vertex normal list */ |
| 34 |
|
int nvns; |
| 35 |
< |
FLOAT (*vtlist)[2]; /* map vertex list */ |
| 35 |
> |
RREAL (*vtlist)[2]; /* map vertex list */ |
| 36 |
|
int nvts; |
| 37 |
|
|
| 39 |
– |
typedef struct { |
| 40 |
– |
int ax; /* major axis */ |
| 41 |
– |
FLOAT tm[2][3]; /* transformation */ |
| 42 |
– |
} BARYCCM; |
| 43 |
– |
|
| 38 |
|
typedef int VNDX[3]; /* vertex index (point,map,normal) */ |
| 39 |
|
|
| 40 |
< |
#define CHUNKSIZ 256 /* vertex allocation chunk size */ |
| 40 |
> |
#define CHUNKSIZ 1024 /* vertex allocation chunk size */ |
| 41 |
|
|
| 42 |
< |
#define MAXARG 64 /* maximum # arguments in a statement */ |
| 42 |
> |
#define MAXARG 512 /* maximum # arguments in a statement */ |
| 43 |
|
|
| 44 |
|
/* qualifiers */ |
| 45 |
|
#define Q_MTL 0 |
| 68 |
|
|
| 69 |
|
int flatten = 0; /* discard surface normal information */ |
| 70 |
|
|
| 77 |
– |
char *getmtl(), *getonm(); |
| 78 |
– |
|
| 71 |
|
char mapname[128]; /* current picture file */ |
| 72 |
|
char matname[64]; /* current material name */ |
| 73 |
|
char group[16][32]; /* current group names */ |
| 76 |
|
int lineno; /* current line number */ |
| 77 |
|
int faceno; /* current face number */ |
| 78 |
|
|
| 79 |
+ |
static void getnames(FILE *fp); |
| 80 |
+ |
static void convert(FILE *fp); |
| 81 |
+ |
static int getstmt(char *av[MAXARG], FILE *fp); |
| 82 |
+ |
static char * getmtl(void); |
| 83 |
+ |
static char * getonm(void); |
| 84 |
+ |
static int matchrule(RULEHD *rp); |
| 85 |
+ |
static int cvtndx(VNDX vi, char *vs); |
| 86 |
+ |
static int nonplanar(int ac, char **av); |
| 87 |
+ |
static int putface(int ac, char **av); |
| 88 |
+ |
static int puttri(char *v1, char *v2, char *v3); |
| 89 |
+ |
static void freeverts(void); |
| 90 |
+ |
static int newv(double x, double y, double z); |
| 91 |
+ |
static int newvn(double x, double y, double z); |
| 92 |
+ |
static int newvt(double x, double y); |
| 93 |
+ |
static void syntax(char *er); |
| 94 |
|
|
| 95 |
< |
main(argc, argv) /* read in .obj file and convert */ |
| 96 |
< |
int argc; |
| 97 |
< |
char *argv[]; |
| 95 |
> |
|
| 96 |
> |
int |
| 97 |
> |
main( /* read in .obj file and convert */ |
| 98 |
> |
int argc, |
| 99 |
> |
char *argv[] |
| 100 |
> |
) |
| 101 |
|
{ |
| 102 |
|
int donames = 0; |
| 103 |
|
int i; |
| 119 |
|
default: |
| 120 |
|
goto userr; |
| 121 |
|
} |
| 122 |
< |
if (i > argc | i < argc-1) |
| 122 |
> |
if ((i > argc) | (i < argc-1)) |
| 123 |
|
goto userr; |
| 124 |
|
if (i == argc) |
| 125 |
|
inpfile = "<stdin>"; |
| 148 |
|
} |
| 149 |
|
|
| 150 |
|
|
| 151 |
< |
getnames(fp) /* get valid qualifier names */ |
| 152 |
< |
FILE *fp; |
| 151 |
> |
void |
| 152 |
> |
getnames( /* get valid qualifier names */ |
| 153 |
> |
FILE *fp |
| 154 |
> |
) |
| 155 |
|
{ |
| 156 |
|
char *argv[MAXARG]; |
| 157 |
|
int argc; |
| 158 |
|
ID tmpid; |
| 159 |
|
register int i; |
| 160 |
|
|
| 161 |
< |
while (argc = getstmt(argv, fp)) |
| 161 |
> |
while ( (argc = getstmt(argv, fp)) ) |
| 162 |
|
switch (argv[0][0]) { |
| 163 |
|
case 'f': /* face */ |
| 164 |
|
if (!argv[0][1]) |
| 199 |
|
} |
| 200 |
|
|
| 201 |
|
|
| 202 |
< |
convert(fp) /* convert a T-mesh */ |
| 203 |
< |
FILE *fp; |
| 202 |
> |
void |
| 203 |
> |
convert( /* convert a T-mesh */ |
| 204 |
> |
FILE *fp |
| 205 |
> |
) |
| 206 |
|
{ |
| 207 |
|
char *argv[MAXARG]; |
| 208 |
|
int argc; |
| 211 |
|
|
| 212 |
|
nstats = nunknown = 0; |
| 213 |
|
/* scan until EOF */ |
| 214 |
< |
while (argc = getstmt(argv, fp)) { |
| 214 |
> |
while ( (argc = getstmt(argv, fp)) ) { |
| 215 |
|
switch (argv[0][0]) { |
| 216 |
|
case 'v': /* vertex */ |
| 217 |
|
switch (argv[0][1]) { |
| 305 |
|
|
| 306 |
|
|
| 307 |
|
int |
| 308 |
< |
getstmt(av, fp) /* read the next statement from fp */ |
| 309 |
< |
register char *av[MAXARG]; |
| 310 |
< |
FILE *fp; |
| 308 |
> |
getstmt( /* read the next statement from fp */ |
| 309 |
> |
register char *av[MAXARG], |
| 310 |
> |
FILE *fp |
| 311 |
> |
) |
| 312 |
|
{ |
| 313 |
< |
extern char *fgetline(); |
| 299 |
< |
static char sbuf[MAXARG*10]; |
| 313 |
> |
static char sbuf[MAXARG*16]; |
| 314 |
|
register char *cp; |
| 315 |
|
register int i; |
| 316 |
|
|
| 324 |
|
lineno++; |
| 325 |
|
*cp++ = '\0'; |
| 326 |
|
} |
| 327 |
< |
if (!*cp || i >= MAXARG-1) |
| 327 |
> |
if (!*cp) |
| 328 |
|
break; |
| 329 |
+ |
if (i >= MAXARG-1) { |
| 330 |
+ |
fprintf(stderr, |
| 331 |
+ |
"warning: line %d: too many arguments (limit %d)\n", |
| 332 |
+ |
lineno+1, MAXARG-1); |
| 333 |
+ |
break; |
| 334 |
+ |
} |
| 335 |
|
av[i++] = cp; |
| 336 |
|
while (*++cp && !isspace(*cp)) |
| 337 |
|
; |
| 345 |
|
|
| 346 |
|
|
| 347 |
|
char * |
| 348 |
< |
getmtl() /* figure material for this face */ |
| 348 |
> |
getmtl(void) /* figure material for this face */ |
| 349 |
|
{ |
| 350 |
|
register RULEHD *rp = ourmapping; |
| 351 |
|
|
| 371 |
|
|
| 372 |
|
|
| 373 |
|
char * |
| 374 |
< |
getonm() /* invent a good name for object */ |
| 374 |
> |
getonm(void) /* invent a good name for object */ |
| 375 |
|
{ |
| 376 |
|
static char name[64]; |
| 377 |
|
register char *cp1, *cp2; |
| 386 |
|
cp2 = group[i]; |
| 387 |
|
if (cp1 > name) |
| 388 |
|
*cp1++ = '.'; |
| 389 |
< |
while (*cp1 = *cp2++) |
| 389 |
> |
while ( (*cp1 = *cp2++) ) |
| 390 |
|
if (++cp1 >= name+sizeof(name)-2) { |
| 391 |
|
*cp1 = '\0'; |
| 392 |
|
return(name); |
| 396 |
|
} |
| 397 |
|
|
| 398 |
|
|
| 399 |
< |
matchrule(rp) /* check for a match on this rule */ |
| 400 |
< |
register RULEHD *rp; |
| 399 |
> |
int |
| 400 |
> |
matchrule( /* check for a match on this rule */ |
| 401 |
> |
register RULEHD *rp |
| 402 |
> |
) |
| 403 |
|
{ |
| 404 |
|
ID tmpid; |
| 405 |
|
int gotmatch; |
| 449 |
|
} |
| 450 |
|
|
| 451 |
|
|
| 452 |
< |
cvtndx(vi, vs) /* convert vertex string to index */ |
| 453 |
< |
register VNDX vi; |
| 454 |
< |
register char *vs; |
| 452 |
> |
int |
| 453 |
> |
cvtndx( /* convert vertex string to index */ |
| 454 |
> |
register VNDX vi, |
| 455 |
> |
register char *vs |
| 456 |
> |
) |
| 457 |
|
{ |
| 458 |
|
/* get point */ |
| 459 |
|
vi[0] = atoi(vs); |
| 498 |
|
} |
| 499 |
|
|
| 500 |
|
|
| 501 |
< |
nonplanar(ac, av) /* are vertices non-planar? */ |
| 502 |
< |
register int ac; |
| 503 |
< |
register char **av; |
| 501 |
> |
int |
| 502 |
> |
nonplanar( /* are vertices non-planar? */ |
| 503 |
> |
register int ac, |
| 504 |
> |
register char **av |
| 505 |
> |
) |
| 506 |
|
{ |
| 507 |
|
VNDX vi; |
| 508 |
< |
FLOAT *p0, *p1; |
| 508 |
> |
RREAL *p0, *p1; |
| 509 |
|
FVECT v1, v2, nsum, newn; |
| 510 |
|
double d; |
| 511 |
|
register int i; |
| 551 |
|
} |
| 552 |
|
|
| 553 |
|
|
| 554 |
< |
putface(ac, av) /* put out an N-sided polygon */ |
| 555 |
< |
int ac; |
| 556 |
< |
register char **av; |
| 554 |
> |
int |
| 555 |
> |
putface( /* put out an N-sided polygon */ |
| 556 |
> |
int ac, |
| 557 |
> |
register char **av |
| 558 |
> |
) |
| 559 |
|
{ |
| 560 |
|
VNDX vi; |
| 561 |
|
char *cp; |
| 586 |
|
} |
| 587 |
|
|
| 588 |
|
|
| 589 |
< |
puttri(v1, v2, v3) /* put out a triangle */ |
| 590 |
< |
char *v1, *v2, *v3; |
| 589 |
> |
int |
| 590 |
> |
puttri( /* put out a triangle */ |
| 591 |
> |
char *v1, |
| 592 |
> |
char *v2, |
| 593 |
> |
char *v3 |
| 594 |
> |
) |
| 595 |
|
{ |
| 596 |
|
char *mod; |
| 597 |
|
VNDX v1i, v2i, v3i; |
| 598 |
|
BARYCCM bvecs; |
| 599 |
< |
int texOK, patOK; |
| 599 |
> |
RREAL bcoor[3][3]; |
| 600 |
> |
int texOK = 0, patOK; |
| 601 |
> |
int flatness; |
| 602 |
> |
register int i; |
| 603 |
|
|
| 604 |
|
if ((mod = getmtl()) == NULL) |
| 605 |
|
return(-1); |
| 607 |
|
if (!cvtndx(v1i, v1) || !cvtndx(v2i, v2) || !cvtndx(v3i, v3)) |
| 608 |
|
return(0); |
| 609 |
|
/* compute barycentric coordinates */ |
| 610 |
< |
texOK = !flatten && (v1i[2]>=0 && v2i[2]>=0 && v3i[2]>=0); |
| 610 |
> |
if (v1i[2]>=0 && v2i[2]>=0 && v3i[2]>=0) |
| 611 |
> |
flatness = flat_tri(vlist[v1i[0]], vlist[v2i[0]], vlist[v3i[0]], |
| 612 |
> |
vnlist[v1i[2]], vnlist[v2i[2]], vnlist[v3i[2]]); |
| 613 |
> |
else |
| 614 |
> |
flatness = ISFLAT; |
| 615 |
> |
|
| 616 |
> |
switch (flatness) { |
| 617 |
> |
case DEGEN: /* zero area */ |
| 618 |
> |
return(-1); |
| 619 |
> |
case RVFLAT: /* reversed normals, but flat */ |
| 620 |
> |
case ISFLAT: /* smoothing unnecessary */ |
| 621 |
> |
texOK = 0; |
| 622 |
> |
break; |
| 623 |
> |
case RVBENT: /* reversed normals with smoothing */ |
| 624 |
> |
case ISBENT: /* proper smoothing */ |
| 625 |
> |
texOK = 1; |
| 626 |
> |
break; |
| 627 |
> |
} |
| 628 |
> |
if (flatten) |
| 629 |
> |
texOK = 0; |
| 630 |
|
#ifdef TEXMAPS |
| 631 |
|
patOK = mapname[0] && (v1i[1]>=0 && v2i[1]>=0 && v3i[1]>=0); |
| 632 |
|
#else |
| 641 |
|
printf("\n%s texfunc %s\n", mod, TEXNAME); |
| 642 |
|
mod = TEXNAME; |
| 643 |
|
printf("4 dx dy dz %s\n", TCALNAME); |
| 644 |
< |
printf("0\n16 "); |
| 645 |
< |
put_baryc(&bvecs); |
| 646 |
< |
printf("\t%14.12g %14.12g %14.12g\n", |
| 647 |
< |
vnlist[v1i[2]][0], vnlist[v2i[2]][0], |
| 648 |
< |
vnlist[v3i[2]][0]); |
| 649 |
< |
printf("\t%14.12g %14.12g %14.12g\n", |
| 650 |
< |
vnlist[v1i[2]][1], vnlist[v2i[2]][1], |
| 597 |
< |
vnlist[v3i[2]][1]); |
| 598 |
< |
printf("\t%14.12g %14.12g %14.12g\n", |
| 599 |
< |
vnlist[v1i[2]][2], vnlist[v2i[2]][2], |
| 600 |
< |
vnlist[v3i[2]][2]); |
| 644 |
> |
printf("0\n"); |
| 645 |
> |
for (i = 0; i < 3; i++) { |
| 646 |
> |
bcoor[i][0] = vnlist[v1i[2]][i]; |
| 647 |
> |
bcoor[i][1] = vnlist[v2i[2]][i]; |
| 648 |
> |
bcoor[i][2] = vnlist[v3i[2]][i]; |
| 649 |
> |
} |
| 650 |
> |
put_baryc(&bvecs, bcoor, 3); |
| 651 |
|
} |
| 652 |
|
#ifdef TEXMAPS |
| 653 |
|
/* put out pattern (if any) */ |
| 655 |
|
printf("\n%s colorpict %s\n", mod, PATNAME); |
| 656 |
|
mod = PATNAME; |
| 657 |
|
printf("7 noneg noneg noneg %s %s u v\n", mapname, TCALNAME); |
| 658 |
< |
printf("0\n13 "); |
| 659 |
< |
put_baryc(&bvecs); |
| 660 |
< |
printf("\t%f %f %f\n", vtlist[v1i[1]][0], |
| 661 |
< |
vtlist[v2i[1]][0], vtlist[v3i[1]][0]); |
| 662 |
< |
printf("\t%f %f %f\n", vtlist[v1i[1]][1], |
| 663 |
< |
vtlist[v2i[1]][1], vtlist[v3i[1]][1]); |
| 658 |
> |
printf("0\n"); |
| 659 |
> |
for (i = 0; i < 2; i++) { |
| 660 |
> |
bcoor[i][0] = vtlist[v1i[1]][i]; |
| 661 |
> |
bcoor[i][1] = vtlist[v2i[1]][i]; |
| 662 |
> |
bcoor[i][2] = vtlist[v3i[1]][i]; |
| 663 |
> |
} |
| 664 |
> |
put_baryc(&bvecs, bcoor, 2); |
| 665 |
|
} |
| 666 |
|
#endif |
| 667 |
< |
/* put out triangle */ |
| 667 |
> |
/* put out (reversed) triangle */ |
| 668 |
|
printf("\n%s polygon %s.%d\n", mod, getonm(), faceno); |
| 669 |
|
printf("0\n0\n9\n"); |
| 670 |
< |
pvect(vlist[v1i[0]]); |
| 671 |
< |
pvect(vlist[v2i[0]]); |
| 672 |
< |
pvect(vlist[v3i[0]]); |
| 673 |
< |
|
| 670 |
> |
if (flatness == RVFLAT || flatness == RVBENT) { |
| 671 |
> |
pvect(vlist[v3i[0]]); |
| 672 |
> |
pvect(vlist[v2i[0]]); |
| 673 |
> |
pvect(vlist[v1i[0]]); |
| 674 |
> |
} else { |
| 675 |
> |
pvect(vlist[v1i[0]]); |
| 676 |
> |
pvect(vlist[v2i[0]]); |
| 677 |
> |
pvect(vlist[v3i[0]]); |
| 678 |
> |
} |
| 679 |
|
return(1); |
| 680 |
|
} |
| 681 |
|
|
| 682 |
|
|
| 683 |
< |
int |
| 684 |
< |
comp_baryc(bcm, v1, v2, v3) /* compute barycentric vectors */ |
| 629 |
< |
register BARYCCM *bcm; |
| 630 |
< |
FLOAT *v1, *v2, *v3; |
| 683 |
> |
void |
| 684 |
> |
freeverts(void) /* free all vertices */ |
| 685 |
|
{ |
| 632 |
– |
FLOAT *vt; |
| 633 |
– |
FVECT va, vab, vcb; |
| 634 |
– |
double d; |
| 635 |
– |
int ax0, ax1; |
| 636 |
– |
register int i, j; |
| 637 |
– |
/* compute major axis */ |
| 638 |
– |
for (i = 0; i < 3; i++) { |
| 639 |
– |
vab[i] = v1[i] - v2[i]; |
| 640 |
– |
vcb[i] = v3[i] - v2[i]; |
| 641 |
– |
} |
| 642 |
– |
fcross(va, vab, vcb); |
| 643 |
– |
bcm->ax = ABS(va[0]) > ABS(va[1]) ? 0 : 1; |
| 644 |
– |
bcm->ax = ABS(va[bcm->ax]) > ABS(va[2]) ? bcm->ax : 2; |
| 645 |
– |
ax0 = (bcm->ax + 1) % 3; |
| 646 |
– |
ax1 = (bcm->ax + 2) % 3; |
| 647 |
– |
for (j = 0; j < 2; j++) { |
| 648 |
– |
vab[0] = v1[ax0] - v2[ax0]; |
| 649 |
– |
vcb[0] = v3[ax0] - v2[ax0]; |
| 650 |
– |
vab[1] = v1[ax1] - v2[ax1]; |
| 651 |
– |
vcb[1] = v3[ax1] - v2[ax1]; |
| 652 |
– |
d = vcb[0]*vcb[0] + vcb[1]*vcb[1]; |
| 653 |
– |
if (d <= FTINY) |
| 654 |
– |
return(-1); |
| 655 |
– |
d = (vcb[0]*vab[0]+vcb[1]*vab[1])/d; |
| 656 |
– |
va[0] = vab[0] - vcb[0]*d; |
| 657 |
– |
va[1] = vab[1] - vcb[1]*d; |
| 658 |
– |
d = va[0]*va[0] + va[1]*va[1]; |
| 659 |
– |
if (d <= FTINY) |
| 660 |
– |
return(-1); |
| 661 |
– |
bcm->tm[j][0] = va[0] /= d; |
| 662 |
– |
bcm->tm[j][1] = va[1] /= d; |
| 663 |
– |
bcm->tm[j][2] = -(v2[ax0]*va[0]+v2[ax1]*va[1]); |
| 664 |
– |
/* rotate vertices */ |
| 665 |
– |
vt = v1; |
| 666 |
– |
v1 = v2; |
| 667 |
– |
v2 = v3; |
| 668 |
– |
v3 = vt; |
| 669 |
– |
} |
| 670 |
– |
return(0); |
| 671 |
– |
} |
| 672 |
– |
|
| 673 |
– |
|
| 674 |
– |
put_baryc(bcm) /* put barycentric coord. vectors */ |
| 675 |
– |
register BARYCCM *bcm; |
| 676 |
– |
{ |
| 677 |
– |
printf("\t%d\n", bcm->ax); |
| 678 |
– |
printf("%14.8f %14.8f %14.8f\n", |
| 679 |
– |
bcm->tm[0][0], bcm->tm[0][1], bcm->tm[0][2]); |
| 680 |
– |
printf("%14.8f %14.8f %14.8f\n", |
| 681 |
– |
bcm->tm[1][0], bcm->tm[1][1], bcm->tm[1][2]); |
| 682 |
– |
} |
| 683 |
– |
|
| 684 |
– |
|
| 685 |
– |
freeverts() /* free all vertices */ |
| 686 |
– |
{ |
| 686 |
|
if (nvs) { |
| 687 |
< |
free((char *)vlist); |
| 687 |
> |
free((void *)vlist); |
| 688 |
|
nvs = 0; |
| 689 |
|
} |
| 690 |
|
if (nvts) { |
| 691 |
< |
free((char *)vtlist); |
| 691 |
> |
free((void *)vtlist); |
| 692 |
|
nvts = 0; |
| 693 |
|
} |
| 694 |
|
if (nvns) { |
| 695 |
< |
free((char *)vnlist); |
| 695 |
> |
free((void *)vnlist); |
| 696 |
|
nvns = 0; |
| 697 |
|
} |
| 698 |
|
} |
| 699 |
|
|
| 700 |
|
|
| 701 |
|
int |
| 702 |
< |
newv(x, y, z) /* create a new vertex */ |
| 703 |
< |
double x, y, z; |
| 702 |
> |
newv( /* create a new vertex */ |
| 703 |
> |
double x, |
| 704 |
> |
double y, |
| 705 |
> |
double z |
| 706 |
> |
) |
| 707 |
|
{ |
| 708 |
|
if (!(nvs%CHUNKSIZ)) { /* allocate next block */ |
| 709 |
|
if (nvs == 0) |
| 710 |
|
vlist = (FVECT *)malloc(CHUNKSIZ*sizeof(FVECT)); |
| 711 |
|
else |
| 712 |
< |
vlist = (FVECT *)realloc((char *)vlist, |
| 712 |
> |
vlist = (FVECT *)realloc((void *)vlist, |
| 713 |
|
(nvs+CHUNKSIZ)*sizeof(FVECT)); |
| 714 |
|
if (vlist == NULL) { |
| 715 |
|
fprintf(stderr, |
| 726 |
|
|
| 727 |
|
|
| 728 |
|
int |
| 729 |
< |
newvn(x, y, z) /* create a new vertex normal */ |
| 730 |
< |
double x, y, z; |
| 729 |
> |
newvn( /* create a new vertex normal */ |
| 730 |
> |
double x, |
| 731 |
> |
double y, |
| 732 |
> |
double z |
| 733 |
> |
) |
| 734 |
|
{ |
| 735 |
|
if (!(nvns%CHUNKSIZ)) { /* allocate next block */ |
| 736 |
|
if (nvns == 0) |
| 737 |
|
vnlist = (FVECT *)malloc(CHUNKSIZ*sizeof(FVECT)); |
| 738 |
|
else |
| 739 |
< |
vnlist = (FVECT *)realloc((char *)vnlist, |
| 739 |
> |
vnlist = (FVECT *)realloc((void *)vnlist, |
| 740 |
|
(nvns+CHUNKSIZ)*sizeof(FVECT)); |
| 741 |
|
if (vnlist == NULL) { |
| 742 |
|
fprintf(stderr, |
| 755 |
|
|
| 756 |
|
|
| 757 |
|
int |
| 758 |
< |
newvt(x, y) /* create a new texture map vertex */ |
| 759 |
< |
double x, y; |
| 758 |
> |
newvt( /* create a new texture map vertex */ |
| 759 |
> |
double x, |
| 760 |
> |
double y |
| 761 |
> |
) |
| 762 |
|
{ |
| 763 |
|
if (!(nvts%CHUNKSIZ)) { /* allocate next block */ |
| 764 |
|
if (nvts == 0) |
| 765 |
< |
vtlist = (FLOAT (*)[2])malloc(CHUNKSIZ*2*sizeof(FLOAT)); |
| 765 |
> |
vtlist = (RREAL (*)[2])malloc(CHUNKSIZ*2*sizeof(RREAL)); |
| 766 |
|
else |
| 767 |
< |
vtlist = (FLOAT (*)[2])realloc((char *)vtlist, |
| 768 |
< |
(nvts+CHUNKSIZ)*2*sizeof(FLOAT)); |
| 767 |
> |
vtlist = (RREAL (*)[2])realloc((void *)vtlist, |
| 768 |
> |
(nvts+CHUNKSIZ)*2*sizeof(RREAL)); |
| 769 |
|
if (vtlist == NULL) { |
| 770 |
|
fprintf(stderr, |
| 771 |
|
"Out of memory while allocating texture vertex %d\n", |
| 780 |
|
} |
| 781 |
|
|
| 782 |
|
|
| 783 |
< |
syntax(er) /* report syntax error and exit */ |
| 784 |
< |
char *er; |
| 783 |
> |
void |
| 784 |
> |
syntax( /* report syntax error and exit */ |
| 785 |
> |
char *er |
| 786 |
> |
) |
| 787 |
|
{ |
| 788 |
|
fprintf(stderr, "%s: Wavefront syntax error near line %d: %s\n", |
| 789 |
|
inpfile, lineno, er); |