[ViewVC] Diff of: radiance/ray/src/cv/obj2rad.c

Comparing ray/src/cv/obj2rad.c (file contents):
Revision 2.6 by greg, Thu Apr 14 04:29:10 1994 UTC vs.
Revision 2.28 by greg, Tue Aug 20 16:19:03 2013 UTC

#	Line 1 \| Line 1
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.
9		* Also, texture map indices only work for triangles, though
10	<	* I'm not sure they work correctly.
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 */
23	–	#define QCALNAME "surf.cal" /* quad 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
29	–	#define ABS(x) ((x)>=0 ? (x) : -(x))
30	–
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
38	<	typedef FLOAT BARYCCM[3][4]; /* barycentric coordinate system */
38	>	int ndegen = 0; /* count of degenerate faces */
39	>	int n0norm = 0; /* count of zero normals */
40
41		typedef int VNDX[3]; /* vertex index (point,map,normal) */
42
43	<	#define CHUNKSIZ 256 /* vertex allocation chunk size */
43	>	#define CHUNKSIZ 1024 /* vertex allocation chunk size */
44
45	<	#define MAXARG 64 /* maximum # arguments in a statement */
45	>	#define MAXARG 512 /* maximum # arguments in a statement */
46
47		/* qualifiers */
48		#define Q_MTL 0
#	Line 70 \| Line 69 \| *RULEHD ourmapping = NULL;**
69		char defmat = DEFMAT; / default (starting) material name */
70		char defobj = DEFOBJ; / default (starting) object name */
71
72	<	char getmtl(), getonm();
72	>	int flatten = 0; /* discard surface normal information */
73
74		char mapname[128]; /* current picture file */
75		char matname[64]; /* current material name */
76	<	char group[16][32]; /* current group names */
76	>	char group[8][256]; /* current group name(s) */
77		char objname[128]; /* current object name */
78		char inpfile; / input file name */
79		int lineno; /* current line number */
80		int faceno; /* current face number */
81
82	+	static void getnames(FILE *fp);
83	+	static void convert(FILE *fp);
84	+	static int getstmt(char av[MAXARG], FILE fp);
85	+	static char * getmtl(void);
86	+	static char * getonm(void);
87	+	static int matchrule(RULEHD *rp);
88	+	static int cvtndx(VNDX vi, char *vs);
89	+	static int nonplanar(int ac, char **av);
90	+	static int putface(int ac, char **av);
91	+	static int puttri(char v1, char v2, char *v3);
92	+	static void freeverts(void);
93	+	static int newv(double x, double y, double z);
94	+	static int newvn(double x, double y, double z);
95	+	static int newvt(double x, double y);
96	+	static void syntax(char *er);
97
98	<	main(argc, argv) /* read in .obj file and convert */
99	<	int argc;
100	<	char *argv[];
98	>
99	>	int
100	>	main( /* read in .OBJ file and convert */
101	>	int argc,
102	>	char *argv[]
103	>	)
104		{
105		int donames = 0;
106		int i;
#	Line 99 \| Line 116 \| *char argv[];**
116		case 'm': /* use custom mapfile */
117		ourmapping = getmapping(argv[++i], &qlist);
118		break;
119	+	case 'f': /* flatten surfaces */
120	+	flatten++;
121	+	break;
122		default:
123		goto userr;
124		}
125	<	if (i > argc \| i < argc-1)
125	>	if ((i > argc) \| (i < argc-1))
126		goto userr;
127		if (i == argc)
128		inpfile = "<stdin>";
#	Line 123 \| Line 143 \| *char argv[];**
143		printargs(argc, argv, stdout);
144		convert(stdin);
145		}
146	+	if (ndegen)
147	+	printf("# %d degenerate faces\n", ndegen);
148	+	if (n0norm)
149	+	printf("# %d invalid (zero) normals\n", n0norm);
150		exit(0);
151		userr:
152	<	fprintf(stderr, "Usage: %s [-o obj][-m mapping][-n] [file.obj]\n",
152	>	fprintf(stderr, "Usage: %s [-o obj][-m mapping][-n][-f] [file.obj]\n",
153		argv[0]);
154		exit(1);
155		}
156
157
158	<	getnames(fp) /* get valid qualifier names */
159	<	FILE *fp;
158	>	void
159	>	getnames( /* get valid qualifier names */
160	>	FILE *fp
161	>	)
162		{
163		char *argv[MAXARG];
164		int argc;
165		ID tmpid;
166	<	register int i;
166	>	int i;
167
168	<	while (argc = getstmt(argv, fp))
168	>	while ( (argc = getstmt(argv, fp)) )
169		switch (argv[0][0]) {
170		case 'f': /* face */
171		if (!argv[0][1])
#	Line 180 \| Line 206 \| *FILE fp;**
206		}
207
208
209	<	convert(fp) /* convert a T-mesh */
210	<	FILE *fp;
209	>	void
210	>	convert( /* convert an OBJ stream */
211	>	FILE *fp
212	>	)
213		{
214		char *argv[MAXARG];
215		int argc;
216		int nstats, nunknown;
217	<	register int i;
217	>	int i;
218
219		nstats = nunknown = 0;
220		/* scan until EOF */
221	<	while (argc = getstmt(argv, fp)) {
221	>	while ( (argc = getstmt(argv, fp)) ) {
222		switch (argv[0][0]) {
223		case 'v': /* vertex */
224		switch (argv[0][1]) {
#	Line 232 \| Line 260 \| *FILE fp;**
260		if (!puttri(argv[1], argv[2], argv[3]))
261		syntax("Bad triangle");
262		break;
235	–	case 4:
236	–	if (!putquad(argv[1], argv[2],
237	–	argv[3], argv[4]))
238	–	syntax("Bad quad");
239	–	break;
263		default:
264		if (!putface(argc-1, argv+1))
265		syntax("Bad face");
#	Line 254 \| Line 277 \| *FILE fp;**
277		if (!strcmp(argv[1], "off"))
278		mapname[0] = '\0';
279		else
280	<	strcpy(mapname, argv[1]);
280	>	sprintf(mapname, "%s.hdr", argv[1]);
281		} else
282		goto unknown;
283		break;
#	Line 270 \| Line 293 \| *FILE fp;**
293		goto unknown;
294		for (i = 1; i < argc; i++)
295		strcpy(group[i-1], argv[i]);
296	<	group[i-1][0] = '\0';
296	>	group[argc-1][0] = '\0';
297		break;
298		case '#': /* comment */
299	+	printargs(argc, argv, stdout);
300		break;
301		default:; /* something we don't deal with */
302		unknown:
#	Line 288 \| Line 312 \| *FILE fp;**
312
313
314		int
315	<	getstmt(av, fp) /* read the next statement from fp */
316	<	register char *av[MAXARG];
317	<	FILE *fp;
315	>	getstmt( /* read the next statement from fp */
316	>	char *av[MAXARG],
317	>	FILE *fp
318	>	)
319		{
320	<	extern char *fgetline();
321	<	static char sbuf[MAXARG*10];
322	<	register char *cp;
298	<	register int i;
320	>	static char sbuf[MAXARG*16];
321	>	char *cp;
322	>	int i;
323
324		do {
325		if (fgetline(cp=sbuf, sizeof(sbuf), fp) == NULL)
#	Line 307 \| Line 331 \| *FILE fp;**
331		lineno++;
332		*cp++ = '\0';
333		}
334	<	if (!*cp \|\| i >= MAXARG-1)
334	>	if (!*cp)
335		break;
336	+	if (i >= MAXARG-1) {
337	+	fprintf(stderr,
338	+	"warning: line %d: too many arguments (limit %d)\n",
339	+	lineno+1, MAXARG-1);
340	+	break;
341	+	}
342		av[i++] = cp;
343		while (++cp && !isspace(cp))
344		;
#	Line 322 \| Line 352 \| *FILE fp;**
352
353
354		char *
355	<	getmtl() /* figure material for this face */
355	>	getmtl(void) /* figure material for this face */
356		{
357	<	register RULEHD *rp = ourmapping;
357	>	RULEHD *rp = ourmapping;
358
359		if (rp == NULL) { /* no rule set */
360		if (matname[0])
#	Line 348 \| Line 378 \| *getmtl() / figure material for this face /*
378
379
380		char *
381	<	getonm() /* invent a good name for object */
381	>	getonm(void) /* invent a good name for object */
382		{
383		static char name[64];
384	<	register char cp1, cp2;
385	<	register int i;
384	>	char cp1, cp2;
385	>	int i;
386		/* check for preset */
387		if (objname[0])
388		return(objname);
#	Line 363 \| Line 393 \| *getonm() / invent a good name for object /*
393		cp2 = group[i];
394		if (cp1 > name)
395		*cp1++ = '.';
396	<	while (cp1 = cp2++)
396	>	while ( (cp1 = cp2++) )
397		if (++cp1 >= name+sizeof(name)-2) {
398		*cp1 = '\0';
399		return(name);
#	Line 373 \| Line 403 \| *getonm() / invent a good name for object /*
403		}
404
405
406	<	matchrule(rp) /* check for a match on this rule */
407	<	register RULEHD *rp;
406	>	int
407	>	matchrule( /* check for a match on this rule */
408	>	RULEHD *rp
409	>	)
410		{
411		ID tmpid;
412		int gotmatch;
413	<	register int i;
413	>	int i;
414
415		if (rp->qflg & FL(Q_MTL)) {
416		if (!matname[0])
#	Line 424 \| Line 456 \| *register RULEHD rp;**
456		}
457
458
459	<	cvtndx(vi, vs) /* convert vertex string to index */
460	<	register VNDX vi;
461	<	register char *vs;
459	>	int
460	>	cvtndx( /* convert vertex string to index */
461	>	VNDX vi,
462	>	char *vs
463	>	)
464		{
465		/* get point */
466		vi[0] = atoi(vs);
#	Line 434 \| Line 468 \| *register char vs;**
468		if (vi[0]-- > nvs)
469		return(0);
470		} else if (vi[0] < 0) {
471	<	vi[0] = nvs + vi[0];
471	>	vi[0] += nvs;
472		if (vi[0] < 0)
473		return(0);
474		} else
#	Line 448 \| Line 482 \| *register char vs;**
482		if (vi[1]-- > nvts)
483		return(0);
484		} else if (vi[1] < 0) {
485	<	vi[1] = nvts + vi[1];
485	>	vi[1] += nvts;
486		if (vi[1] < 0)
487		return(0);
488		} else
#	Line 462 \| Line 496 \| *register char vs;**
496		if (vi[2]-- > nvns)
497		return(0);
498		} else if (vi[2] < 0) {
499	<	vi[2] = nvns + vi[2];
499	>	vi[2] += nvns;
500		if (vi[2] < 0)
501		return(0);
502		} else
503		vi[2] = -1;
504	+	/* zero normal is not normal */
505	+	if (vi[2] >= 0 && DOT(vnlist[vi[2]],vnlist[vi[2]]) <= FTINY)
506	+	vi[2] = -1;
507		return(1);
508		}
509
510
511	<	nonplanar(ac, av) /* are vertices are non-planar? */
512	<	register int ac;
513	<	register char **av;
511	>	int
512	>	nonplanar( /* are vertices non-planar? */
513	>	int ac,
514	>	char **av
515	>	)
516		{
517		VNDX vi;
518	<	FLOAT p0, p1;
518	>	RREAL p0, p1;
519		FVECT v1, v2, nsum, newn;
520		double d;
521	<	register int i;
521	>	int i;
522
523		if (!cvtndx(vi, av[0]))
524		return(0);
525	<	if (vi[2] >= 0)
525	>	if (!flatten && vi[2] >= 0)
526		return(1); /* has interpolated normals */
527		if (ac < 4)
528		return(0); /* it's a triangle! */
#	Line 522 \| Line 561 \| register char av;**
561		}
562
563
564	<	putface(ac, av) /* put out an N-sided polygon */
565	<	int ac;
566	<	register char **av;
564	>	int
565	>	putface( /* put out an N-sided polygon */
566	>	int ac,
567	>	char **av
568	>	)
569		{
570		VNDX vi;
571	<	char *mod;
572	<	register int i;
571	>	char *cp;
572	>	int i;
573
574	<	if (nonplanar(ac, av)) { /* break into quads and triangles */
575	<	while (ac > 3) {
576	<	if (!putquad(av[0], av[1], av[2], av[3]))
574	>	if (nonplanar(ac, av)) { /* break into triangles */
575	>	while (ac > 2) {
576	>	if (!puttri(av[0], av[1], av[2]))
577		return(0);
578	<	/* remove two vertices & rotate */
579	<	av[ac -= 2] = av[0];
580	<	for (i = 0; i <= ac; i++)
578	>	ac--; /* remove vertex & rotate */
579	>	cp = av[0];
580	>	for (i = 0; i < ac-1; i++)
581		av[i] = av[i+2];
582	+	av[i] = cp;
583		}
542	–	if (ac == 3 && !puttri(av[0], av[1], av[2]))
543	–	return(0);
584		return(1);
585		}
586	<	if ((mod = getmtl()) == NULL)
586	>	if ((cp = getmtl()) == NULL)
587		return(-1);
588	<	printf("\n%s polygon %s.%d\n", mod, getonm(), faceno);
588	>	printf("\n%s polygon %s.%d\n", cp, getonm(), faceno);
589		printf("0\n0\n%d\n", 3*ac);
590		for (i = 0; i < ac; i++) {
591		if (!cvtndx(vi, av[i]))
#	Line 556 \| Line 596 \| register char av;**
596		}
597
598
599	<	puttri(v1, v2, v3) /* put out a triangle */
600	<	char v1, v2, *v3;
599	>	int
600	>	puttri( /* put out a triangle */
601	>	char *v1,
602	>	char *v2,
603	>	char *v3
604	>	)
605		{
606		char *mod;
607		VNDX v1i, v2i, v3i;
608		BARYCCM bvecs;
609	<	int texOK, patOK;
609	>	RREAL bcoor[3][3];
610	>	int texOK = 0, patOK;
611	>	int flatness;
612	>	int i;
613
614		if ((mod = getmtl()) == NULL)
615		return(-1);
#	Line 570 \| Line 617 \| *char v1, v2, v3;**
617		if (!cvtndx(v1i, v1) \|\| !cvtndx(v2i, v2) \|\| !cvtndx(v3i, v3))
618		return(0);
619		/* compute barycentric coordinates */
620	<	texOK = (v1i[2]>=0 && v2i[2]>=0 && v3i[2]>=0);
620	>	if (v1i[2]>=0 && v2i[2]>=0 && v3i[2]>=0)
621	>	flatness = flat_tri(vlist[v1i[0]], vlist[v2i[0]], vlist[v3i[0]],
622	>	vnlist[v1i[2]], vnlist[v2i[2]], vnlist[v3i[2]]);
623	>	else
624	>	flatness = ISFLAT;
625	>
626	>	switch (flatness) {
627	>	case DEGEN: /* zero area */
628	>	ndegen++;
629	>	return(-1);
630	>	case RVFLAT: /* reversed normals, but flat */
631	>	case ISFLAT: /* smoothing unnecessary */
632	>	texOK = 0;
633	>	break;
634	>	case RVBENT: /* reversed normals with smoothing */
635	>	case ISBENT: /* proper smoothing */
636	>	texOK = 1;
637	>	break;
638	>	}
639	>	if (flatten)
640	>	texOK = 0;
641	>	#ifdef TEXMAPS
642		patOK = mapname[0] && (v1i[1]>=0 && v2i[1]>=0 && v3i[1]>=0);
643	+	#else
644	+	patOK = 0;
645	+	#endif
646		if (texOK \| patOK)
647	<	if (comp_baryc(bvecs, vlist[v1i[0]], vlist[v2i[0]],
647	>	if (comp_baryc(&bvecs, vlist[v1i[0]], vlist[v2i[0]],
648		vlist[v3i[0]]) < 0)
649	<	return(-1);
649	>	texOK = patOK = 0;
650		/* put out texture (if any) */
651		if (texOK) {
652		printf("\n%s texfunc %s\n", mod, TEXNAME);
653		mod = TEXNAME;
654		printf("4 dx dy dz %s\n", TCALNAME);
655	<	printf("0\n21\n");
656	<	put_baryc(bvecs);
657	<	printf("\t%14.12g %14.12g %14.12g\n",
658	<	vnlist[v1i[2]][0], vnlist[v2i[2]][0],
659	<	vnlist[v3i[2]][0]);
660	<	printf("\t%14.12g %14.12g %14.12g\n",
661	<	vnlist[v1i[2]][1], vnlist[v2i[2]][1],
591	<	vnlist[v3i[2]][1]);
592	<	printf("\t%14.12g %14.12g %14.12g\n",
593	<	vnlist[v1i[2]][2], vnlist[v2i[2]][2],
594	<	vnlist[v3i[2]][2]);
655	>	printf("0\n");
656	>	for (i = 0; i < 3; i++) {
657	>	bcoor[i][0] = vnlist[v1i[2]][i];
658	>	bcoor[i][1] = vnlist[v2i[2]][i];
659	>	bcoor[i][2] = vnlist[v3i[2]][i];
660	>	}
661	>	put_baryc(&bvecs, bcoor, 3);
662		}
663	+	#ifdef TEXMAPS
664		/* put out pattern (if any) */
665		if (patOK) {
666		printf("\n%s colorpict %s\n", mod, PATNAME);
667		mod = PATNAME;
668		printf("7 noneg noneg noneg %s %s u v\n", mapname, TCALNAME);
669	<	printf("0\n18\n");
670	<	put_baryc(bvecs);
671	<	printf("\t%f %f %f\n", vtlist[v1i[1]][0],
672	<	vtlist[v2i[1]][0], vtlist[v3i[1]][0]);
673	<	printf("\t%f %f %f\n", vtlist[v1i[1]][1],
674	<	vtlist[v2i[1]][1], vtlist[v3i[1]][1]);
669	>	printf("0\n");
670	>	for (i = 0; i < 2; i++) {
671	>	bcoor[i][0] = vtlist[v1i[1]][i];
672	>	bcoor[i][1] = vtlist[v2i[1]][i];
673	>	bcoor[i][2] = vtlist[v3i[1]][i];
674	>	}
675	>	put_baryc(&bvecs, bcoor, 2);
676		}
677	<	/* put out triangle */
677	>	#endif
678	>	/* put out (reversed) triangle */
679		printf("\n%s polygon %s.%d\n", mod, getonm(), faceno);
680		printf("0\n0\n9\n");
681	<	pvect(vlist[v1i[0]]);
682	<	pvect(vlist[v2i[0]]);
683	<	pvect(vlist[v3i[0]]);
684	<
685	<	return(1);
686	<	}
687	<
688	<
619	<	int
620	<	comp_baryc(bcm, v1, v2, v3) /* compute barycentric vectors */
621	<	register BARYCCM bcm;
622	<	FLOAT v1, v2, *v3;
623	<	{
624	<	FLOAT *vt;
625	<	FVECT va, vab, vcb;
626	<	double d;
627	<	register int i, j;
628	<
629	<	for (j = 0; j < 3; j++) {
630	<	for (i = 0; i < 3; i++) {
631	<	vab[i] = v1[i] - v2[i];
632	<	vcb[i] = v3[i] - v2[i];
633	<	}
634	<	d = DOT(vcb,vcb);
635	<	if (d <= FTINY)
636	<	return(-1);
637	<	d = DOT(vcb,vab)/d;
638	<	for (i = 0; i < 3; i++)
639	<	va[i] = vab[i] - vcb[i]*d;
640	<	d = DOT(va,va);
641	<	if (d <= FTINY)
642	<	return(-1);
643	<	for (i = 0; i < 3; i++) {
644	<	va[i] /= d;
645	<	bcm[j][i] = va[i];
646	<	}
647	<	bcm[j][3] = -DOT(v2,va);
648	<	/* rotate vertices */
649	<	vt = v1;
650	<	v1 = v2;
651	<	v2 = v3;
652	<	v3 = vt;
681	>	if (flatness == RVFLAT \|\| flatness == RVBENT) {
682	>	pvect(vlist[v3i[0]]);
683	>	pvect(vlist[v2i[0]]);
684	>	pvect(vlist[v1i[0]]);
685	>	} else {
686	>	pvect(vlist[v1i[0]]);
687	>	pvect(vlist[v2i[0]]);
688	>	pvect(vlist[v3i[0]]);
689		}
654	–	return(0);
655	–	}
656	–
657	–
658	–	put_baryc(bcm) /* put barycentric coord. vectors */
659	–	register BARYCCM bcm;
660	–	{
661	–	register int i;
662	–
663	–	for (i = 0; i < 3; i++)
664	–	printf("%14.8f %14.8f %14.8f %14.8f\n",
665	–	bcm[i][0], bcm[i][1], bcm[i][2], bcm[i][3]);
666	–	}
667	–
668	–
669	–	putquad(p0, p1, p3, p2) /* put out a quadrilateral */
670	–	char p0, p1, p3, p2; /* names correspond to binary pos. */
671	–	{
672	–	VNDX p0i, p1i, p2i, p3i;
673	–	FVECT norm[4];
674	–	char mod, name;
675	–	int axis;
676	–	FVECT v1, v2, vc1, vc2;
677	–	int ok1, ok2;
678	–
679	–	if ((mod = getmtl()) == NULL)
680	–	return(-1);
681	–	name = getonm();
682	–	/* get actual indices */
683	–	if (!cvtndx(p0i,p0) \|\| !cvtndx(p1i,p1) \|\|
684	–	!cvtndx(p2i,p2) \|\| !cvtndx(p3i,p3))
685	–	return(0);
686	–	/* compute exact normals */
687	–	fvsum(v1, vlist[p1i[0]], vlist[p0i[0]], -1.0);
688	–	fvsum(v2, vlist[p2i[0]], vlist[p0i[0]], -1.0);
689	–	fcross(vc1, v1, v2);
690	–	ok1 = normalize(vc1) != 0.0;
691	–	fvsum(v1, vlist[p2i[0]], vlist[p3i[0]], -1.0);
692	–	fvsum(v2, vlist[p1i[0]], vlist[p3i[0]], -1.0);
693	–	fcross(vc2, v1, v2);
694	–	ok2 = normalize(vc2) != 0.0;
695	–	if (!(ok1 \| ok2))
696	–	return(-1);
697	–	/* compute normal interpolation */
698	–	axis = norminterp(norm, p0i, p1i, p2i, p3i);
699	–
700	–	/* put out quadrilateral? */
701	–	if (ok1 & ok2 && fabs(fdot(vc1,vc2)) >= 1.0-FTINY) {
702	–	printf("\n%s ", mod);
703	–	if (axis != -1) {
704	–	printf("texfunc %s\n", TEXNAME);
705	–	printf("4 surf_dx surf_dy surf_dz %s\n", QCALNAME);
706	–	printf("0\n13\t%d\n", axis);
707	–	pvect(norm[0]);
708	–	pvect(norm[1]);
709	–	pvect(norm[2]);
710	–	fvsum(v1, norm[3], vc1, -0.5);
711	–	fvsum(v1, v1, vc2, -0.5);
712	–	pvect(v1);
713	–	printf("\n%s ", TEXNAME);
714	–	}
715	–	printf("polygon %s.%d\n", name, faceno);
716	–	printf("0\n0\n12\n");
717	–	pvect(vlist[p0i[0]]);
718	–	pvect(vlist[p1i[0]]);
719	–	pvect(vlist[p3i[0]]);
720	–	pvect(vlist[p2i[0]]);
721	–	return(1);
722	–	}
723	–	/* put out triangles? */
724	–	if (ok1) {
725	–	printf("\n%s ", mod);
726	–	if (axis != -1) {
727	–	printf("texfunc %s\n", TEXNAME);
728	–	printf("4 surf_dx surf_dy surf_dz %s\n", QCALNAME);
729	–	printf("0\n13\t%d\n", axis);
730	–	pvect(norm[0]);
731	–	pvect(norm[1]);
732	–	pvect(norm[2]);
733	–	fvsum(v1, norm[3], vc1, -1.0);
734	–	pvect(v1);
735	–	printf("\n%s ", TEXNAME);
736	–	}
737	–	printf("polygon %s.%da\n", name, faceno);
738	–	printf("0\n0\n9\n");
739	–	pvect(vlist[p0i[0]]);
740	–	pvect(vlist[p1i[0]]);
741	–	pvect(vlist[p2i[0]]);
742	–	}
743	–	if (ok2) {
744	–	printf("\n%s ", mod);
745	–	if (axis != -1) {
746	–	printf("texfunc %s\n", TEXNAME);
747	–	printf("4 surf_dx surf_dy surf_dz %s\n", QCALNAME);
748	–	printf("0\n13\t%d\n", axis);
749	–	pvect(norm[0]);
750	–	pvect(norm[1]);
751	–	pvect(norm[2]);
752	–	fvsum(v2, norm[3], vc2, -1.0);
753	–	pvect(v2);
754	–	printf("\n%s ", TEXNAME);
755	–	}
756	–	printf("polygon %s.%db\n", name, faceno);
757	–	printf("0\n0\n9\n");
758	–	pvect(vlist[p2i[0]]);
759	–	pvect(vlist[p1i[0]]);
760	–	pvect(vlist[p3i[0]]);
761	–	}
690		return(1);
691		}
692
693
694	<	int
695	<	norminterp(resmat, p0i, p1i, p2i, p3i) /* compute normal interpolation */
768	<	register FVECT resmat[4];
769	<	register VNDX p0i, p1i, p2i, p3i;
694	>	void
695	>	freeverts(void) /* free all vertices */
696		{
771	–	#define u ((ax+1)%3)
772	–	#define v ((ax+2)%3)
773	–
774	–	register int ax;
775	–	MAT4 eqnmat;
776	–	FVECT v1;
777	–	register int i, j;
778	–
779	–	if (!(p0i[2]>=0 && p1i[2]>=0 && p2i[2]>=0 && p3i[2]>=0))
780	–	return(-1);
781	–	/* find dominant axis */
782	–	VCOPY(v1, vnlist[p0i[2]]);
783	–	fvsum(v1, v1, vnlist[p1i[2]], 1.0);
784	–	fvsum(v1, v1, vnlist[p2i[2]], 1.0);
785	–	fvsum(v1, v1, vnlist[p3i[2]], 1.0);
786	–	ax = ABS(v1[0]) > ABS(v1[1]) ? 0 : 1;
787	–	ax = ABS(v1[ax]) > ABS(v1[2]) ? ax : 2;
788	–	/* assign equation matrix */
789	–	eqnmat[0][0] = vlist[p0i[0]][u]*vlist[p0i[0]][v];
790	–	eqnmat[0][1] = vlist[p0i[0]][u];
791	–	eqnmat[0][2] = vlist[p0i[0]][v];
792	–	eqnmat[0][3] = 1.0;
793	–	eqnmat[1][0] = vlist[p1i[0]][u]*vlist[p1i[0]][v];
794	–	eqnmat[1][1] = vlist[p1i[0]][u];
795	–	eqnmat[1][2] = vlist[p1i[0]][v];
796	–	eqnmat[1][3] = 1.0;
797	–	eqnmat[2][0] = vlist[p2i[0]][u]*vlist[p2i[0]][v];
798	–	eqnmat[2][1] = vlist[p2i[0]][u];
799	–	eqnmat[2][2] = vlist[p2i[0]][v];
800	–	eqnmat[2][3] = 1.0;
801	–	eqnmat[3][0] = vlist[p3i[0]][u]*vlist[p3i[0]][v];
802	–	eqnmat[3][1] = vlist[p3i[0]][u];
803	–	eqnmat[3][2] = vlist[p3i[0]][v];
804	–	eqnmat[3][3] = 1.0;
805	–	/* invert matrix (solve system) */
806	–	if (!invmat4(eqnmat, eqnmat))
807	–	return(-1); /* no solution */
808	–	/* compute result matrix */
809	–	for (j = 0; j < 4; j++)
810	–	for (i = 0; i < 3; i++)
811	–	resmat[j][i] = eqnmat[j][0]*vnlist[p0i[2]][i] +
812	–	eqnmat[j][1]*vnlist[p1i[2]][i] +
813	–	eqnmat[j][2]*vnlist[p2i[2]][i] +
814	–	eqnmat[j][3]*vnlist[p3i[2]][i];
815	–	return(ax);
816	–
817	–	#undef u
818	–	#undef v
819	–	}
820	–
821	–
822	–	freeverts() /* free all vertices */
823	–	{
697		if (nvs) {
698	<	free((char *)vlist);
698	>	free((void *)vlist);
699		nvs = 0;
700		}
701		if (nvts) {
702	<	free((char *)vtlist);
702	>	free((void *)vtlist);
703		nvts = 0;
704		}
705		if (nvns) {
706	<	free((char *)vnlist);
706	>	free((void *)vnlist);
707		nvns = 0;
708		}
709		}
710
711
712		int
713	<	newv(x, y, z) /* create a new vertex */
714	<	double x, y, z;
713	>	newv( /* create a new vertex */
714	>	double x,
715	>	double y,
716	>	double z
717	>	)
718		{
719		if (!(nvs%CHUNKSIZ)) { /* allocate next block */
720		if (nvs == 0)
721		vlist = (FVECT )malloc(CHUNKSIZsizeof(FVECT));
722		else
723	<	vlist = (FVECT )realloc((char )vlist,
723	>	vlist = (FVECT )realloc((void )vlist,
724		(nvs+CHUNKSIZ)*sizeof(FVECT));
725		if (vlist == NULL) {
726		fprintf(stderr,
#	Line 861 \| Line 737 \| double x, y, z;
737
738
739		int
740	<	newvn(x, y, z) /* create a new vertex normal */
741	<	double x, y, z;
740	>	newvn( /* create a new vertex normal */
741	>	double x,
742	>	double y,
743	>	double z
744	>	)
745		{
746		if (!(nvns%CHUNKSIZ)) { /* allocate next block */
747		if (nvns == 0)
748		vnlist = (FVECT )malloc(CHUNKSIZsizeof(FVECT));
749		else
750	<	vnlist = (FVECT )realloc((char )vnlist,
750	>	vnlist = (FVECT )realloc((void )vnlist,
751		(nvns+CHUNKSIZ)*sizeof(FVECT));
752		if (vnlist == NULL) {
753		fprintf(stderr,
#	Line 880 \| Line 759 \| double x, y, z;
759		vnlist[nvns][0] = x;
760		vnlist[nvns][1] = y;
761		vnlist[nvns][2] = z;
762	<	if (normalize(vnlist[nvns]) == 0.0)
884	<	return(0);
762	>	n0norm += (normalize(vnlist[nvns]) == 0.0);
763		return(++nvns);
764		}
765
766
767		int
768	<	newvt(x, y) /* create a new texture map vertex */
769	<	double x, y;
768	>	newvt( /* create a new texture map vertex */
769	>	double x,
770	>	double y
771	>	)
772		{
773		if (!(nvts%CHUNKSIZ)) { /* allocate next block */
774		if (nvts == 0)
775	<	vtlist = (FLOAT ()[2])malloc(CHUNKSIZ2*sizeof(FLOAT));
775	>	vtlist = (RREAL ()[2])malloc(CHUNKSIZ2*sizeof(RREAL));
776		else
777	<	vtlist = (FLOAT ()[2])realloc((char )vtlist,
778	<	(nvts+CHUNKSIZ)2sizeof(FLOAT));
777	>	vtlist = (RREAL ()[2])realloc((void )vtlist,
778	>	(nvts+CHUNKSIZ)2sizeof(RREAL));
779		if (vtlist == NULL) {
780		fprintf(stderr,
781		"Out of memory while allocating texture vertex %d\n",
#	Line 910 \| Line 790 \| double x, y;
790		}
791
792
793	<	syntax(er) /* report syntax error and exit */
794	<	char *er;
793	>	void
794	>	syntax( /* report syntax error and exit */
795	>	char *er
796	>	)
797		{
798		fprintf(stderr, "%s: Wavefront syntax error near line %d: %s\n",
799		inpfile, lineno, er);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing ray/src/cv/obj2rad.c (file contents): Revision 2.6 by greg, Thu Apr 14 04:29:10 1994 UTC vs. Revision 2.28 by greg, Tue Aug 20 16:19:03 2013 UTC

Diff Legend

Comparing ray/src/cv/obj2rad.c (file contents):
Revision 2.6 by greg, Thu Apr 14 04:29:10 1994 UTC vs.
Revision 2.28 by greg, Tue Aug 20 16:19:03 2013 UTC