ViewVC Help

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

root/Development/ray/src/gen/gensurf.c

Comparing ray/src/gen/gensurf.c (file contents):
Revision 2.22 by greg, Mon Dec 9 22:08:13 2013 UTC vs.
Revision 2.27 by greg, Sun Jun 14 03:54:23 2020 UTC

#	Line 64 | Line 64 | typedef struct {
64		RREAL  uv[2];   /* (u,v) position */
65		} POINT;
66
67	+	int  nverts = 0;                /* vertex output count */
68	+	int  nnorms = 0;                /* normal output count */
69
70		void loaddata(char *file, int m, int n, int pointsize);
71		double l_dataval(char *nam);
72		void putobjrow(POINT *rp, int n);
73	+	void putobjvert(POINT *p);
74		void putsquare(POINT *p0, POINT *p1, POINT *p2, POINT *p3);
75		void comprow(double s, POINT *row, int siz);
76		void compnorms(POINT *r0, POINT *r1, POINT *r2, int siz);
#	Line 83 | Line 86 | char  *argv[];
86		int  i, j, m, n;
87		char  stmp[256];
88
89	+	esupport |= E_VARIABLE|E_FUNCTION|E_RCONST;
90	+	esupport &= ~(E_OUTCHAN|E_INCHAN);
91		varset("PI", ':', PI);
92		funset("hermite", 5, ':', l_hermite);
93		funset("bezier", 5, ':', l_bezier);
#	Line 94 | Line 99 | char  *argv[];
99		for (i = 8; i < argc; i++)
100		if (!strcmp(argv[i], "-e"))
101		scompile(argv[++i], NULL, 0);
102	<	else if (!strcmp(argv[i], "-f"))
103	<	fcompile(argv[++i]);
104	<	else if (!strcmp(argv[i], "-s"))
102	>	else if (!strcmp(argv[i], "-f")) {
103	>	char  *fpath = getpath(argv[++i], getrlibpath(), 0);
104	>	if (fpath == NULL) {
105	>	fprintf(stderr, "%s: cannot find file '%s'\n",
106	>	argv[0], argv[i]);
107	>	quit(1);
108	>	}
109	>	fcompile(fpath);
110	>	} else if (!strcmp(argv[i], "-s"))
111		smooth++;
112		else if (!strcmp(argv[i], "-o"))
113		objout++;
#	Line 105 | Line 116 | char  *argv[];
116
117		modname = argv[1];
118		surfname = argv[2];
119	<	m = atoi(argv[6]);
120	<	n = atoi(argv[7]);
119	>	m = eval(argv[6]) + .5;
120	>	n = eval(argv[7]) + .5;
121		if (m <= 0 || n <= 0)
122		goto userror;
123		if (!strcmp(argv[5], "-") || access(argv[5], 4) == 0) { /* file? */
#	Line 298 | Line 309 | putobjrow(                     /* output vertex row to .OBJ */
309		int  n
310		)
311		{
301	–	static int      nverts = 0;
302	–	static int      nnorms = 0;
303	–
312		for ( ; n-- >= 0; rp++) {
313		if (!rp->valid)
314		continue;
#	Line 319 | Line 327 | putobjrow(                     /* output vertex row to .OBJ */
327
328
329		void
330	+	putobjvert(             /* put out OBJ vertex index triplet */
331	+	POINT *p
332	+	)
333	+	{
334	+	int     pti = p->valid ? p->valid-nverts-1 : 0;
335	+	int     ni = p->nvalid ? p->nvalid-nnorms-1 : 0;
336	+
337	+	printf(" %d/%d/%d", pti, pti, ni);
338	+	}
339	+
340	+
341	+	void
342		putsquare(              /* put out a square */
343		POINT *p0,
344		POINT *p1,
#	Line 350 | Line 370 | putsquare(             /* put out a square */
370		return;
371		if (objout) {                   /* output .OBJ faces */
372		if (ok1 & ok2 && fdot(vc1,vc2) >= 1.0-FTINY*FTINY) {
373	<	printf("f %d/%d/%d %d/%d/%d %d/%d/%d %d/%d/%d\n",
374	<	p0->valid, p0->valid, p0->nvalid,
375	<	p1->valid, p1->valid, p1->nvalid,
376	<	p3->valid, p3->valid, p3->nvalid,
357	<	p2->valid, p2->valid, p2->nvalid);
373	>	putc('f', stdout);
374	>	putobjvert(p0); putobjvert(p1);
375	>	putobjvert(p3); putobjvert(p2);
376	>	putc('\n', stdout);
377		return;
378		}
379	<	if (ok1)
380	<	printf("f %d/%d/%d %d/%d/%d %d/%d/%d\n",
381	<	p0->valid, p0->valid, p0->nvalid,
382	<	p1->valid, p1->valid, p1->nvalid,
383	<	p2->valid, p2->valid, p2->nvalid);
384	<	if (ok2)
385	<	printf("f %d/%d/%d %d/%d/%d %d/%d/%d\n",
386	<	p2->valid, p2->valid, p2->nvalid,
387	<	p1->valid, p1->valid, p1->nvalid,
388	<	p3->valid, p3->valid, p3->nvalid);
379	>	if (ok1) {
380	>	putc('f', stdout);
381	>	putobjvert(p0); putobjvert(p1); putobjvert(p2);
382	>	putc('\n', stdout);
383	>	}
384	>	if (ok2) {
385	>	putc('f', stdout);
386	>	putobjvert(p2); putobjvert(p1); putobjvert(p3);
387	>	putc('\n', stdout);
388	>	}
389		return;
390		}
391		/* compute normal interpolation */
#	Line 491 | Line 510 | compnorms(             /* compute row of averaged normals */
510		/* compute row 1 normals */
511		while (siz-- >= 0) {
512		if (!r1[0].valid)
513	<	continue;
513	>	goto skip;
514		if (!r0[0].valid) {
515		if (!r2[0].valid) {
516		r1[0].n[0] = r1[0].n[1] = r1[0].n[2] = 0.0;
517	<	continue;
517	>	goto skip;
518		}
519		fvsum(v1, r2[0].p, r1[0].p, -1.0);
520		} else if (!r2[0].valid)
#	Line 505 | Line 524 | compnorms(             /* compute row of averaged normals */
524		if (!r1[-1].valid) {
525		if (!r1[1].valid) {
526		r1[0].n[0] = r1[0].n[1] = r1[0].n[2] = 0.0;
527	<	continue;
527	>	goto skip;
528		}
529		fvsum(v2, r1[1].p, r1[0].p, -1.0);
530		} else if (!r1[1].valid)
#	Line 514 | Line 533 | compnorms(             /* compute row of averaged normals */
533		fvsum(v2, r1[1].p, r1[-1].p, -1.0);
534		fcross(r1[0].n, v1, v2);
535		normalize(r1[0].n);
536	+	skip:
537		r0++; r1++; r2++;
538		}
539		}

Diff Legend

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