ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/ot/wfconv.c

Comparing ray/src/ot/wfconv.c (file contents):
Revision 2.6 by schorsch, Sun Jul 27 22:12:03 2003 UTC vs.
Revision 2.18 by greg, Fri Apr 30 16:40:10 2021 UTC

#	Line 9 | Line 9 | static const char RCSid[] = "$Id$";
9		#include "copyright.h"
10		#include "standard.h"
11		#include "cvmesh.h"
12	+	#include "triangulate.h"
13		#include <ctype.h>
14
15		typedef int     VNDX[3];        /* vertex index (point,map,normal) */
16
17		#define CHUNKSIZ        1024    /* vertex allocation chunk size */
18
19	<	#define MAXARG          64      /* maximum # arguments in a statement */
19	>	#define MAXARG          512     /* maximum # arguments in a statement */
20
21		static FVECT    *vlist;         /* our vertex list */
22		static int      nvs;            /* number of vertices in our list */
#	Line 26 | Line 27 | static int     nvts;
27
28		static char     *inpfile;       /* input file name */
29		static int      havemats;       /* materials available? */
30	<	static char     material[64];   /* current material name */
31	<	static char     group[64];      /* current group name */
30	>	static char     material[256];  /* current material name */
31	>	static char     group[256];     /* current group name */
32		static int      lineno;         /* current line number */
33		static int      faceno;         /* current face number */
34
35	<	static int      getstmt();
36	<	static int      cvtndx();
37	<	static OBJECT   getmod();
38	<	static int      putface();
39	<	static int      puttri();
40	<	static void     freeverts();
41	<	static int      newv();
42	<	static int      newvn();
43	<	static int      newvt();
44	<	static void     syntax();
35	>	static int getstmt(char *av[MAXARG], FILE *fp);
36	>	static int cvtndx(VNDX vi, char *vs);
37	>	static int putface(int ac, char **av);
38	>	static OBJECT getmod(void);
39	>	static int puttri(char  *v1, char *v2, char *v3);
40	>	static void freeverts(void);
41	>	static int newv(double  x, double y, double z);
42	>	static int newvn(double x, double y, double z);
43	>	static int newvt(double x, double y);
44	>	static void syntax(char *er);
45
46
47		void
48	<	wfreadobj(objfn)                /* read in .OBJ file and convert */
49	<	char    *objfn;
48	>	wfreadobj(              /* read in .OBJ file and convert */
49	>	char    *objfn
50	>	)
51		{
52		FILE    *fp;
53		char    *argv[MAXARG];
54		int     argc;
55		int     nstats, nunknown;
54	–	int     i;
56
57		if (objfn == NULL) {
58		inpfile = "<stdin>";
#	Line 157 | Line 158 | char   *objfn;
158
159
160		static int
161	<	getstmt(av, fp)                         /* read the next statement from fp */
162	<	register char   *av[MAXARG];
163	<	FILE    *fp;
161	>	getstmt(                                /* read the next statement from fp */
162	>	char    *av[MAXARG],
163	>	FILE    *fp
164	>	)
165		{
166		static char     sbuf[MAXARG*16];
167	<	register char   *cp;
168	<	register int    i;
167	>	char    *cp;
168	>	int     i;
169
170		do {
171		if (fgetline(cp=sbuf, sizeof(sbuf), fp) == NULL)
#	Line 175 | Line 177 | FILE   *fp;
177		lineno++;
178		*cp++ = '\0';
179		}
180	<	if (!*cp || i >= MAXARG-1)
180	>	if (!*cp)
181		break;
182	+	if (i >= MAXARG-1) {
183	+	sprintf(errmsg,
184	+	"%s: too many arguments near line %d (limit %d)\n",
185	+	inpfile, lineno+1, MAXARG-1);
186	+	break;
187	+	}
188		av[i++] = cp;
189		while (*++cp && !isspace(*cp))
190		;
#	Line 190 | Line 198 | FILE   *fp;
198
199
200		static int
201	<	cvtndx(vi, vs)                          /* convert vertex string to index */
202	<	register VNDX   vi;
203	<	register char   *vs;
201	>	cvtndx(                         /* convert vertex string to index */
202	>	VNDX    vi,
203	>	char    *vs
204	>	)
205		{
206		/* get point */
207		vi[0] = atoi(vs);
#	Line 236 | Line 245 | register char  *vs;
245		return(1);
246		}
247
248	+	/* determine dominant axis for triangle */
249	+	static int
250	+	dominant_axis(char *v1, char *v2, char *v3)
251	+	{
252	+	VNDX    v1i, v2i, v3i;
253	+	FVECT   e1, e2, vn;
254	+	int     i, imax;
255
256	+	if (!cvtndx(v1i, v1) || !cvtndx(v2i, v2) || !cvtndx(v3i, v3))
257	+	return(-1);
258	+	VSUB(e1, vlist[v2i[0]], vlist[v1i[0]]);
259	+	VSUB(e2, vlist[v3i[0]], vlist[v2i[0]]);
260	+	VCROSS(vn, e1, e2);
261	+	for (i = imax = 2; i--; )
262	+	if (vn[i]*vn[i] > vn[imax]*vn[imax])
263	+	imax = i;
264	+	return(vn[imax]*vn[imax] > FTINY*FTINY*FTINY*FTINY ? imax : -1);
265	+	}
266	+
267	+	/* struct needed for triangulation callback */
268	+	typedef struct {
269	+	char    **avl;
270	+	int     rev;
271	+	} WFpoly;
272	+
273	+	/* callback for triangle output from polygon */
274		static int
275	<	putface(ac, av)                         /* put out an N-sided polygon */
242	<	int     ac;
243	<	register char   **av;
275	>	tri_out(const Vert2_list *tp, int a, int b, int c)
276		{
277	<	char            *cp;
246	<	register int    i;
277	>	WFpoly *        wp = (WFpoly *)tp->p;
278
279	<	while (ac > 3) {                /* break into triangles */
280	<	if (!puttri(av[0], av[1], av[2]))
279	>	if (wp->rev)
280	>	return( puttri(wp->avl[c], wp->avl[b], wp->avl[a]) );
281	>
282	>	return( puttri(wp->avl[a], wp->avl[b], wp->avl[c]) );
283	>	}
284	>
285	>	static int
286	>	putface(                                /* put out an N-sided polygon */
287	>	int     ac,
288	>	char    **av
289	>	)
290	>	{
291	>	Vert2_list      *poly;
292	>	WFpoly          myps;
293	>	int             i, ax, ay;
294	>
295	>	for (i = ac-3; i >= 0; i--)     /* identify dominant axis */
296	>	if ((ax = dominant_axis(av[i], av[i+1], av[i+2])) >= 0)
297	>	break;
298	>	if (ax < 0)
299	>	return(1);              /* ignore degenerate face */
300	>	poly = polyAlloc(ac);
301	>	if (poly == NULL)
302	>	return(0);
303	>	myps.avl = av;
304	>	poly->p = &myps;
305	>	if (++ax >= 3) ax = 0;
306	>	ay = ax;
307	>	if (++ay >= 3) ay = 0;
308	>	for (i = 0; i < ac; i++) {      /* convert to 2-D polygon */
309	>	VNDX    vi;
310	>	if (!cvtndx(vi, av[i])) {
311	>	error(WARNING, "bad vertex reference");
312	>	polyFree(poly);
313		return(0);
314	<	ac--;                   /* remove vertex & rotate */
315	<	cp = av[0];
316	<	for (i = 0; i < ac-1; i++)
254	<	av[i] = av[i+2];
255	<	av[i] = cp;
314	>	}
315	>	poly->v[i].mX = vlist[vi[0]][ax];
316	>	poly->v[i].mY = vlist[vi[0]][ay];
317		}
318	<	return(puttri(av[0], av[1], av[2]));
318	>	/* flag for order reversal */
319	>	myps.rev = (polyArea(poly) < .0);
320	>	/* break into triangles & output */
321	>	if (!polyTriangulate(poly, &tri_out)) {
322	>	sprintf(errmsg, "self-intersecting face with %d vertices", ac);
323	>	error(WARNING, errmsg);
324	>	}
325	>	polyFree(poly);
326	>	return(1);
327		}
328
329
330		static OBJECT
331	<	getmod()                                /* get current modifier ID */
331	>	getmod(void)                            /* get current modifier ID */
332		{
333		char    *mnam;
334		OBJECT  mod;
#	Line 285 | Line 354 | getmod()                               /* get current modifier ID */
354
355
356		static int
357	<	puttri(v1, v2, v3)                      /* convert a triangle */
358	<	char    *v1, *v2, *v3;
357	>	puttri(                 /* convert a triangle */
358	>	char    *v1,
359	>	char    *v2,
360	>	char    *v3
361	>	)
362		{
363		VNDX    v1i, v2i, v3i;
364		RREAL   *v1c, *v2c, *v3c;
365		RREAL   *v1n, *v2n, *v3n;
366
367	<	if (!cvtndx(v1i, v1) || !cvtndx(v2i, v2) || !cvtndx(v3i, v3))
367	>	if (!cvtndx(v1i, v1) || !cvtndx(v2i, v2) || !cvtndx(v3i, v3)) {
368	>	error(WARNING, "bad vertex reference");
369		return(0);
370	<
370	>	}
371		if (v1i[1]>=0 && v2i[1]>=0 && v3i[1]>=0) {
372		v1c = vtlist[v1i[1]];
373		v2c = vtlist[v2i[1]];
#	Line 315 | Line 388 | char   *v1, *v2, *v3;
388
389
390		static void
391	<	freeverts()                     /* free all vertices */
391	>	freeverts(void)                 /* free all vertices */
392		{
393		if (nvs) {
394		free((void *)vlist);
#	Line 333 | Line 406 | freeverts()                    /* free all vertices */
406
407
408		static int
409	<	newv(x, y, z)                   /* create a new vertex */
410	<	double  x, y, z;
409	>	newv(                   /* create a new vertex */
410	>	double  x,
411	>	double  y,
412	>	double  z
413	>	)
414		{
415		if (!(nvs%CHUNKSIZ)) {          /* allocate next block */
416		if (nvs == 0)
#	Line 354 | Line 430 | double x, y, z;
430
431
432		static int
433	<	newvn(x, y, z)                  /* create a new vertex normal */
434	<	double  x, y, z;
433	>	newvn(                  /* create a new vertex normal */
434	>	double  x,
435	>	double  y,
436	>	double  z
437	>	)
438		{
439		if (!(nvns%CHUNKSIZ)) {         /* allocate next block */
440		if (nvns == 0)
#	Line 377 | Line 456 | double x, y, z;
456
457
458		static int
459	<	newvt(x, y)                     /* create a new texture map vertex */
460	<	double  x, y;
459	>	newvt(                  /* create a new texture map vertex */
460	>	double  x,
461	>	double  y
462	>	)
463		{
464		if (!(nvts%CHUNKSIZ)) {         /* allocate next block */
465		if (nvts == 0)
#	Line 397 | Line 478 | double x, y;
478
479
480		static void
481	<	syntax(er)                      /* report syntax error and exit */
482	<	char    *er;
481	>	syntax(                 /* report syntax error and exit */
482	>	char    *er
483	>	)
484		{
485	<	sprintf(errmsg, "%s: Wavefront syntax error near line %d: %s\n",
485	>	sprintf(errmsg, "%s: Wavefront syntax error near line %d: %s",
486		inpfile, lineno, er);
487		error(USER, errmsg);
488		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)