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. |
5 |
> |
* Convert a Wavefront .OBJ file to Radiance format. |
6 |
|
* |
7 |
|
* Currently, we support only polygonal geometry. Non-planar |
8 |
|
* faces are broken rather haphazardly into triangles. |
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 <ctype.h> |
15 |
|
|
16 |
+ |
#include "rtmath.h" |
17 |
+ |
#include "rtio.h" |
18 |
+ |
#include "resolu.h" |
19 |
|
#include "trans.h" |
20 |
+ |
#include "tmesh.h" |
21 |
|
|
20 |
– |
#include <ctype.h> |
22 |
|
|
22 |
– |
#define TCALNAME "tmesh.cal" /* triangle interp. file */ |
23 |
|
#define PATNAME "M-pat" /* mesh pattern name (reused) */ |
24 |
|
#define TEXNAME "M-nor" /* mesh texture name (reused) */ |
25 |
|
#define DEFOBJ "unnamed" /* default object name */ |
26 |
|
#define DEFMAT "white" /* default material name */ |
27 |
|
|
28 |
< |
#define ABS(x) ((x)>=0 ? (x) : -(x)) |
28 |
> |
#define pvect(v) printf(" %18.12g %18.12g %18.12g\n",(v)[0],(v)[1],(v)[2]) |
29 |
|
|
30 |
– |
#define pvect(v) printf("%18.12g %18.12g %18.12g\n",(v)[0],(v)[1],(v)[2]) |
31 |
– |
|
30 |
|
FVECT *vlist; /* our vertex list */ |
31 |
|
int nvs; /* number of vertices in our list */ |
32 |
|
FVECT *vnlist; /* vertex normal list */ |
33 |
|
int nvns; |
34 |
< |
FLOAT (*vtlist)[2]; /* map vertex list */ |
34 |
> |
RREAL (*vtlist)[2]; /* map vertex list */ |
35 |
|
int nvts; |
36 |
|
|
37 |
< |
typedef struct { |
38 |
< |
int ax; /* major axis */ |
41 |
< |
FLOAT tm[2][3]; /* transformation */ |
42 |
< |
} BARYCCM; |
37 |
> |
int ndegen = 0; /* count of degenerate faces */ |
38 |
> |
int n0norm = 0; /* count of zero normals */ |
39 |
|
|
40 |
|
typedef int VNDX[3]; /* vertex index (point,map,normal) */ |
41 |
|
|
42 |
< |
#define CHUNKSIZ 256 /* vertex allocation chunk size */ |
42 |
> |
#define CHUNKSIZ 1024 /* vertex allocation chunk size */ |
43 |
|
|
44 |
< |
#define MAXARG 64 /* maximum # arguments in a statement */ |
44 |
> |
#define MAXARG 512 /* maximum # arguments in a statement */ |
45 |
|
|
46 |
|
/* qualifiers */ |
47 |
|
#define Q_MTL 0 |
70 |
|
|
71 |
|
int flatten = 0; /* discard surface normal information */ |
72 |
|
|
73 |
< |
char *getmtl(), *getonm(); |
74 |
< |
|
75 |
< |
char mapname[128]; /* current picture file */ |
76 |
< |
char matname[64]; /* current material name */ |
81 |
< |
char group[16][32]; /* current group names */ |
82 |
< |
char objname[128]; /* current object name */ |
73 |
> |
char mapname[256]; /* current picture file */ |
74 |
> |
char matname[256]; /* current material name */ |
75 |
> |
char group[8][256]; /* current group name(s) */ |
76 |
> |
char objname[256]; /* current object name */ |
77 |
|
char *inpfile; /* input file name */ |
78 |
|
int lineno; /* current line number */ |
79 |
|
int faceno; /* current face number */ |
80 |
|
|
81 |
+ |
static void getnames(FILE *fp); |
82 |
+ |
static void convert(FILE *fp); |
83 |
+ |
static int getstmt(char *av[MAXARG], FILE *fp); |
84 |
+ |
static char * getmtl(void); |
85 |
+ |
static char * getonm(void); |
86 |
+ |
static int matchrule(RULEHD *rp); |
87 |
+ |
static int cvtndx(VNDX vi, char *vs); |
88 |
+ |
static int nonplanar(int ac, char **av); |
89 |
+ |
static int putface(int ac, char **av); |
90 |
+ |
static int puttri(char *v1, char *v2, char *v3); |
91 |
+ |
static void freeverts(void); |
92 |
+ |
static int newv(double x, double y, double z); |
93 |
+ |
static int newvn(double x, double y, double z); |
94 |
+ |
static int newvt(double x, double y); |
95 |
+ |
static void syntax(char *er); |
96 |
|
|
97 |
< |
main(argc, argv) /* read in .obj file and convert */ |
98 |
< |
int argc; |
99 |
< |
char *argv[]; |
97 |
> |
|
98 |
> |
int |
99 |
> |
main( /* read in .OBJ file and convert */ |
100 |
> |
int argc, |
101 |
> |
char *argv[] |
102 |
> |
) |
103 |
|
{ |
104 |
|
int donames = 0; |
105 |
|
int i; |
121 |
|
default: |
122 |
|
goto userr; |
123 |
|
} |
124 |
< |
if (i > argc | i < argc-1) |
124 |
> |
if ((i > argc) | (i < argc-1)) |
125 |
|
goto userr; |
126 |
|
if (i == argc) |
127 |
|
inpfile = "<stdin>"; |
142 |
|
printargs(argc, argv, stdout); |
143 |
|
convert(stdin); |
144 |
|
} |
145 |
+ |
if (ndegen) |
146 |
+ |
printf("# %d degenerate faces\n", ndegen); |
147 |
+ |
if (n0norm) |
148 |
+ |
printf("# %d invalid (zero) normals\n", n0norm); |
149 |
|
exit(0); |
150 |
|
userr: |
151 |
|
fprintf(stderr, "Usage: %s [-o obj][-m mapping][-n][-f] [file.obj]\n", |
154 |
|
} |
155 |
|
|
156 |
|
|
157 |
< |
getnames(fp) /* get valid qualifier names */ |
158 |
< |
FILE *fp; |
157 |
> |
void |
158 |
> |
getnames( /* get valid qualifier names */ |
159 |
> |
FILE *fp |
160 |
> |
) |
161 |
|
{ |
162 |
|
char *argv[MAXARG]; |
163 |
|
int argc; |
164 |
|
ID tmpid; |
165 |
< |
register int i; |
165 |
> |
int i; |
166 |
|
|
167 |
< |
while (argc = getstmt(argv, fp)) |
167 |
> |
while ( (argc = getstmt(argv, fp)) ) |
168 |
|
switch (argv[0][0]) { |
169 |
|
case 'f': /* face */ |
170 |
|
if (!argv[0][1]) |
205 |
|
} |
206 |
|
|
207 |
|
|
208 |
< |
convert(fp) /* convert a T-mesh */ |
209 |
< |
FILE *fp; |
208 |
> |
void |
209 |
> |
convert( /* convert an OBJ stream */ |
210 |
> |
FILE *fp |
211 |
> |
) |
212 |
|
{ |
213 |
|
char *argv[MAXARG]; |
214 |
|
int argc; |
215 |
|
int nstats, nunknown; |
216 |
< |
register int i; |
216 |
> |
int i; |
217 |
|
|
218 |
|
nstats = nunknown = 0; |
219 |
|
/* scan until EOF */ |
220 |
< |
while (argc = getstmt(argv, fp)) { |
220 |
> |
while ( (argc = getstmt(argv, fp)) ) { |
221 |
|
switch (argv[0][0]) { |
222 |
|
case 'v': /* vertex */ |
223 |
|
switch (argv[0][1]) { |
276 |
|
if (!strcmp(argv[1], "off")) |
277 |
|
mapname[0] = '\0'; |
278 |
|
else |
279 |
< |
sprintf(mapname, "%s.pic", argv[1]); |
279 |
> |
sprintf(mapname, "%s.hdr", argv[1]); |
280 |
|
} else |
281 |
|
goto unknown; |
282 |
|
break; |
292 |
|
goto unknown; |
293 |
|
for (i = 1; i < argc; i++) |
294 |
|
strcpy(group[i-1], argv[i]); |
295 |
< |
group[i-1][0] = '\0'; |
295 |
> |
group[argc-1][0] = '\0'; |
296 |
|
break; |
297 |
|
case '#': /* comment */ |
298 |
|
printargs(argc, argv, stdout); |
311 |
|
|
312 |
|
|
313 |
|
int |
314 |
< |
getstmt(av, fp) /* read the next statement from fp */ |
315 |
< |
register char *av[MAXARG]; |
316 |
< |
FILE *fp; |
314 |
> |
getstmt( /* read the next statement from fp */ |
315 |
> |
char *av[MAXARG], |
316 |
> |
FILE *fp |
317 |
> |
) |
318 |
|
{ |
319 |
< |
extern char *fgetline(); |
320 |
< |
static char sbuf[MAXARG*10]; |
321 |
< |
register char *cp; |
301 |
< |
register int i; |
319 |
> |
static char sbuf[MAXARG*16]; |
320 |
> |
char *cp; |
321 |
> |
int i; |
322 |
|
|
323 |
|
do { |
324 |
|
if (fgetline(cp=sbuf, sizeof(sbuf), fp) == NULL) |
330 |
|
lineno++; |
331 |
|
*cp++ = '\0'; |
332 |
|
} |
333 |
< |
if (!*cp || i >= MAXARG-1) |
333 |
> |
if (!*cp) |
334 |
|
break; |
335 |
+ |
if (i >= MAXARG-1) { |
336 |
+ |
fprintf(stderr, |
337 |
+ |
"warning: line %d: too many arguments (limit %d)\n", |
338 |
+ |
lineno+1, MAXARG-1); |
339 |
+ |
break; |
340 |
+ |
} |
341 |
|
av[i++] = cp; |
342 |
|
while (*++cp && !isspace(*cp)) |
343 |
|
; |
351 |
|
|
352 |
|
|
353 |
|
char * |
354 |
< |
getmtl() /* figure material for this face */ |
354 |
> |
getmtl(void) /* figure material for this face */ |
355 |
|
{ |
356 |
< |
register RULEHD *rp = ourmapping; |
356 |
> |
RULEHD *rp = ourmapping; |
357 |
|
|
358 |
|
if (rp == NULL) { /* no rule set */ |
359 |
|
if (matname[0]) |
377 |
|
|
378 |
|
|
379 |
|
char * |
380 |
< |
getonm() /* invent a good name for object */ |
380 |
> |
getonm(void) /* invent a good name for object */ |
381 |
|
{ |
382 |
|
static char name[64]; |
383 |
< |
register char *cp1, *cp2; |
384 |
< |
register int i; |
383 |
> |
char *cp1, *cp2; |
384 |
> |
int i; |
385 |
|
/* check for preset */ |
386 |
|
if (objname[0]) |
387 |
|
return(objname); |
392 |
|
cp2 = group[i]; |
393 |
|
if (cp1 > name) |
394 |
|
*cp1++ = '.'; |
395 |
< |
while (*cp1 = *cp2++) |
395 |
> |
while ( (*cp1 = *cp2++) ) |
396 |
|
if (++cp1 >= name+sizeof(name)-2) { |
397 |
|
*cp1 = '\0'; |
398 |
|
return(name); |
402 |
|
} |
403 |
|
|
404 |
|
|
405 |
< |
matchrule(rp) /* check for a match on this rule */ |
406 |
< |
register RULEHD *rp; |
405 |
> |
int |
406 |
> |
matchrule( /* check for a match on this rule */ |
407 |
> |
RULEHD *rp |
408 |
> |
) |
409 |
|
{ |
410 |
|
ID tmpid; |
411 |
|
int gotmatch; |
412 |
< |
register int i; |
412 |
> |
int i; |
413 |
|
|
414 |
|
if (rp->qflg & FL(Q_MTL)) { |
415 |
|
if (!matname[0]) |
455 |
|
} |
456 |
|
|
457 |
|
|
458 |
< |
cvtndx(vi, vs) /* convert vertex string to index */ |
459 |
< |
register VNDX vi; |
460 |
< |
register char *vs; |
458 |
> |
int |
459 |
> |
cvtndx( /* convert vertex string to index */ |
460 |
> |
VNDX vi, |
461 |
> |
char *vs |
462 |
> |
) |
463 |
|
{ |
464 |
|
/* get point */ |
465 |
|
vi[0] = atoi(vs); |
500 |
|
return(0); |
501 |
|
} else |
502 |
|
vi[2] = -1; |
503 |
+ |
/* zero normal is not normal */ |
504 |
+ |
if (vi[2] >= 0 && DOT(vnlist[vi[2]],vnlist[vi[2]]) <= FTINY) |
505 |
+ |
vi[2] = -1; |
506 |
|
return(1); |
507 |
|
} |
508 |
|
|
509 |
|
|
510 |
< |
nonplanar(ac, av) /* are vertices non-planar? */ |
511 |
< |
register int ac; |
512 |
< |
register char **av; |
510 |
> |
int |
511 |
> |
nonplanar( /* are vertices non-planar? */ |
512 |
> |
int ac, |
513 |
> |
char **av |
514 |
> |
) |
515 |
|
{ |
516 |
|
VNDX vi; |
517 |
< |
FLOAT *p0, *p1; |
517 |
> |
RREAL *p0, *p1; |
518 |
|
FVECT v1, v2, nsum, newn; |
519 |
|
double d; |
520 |
< |
register int i; |
520 |
> |
int i; |
521 |
|
|
522 |
|
if (!cvtndx(vi, av[0])) |
523 |
|
return(0); |
560 |
|
} |
561 |
|
|
562 |
|
|
563 |
< |
putface(ac, av) /* put out an N-sided polygon */ |
564 |
< |
int ac; |
565 |
< |
register char **av; |
563 |
> |
int |
564 |
> |
putface( /* put out an N-sided polygon */ |
565 |
> |
int ac, |
566 |
> |
char **av |
567 |
> |
) |
568 |
|
{ |
569 |
|
VNDX vi; |
570 |
|
char *cp; |
571 |
< |
register int i; |
571 |
> |
int i; |
572 |
|
|
573 |
|
if (nonplanar(ac, av)) { /* break into triangles */ |
574 |
|
while (ac > 2) { |
595 |
|
} |
596 |
|
|
597 |
|
|
598 |
< |
puttri(v1, v2, v3) /* put out a triangle */ |
599 |
< |
char *v1, *v2, *v3; |
598 |
> |
int |
599 |
> |
puttri( /* put out a triangle */ |
600 |
> |
char *v1, |
601 |
> |
char *v2, |
602 |
> |
char *v3 |
603 |
> |
) |
604 |
|
{ |
605 |
|
char *mod; |
606 |
|
VNDX v1i, v2i, v3i; |
607 |
|
BARYCCM bvecs; |
608 |
< |
FVECT bcoor[3]; |
609 |
< |
int texOK, patOK; |
610 |
< |
register int i; |
608 |
> |
RREAL bcoor[3][3]; |
609 |
> |
int texOK = 0, patOK; |
610 |
> |
int flatness; |
611 |
> |
int i; |
612 |
|
|
613 |
|
if ((mod = getmtl()) == NULL) |
614 |
|
return(-1); |
616 |
|
if (!cvtndx(v1i, v1) || !cvtndx(v2i, v2) || !cvtndx(v3i, v3)) |
617 |
|
return(0); |
618 |
|
/* compute barycentric coordinates */ |
619 |
< |
texOK = !flatten && (v1i[2]>=0 && v2i[2]>=0 && v3i[2]>=0); |
619 |
> |
if (v1i[2]>=0 && v2i[2]>=0 && v3i[2]>=0) |
620 |
> |
flatness = flat_tri(vlist[v1i[0]], vlist[v2i[0]], vlist[v3i[0]], |
621 |
> |
vnlist[v1i[2]], vnlist[v2i[2]], vnlist[v3i[2]]); |
622 |
> |
else |
623 |
> |
flatness = ISFLAT; |
624 |
> |
|
625 |
> |
switch (flatness) { |
626 |
> |
case DEGEN: /* zero area */ |
627 |
> |
ndegen++; |
628 |
> |
return(-1); |
629 |
> |
case RVFLAT: /* reversed normals, but flat */ |
630 |
> |
case ISFLAT: /* smoothing unnecessary */ |
631 |
> |
texOK = 0; |
632 |
> |
break; |
633 |
> |
case RVBENT: /* reversed normals with smoothing */ |
634 |
> |
case ISBENT: /* proper smoothing */ |
635 |
> |
texOK = 1; |
636 |
> |
break; |
637 |
> |
} |
638 |
> |
if (flatten) |
639 |
> |
texOK = 0; |
640 |
|
#ifdef TEXMAPS |
641 |
|
patOK = mapname[0] && (v1i[1]>=0 && v2i[1]>=0 && v3i[1]>=0); |
642 |
|
#else |
645 |
|
if (texOK | patOK) |
646 |
|
if (comp_baryc(&bvecs, vlist[v1i[0]], vlist[v2i[0]], |
647 |
|
vlist[v3i[0]]) < 0) |
648 |
< |
return(-1); |
648 |
> |
texOK = patOK = 0; |
649 |
|
/* put out texture (if any) */ |
650 |
|
if (texOK) { |
651 |
|
printf("\n%s texfunc %s\n", mod, TEXNAME); |
657 |
|
bcoor[i][1] = vnlist[v2i[2]][i]; |
658 |
|
bcoor[i][2] = vnlist[v3i[2]][i]; |
659 |
|
} |
660 |
< |
put_baryc(&bvecs, bcoor, 3); |
660 |
> |
fput_baryc(&bvecs, bcoor, 3, stdout); |
661 |
|
} |
662 |
|
#ifdef TEXMAPS |
663 |
|
/* put out pattern (if any) */ |
671 |
|
bcoor[i][1] = vtlist[v2i[1]][i]; |
672 |
|
bcoor[i][2] = vtlist[v3i[1]][i]; |
673 |
|
} |
674 |
< |
put_baryc(&bvecs, bcoor, 2); |
674 |
> |
fput_baryc(&bvecs, bcoor, 2, stdout); |
675 |
|
} |
676 |
|
#endif |
677 |
< |
/* put out triangle */ |
677 |
> |
/* put out (reversed) triangle */ |
678 |
|
printf("\n%s polygon %s.%d\n", mod, getonm(), faceno); |
679 |
|
printf("0\n0\n9\n"); |
680 |
< |
pvect(vlist[v1i[0]]); |
681 |
< |
pvect(vlist[v2i[0]]); |
682 |
< |
pvect(vlist[v3i[0]]); |
683 |
< |
|
680 |
> |
if (flatness == RVFLAT || flatness == RVBENT) { |
681 |
> |
pvect(vlist[v3i[0]]); |
682 |
> |
pvect(vlist[v2i[0]]); |
683 |
> |
pvect(vlist[v1i[0]]); |
684 |
> |
} else { |
685 |
> |
pvect(vlist[v1i[0]]); |
686 |
> |
pvect(vlist[v2i[0]]); |
687 |
> |
pvect(vlist[v3i[0]]); |
688 |
> |
} |
689 |
|
return(1); |
690 |
|
} |
691 |
|
|
692 |
|
|
693 |
< |
int |
694 |
< |
comp_baryc(bcm, v1, v2, v3) /* compute barycentric vectors */ |
628 |
< |
register BARYCCM *bcm; |
629 |
< |
FLOAT *v1, *v2, *v3; |
693 |
> |
void |
694 |
> |
freeverts(void) /* free all vertices */ |
695 |
|
{ |
631 |
– |
FLOAT *vt; |
632 |
– |
FVECT va, vab, vcb; |
633 |
– |
double d; |
634 |
– |
int ax0, ax1; |
635 |
– |
register int i, j; |
636 |
– |
/* compute major axis */ |
637 |
– |
for (i = 0; i < 3; i++) { |
638 |
– |
vab[i] = v1[i] - v2[i]; |
639 |
– |
vcb[i] = v3[i] - v2[i]; |
640 |
– |
} |
641 |
– |
fcross(va, vab, vcb); |
642 |
– |
bcm->ax = ABS(va[0]) > ABS(va[1]) ? 0 : 1; |
643 |
– |
bcm->ax = ABS(va[bcm->ax]) > ABS(va[2]) ? bcm->ax : 2; |
644 |
– |
ax0 = (bcm->ax + 1) % 3; |
645 |
– |
ax1 = (bcm->ax + 2) % 3; |
646 |
– |
for (j = 0; j < 2; j++) { |
647 |
– |
vab[0] = v1[ax0] - v2[ax0]; |
648 |
– |
vcb[0] = v3[ax0] - v2[ax0]; |
649 |
– |
vab[1] = v1[ax1] - v2[ax1]; |
650 |
– |
vcb[1] = v3[ax1] - v2[ax1]; |
651 |
– |
d = vcb[0]*vcb[0] + vcb[1]*vcb[1]; |
652 |
– |
if (d <= FTINY) |
653 |
– |
return(-1); |
654 |
– |
d = (vcb[0]*vab[0]+vcb[1]*vab[1])/d; |
655 |
– |
va[0] = vab[0] - vcb[0]*d; |
656 |
– |
va[1] = vab[1] - vcb[1]*d; |
657 |
– |
d = va[0]*va[0] + va[1]*va[1]; |
658 |
– |
if (d <= FTINY) |
659 |
– |
return(-1); |
660 |
– |
bcm->tm[j][0] = va[0] /= d; |
661 |
– |
bcm->tm[j][1] = va[1] /= d; |
662 |
– |
bcm->tm[j][2] = -(v2[ax0]*va[0]+v2[ax1]*va[1]); |
663 |
– |
/* rotate vertices */ |
664 |
– |
vt = v1; |
665 |
– |
v1 = v2; |
666 |
– |
v2 = v3; |
667 |
– |
v3 = vt; |
668 |
– |
} |
669 |
– |
return(0); |
670 |
– |
} |
671 |
– |
|
672 |
– |
|
673 |
– |
put_baryc(bcm, com, n) /* put barycentric coord. vectors */ |
674 |
– |
register BARYCCM *bcm; |
675 |
– |
register FVECT com[]; |
676 |
– |
int n; |
677 |
– |
{ |
678 |
– |
double a, b; |
679 |
– |
register int i, j; |
680 |
– |
|
681 |
– |
printf("%d\t%d\n", 1+3*n, bcm->ax); |
682 |
– |
for (i = 0; i < n; i++) { |
683 |
– |
a = com[i][0] - com[i][2]; |
684 |
– |
b = com[i][1] - com[i][2]; |
685 |
– |
printf("%14.8f %14.8f %14.8f\n", |
686 |
– |
bcm->tm[0][0]*a + bcm->tm[1][0]*b, |
687 |
– |
bcm->tm[0][1]*a + bcm->tm[1][1]*b, |
688 |
– |
bcm->tm[0][2]*a + bcm->tm[1][2]*b + com[i][2]); |
689 |
– |
} |
690 |
– |
} |
691 |
– |
|
692 |
– |
|
693 |
– |
freeverts() /* free all vertices */ |
694 |
– |
{ |
696 |
|
if (nvs) { |
697 |
< |
free((char *)vlist); |
697 |
> |
free((void *)vlist); |
698 |
|
nvs = 0; |
699 |
|
} |
700 |
|
if (nvts) { |
701 |
< |
free((char *)vtlist); |
701 |
> |
free((void *)vtlist); |
702 |
|
nvts = 0; |
703 |
|
} |
704 |
|
if (nvns) { |
705 |
< |
free((char *)vnlist); |
705 |
> |
free((void *)vnlist); |
706 |
|
nvns = 0; |
707 |
|
} |
708 |
|
} |
709 |
|
|
710 |
|
|
711 |
|
int |
712 |
< |
newv(x, y, z) /* create a new vertex */ |
713 |
< |
double x, y, z; |
712 |
> |
newv( /* create a new vertex */ |
713 |
> |
double x, |
714 |
> |
double y, |
715 |
> |
double z |
716 |
> |
) |
717 |
|
{ |
718 |
|
if (!(nvs%CHUNKSIZ)) { /* allocate next block */ |
719 |
|
if (nvs == 0) |
720 |
|
vlist = (FVECT *)malloc(CHUNKSIZ*sizeof(FVECT)); |
721 |
|
else |
722 |
< |
vlist = (FVECT *)realloc((char *)vlist, |
722 |
> |
vlist = (FVECT *)realloc((void *)vlist, |
723 |
|
(nvs+CHUNKSIZ)*sizeof(FVECT)); |
724 |
|
if (vlist == NULL) { |
725 |
|
fprintf(stderr, |
736 |
|
|
737 |
|
|
738 |
|
int |
739 |
< |
newvn(x, y, z) /* create a new vertex normal */ |
740 |
< |
double x, y, z; |
739 |
> |
newvn( /* create a new vertex normal */ |
740 |
> |
double x, |
741 |
> |
double y, |
742 |
> |
double z |
743 |
> |
) |
744 |
|
{ |
745 |
|
if (!(nvns%CHUNKSIZ)) { /* allocate next block */ |
746 |
|
if (nvns == 0) |
747 |
|
vnlist = (FVECT *)malloc(CHUNKSIZ*sizeof(FVECT)); |
748 |
|
else |
749 |
< |
vnlist = (FVECT *)realloc((char *)vnlist, |
749 |
> |
vnlist = (FVECT *)realloc((void *)vnlist, |
750 |
|
(nvns+CHUNKSIZ)*sizeof(FVECT)); |
751 |
|
if (vnlist == NULL) { |
752 |
|
fprintf(stderr, |
758 |
|
vnlist[nvns][0] = x; |
759 |
|
vnlist[nvns][1] = y; |
760 |
|
vnlist[nvns][2] = z; |
761 |
< |
if (normalize(vnlist[nvns]) == 0.0) |
755 |
< |
return(0); |
761 |
> |
n0norm += (normalize(vnlist[nvns]) == 0.0); |
762 |
|
return(++nvns); |
763 |
|
} |
764 |
|
|
765 |
|
|
766 |
|
int |
767 |
< |
newvt(x, y) /* create a new texture map vertex */ |
768 |
< |
double x, y; |
767 |
> |
newvt( /* create a new texture map vertex */ |
768 |
> |
double x, |
769 |
> |
double y |
770 |
> |
) |
771 |
|
{ |
772 |
|
if (!(nvts%CHUNKSIZ)) { /* allocate next block */ |
773 |
|
if (nvts == 0) |
774 |
< |
vtlist = (FLOAT (*)[2])malloc(CHUNKSIZ*2*sizeof(FLOAT)); |
774 |
> |
vtlist = (RREAL (*)[2])malloc(CHUNKSIZ*2*sizeof(RREAL)); |
775 |
|
else |
776 |
< |
vtlist = (FLOAT (*)[2])realloc((char *)vtlist, |
777 |
< |
(nvts+CHUNKSIZ)*2*sizeof(FLOAT)); |
776 |
> |
vtlist = (RREAL (*)[2])realloc((void *)vtlist, |
777 |
> |
(nvts+CHUNKSIZ)*2*sizeof(RREAL)); |
778 |
|
if (vtlist == NULL) { |
779 |
|
fprintf(stderr, |
780 |
|
"Out of memory while allocating texture vertex %d\n", |
789 |
|
} |
790 |
|
|
791 |
|
|
792 |
< |
syntax(er) /* report syntax error and exit */ |
793 |
< |
char *er; |
792 |
> |
void |
793 |
> |
syntax( /* report syntax error and exit */ |
794 |
> |
char *er |
795 |
> |
) |
796 |
|
{ |
797 |
|
fprintf(stderr, "%s: Wavefront syntax error near line %d: %s\n", |
798 |
|
inpfile, lineno, er); |