[ViewVC] Diff of: radiance/ray/src/ot/obj2mesh.c

Comparing ray/src/ot/obj2mesh.c (file contents):
Revision 2.15 by greg, Fri Mar 3 01:25:27 2017 UTC vs.
Revision 2.16 by greg, Wed Jul 28 22:16:43 2021 UTC

#	Line 39 \| Line 39 \| *main( / compile a .OBJ file into a mesh /*
39		char *argv[]
40		)
41		{
42	–	int nmatf = 0;
42		int verbose = 0;
44	–	char pathnames[12800];
45	–	char *pns = pathnames;
46	–	char *matinp[128];
43		char *cp;
44		int i, j;
45
#	Line 59 \| Line 55 \| *main( / compile a .OBJ file into a mesh /*
55		resolu = atoi(argv[++i]);
56		break;
57		case 'a': /* material file */
58	<	matinp[nmatf++] = argv[++i];
58	>	readobj(argv[++i]);
59		break;
60		case 'l': /* library material */
61		cp = getpath(argv[++i], getrlibpath(), R_OK);
#	Line 69 \| Line 65 \| *main( / compile a .OBJ file into a mesh /*
65		argv[i]);
66		error(SYSTEM, errmsg);
67		}
68	<	matinp[nmatf++] = strcpy(pns, cp);
73	<	while (*pns++)
74	<	;
68	>	readobj(cp);
69		break;
70		case 'w': /* supress warnings */
71		nowarn = 1;
#	Line 89 \| Line 83 \| *main( / compile a .OBJ file into a mesh /*
83		error(USER, "too many file arguments");
84		/* initialize mesh */
85		cvinit(i==argc-2 ? argv[i+1] : "<stdout>");
92	–	/* load material input */
93	–	for (j = 0; j < nmatf; j++)
94	–	readobj(matinp[j]);
86		/* read .OBJ file into triangles */
87		if (i == argc)
88		wfreadobj(NULL);

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