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.18 by greg, Thu Oct 18 03:59:54 2007 UTC vs.
Revision 2.19 by greg, Wed Dec 8 21:37:51 2010 UTC

#	Line 35 | Line 35 | char  VNAME[] =        "valid";                /* valid vertex name */
35		#define  pvect(p)       printf(vformat, (p)[0], (p)[1], (p)[2])
36
37		char  vformat[] = "%18.12g %18.12g %18.12g\n";
38	<	char  tsargs[] = "4 surf_dx surf_dy surf_dz surf.cal\n";
38	>	char  tsargs[] = "4 surf_dx surf_dy surf_dz surf.cal";
39		char  texname[] = "Phong";
40
41		int  smooth = 0;                /* apply smoothing? */
#	Line 382 | Line 382 | putsquare(             /* put out a square */
382		if (ok1 & ok2 && fdot(vc1,vc2) >= 1.0-FTINY*FTINY) {
383		printf("\n%s ", modname);
384		if (axis != -1) {
385	<	printf("texfunc %s\n", texname);
386	<	printf(tsargs);
385	>	printf("texfunc %s\n%s\n", texname, tsargs);
386		printf("0\n13\t%d\n", axis);
387		pvect(norm[0]);
388		pvect(norm[1]);
#	Line 405 | Line 404 | putsquare(             /* put out a square */
404		if (ok1) {
405		printf("\n%s ", modname);
406		if (axis != -1) {
407	<	printf("texfunc %s\n", texname);
409	<	printf(tsargs);
407	>	printf("texfunc %s\n%s\n", texname, tsargs);
408		printf("0\n13\t%d\n", axis);
409		pvect(norm[0]);
410		pvect(norm[1]);
#	Line 424 | Line 422 | putsquare(             /* put out a square */
422		if (ok2) {
423		printf("\n%s ", modname);
424		if (axis != -1) {
425	<	printf("texfunc %s\n", texname);
428	<	printf(tsargs);
425	>	printf("texfunc %s\n%s\n", texname, tsargs);
426		printf("0\n13\t%d\n", axis);
427		pvect(norm[0]);
428		pvect(norm[1]);

Diff Legend

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