ViewVC Help

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

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

Comparing ray/src/gen/genbox.c (file contents):
Revision 2.8 by greg, Sat Jul 25 19:18:01 2020 UTC vs.
Revision 2.9 by greg, Wed Apr 7 21:13:52 2021 UTC

#	Line 22 | Line 22 | double  size[3];       /* ppd size */
22
23		double  bevel = 0.0;    /* bevel amount */
24
25	<	int  rounde = 0;                /* boolean true for rounde edges */
25	>	int  rounde = 0;        /* boolean true for round edges */
26
27		int  reverse = 0;       /* boolean true for reversed normals */
28
#	Line 31 | Line 31 | int  reverse = 0;      /* boolean true for reversed normals
31		static void
32		vertex(int v)
33		{
34	<	register int  i;
34	>	int  i;
35
36		for (i = 0; i < 3; i++) {
37		if (v & 010)
#	Line 40 | Line 40 | vertex(int v)
40		printf("\t%18.12g", v & 01 ? size[i] : 0.0);
41		v >>= 1;
42		}
43	<	printf("\n");
43	>	fputc('\n', stdout);
44		}
45
46
#	Line 104 | Line 104 | sphere(int v0)                 /* generate a sphere */
104
105
106		int
107	<	main(int argc, char **argv)
107	>	main(int argc, char *argv[])
108		{
109		int  i;
110
#	Line 116 | Line 116 | main(int argc, char **argv)
116		size[0] = atof(argv[3]);
117		size[1] = atof(argv[4]);
118		size[2] = atof(argv[5]);
119	+	if ((size[0] <= 0.0) | (size[1] <= 0.0) | (size[2] <= 0.0))
120	+	goto userr;
121
122		for (i = 6; i < argc; i++) {
123		if (argv[i][0] != '-')
124		goto userr;
125		switch (argv[i][1]) {
126	+	case 'i':
127	+	reverse = 1;
128	+	break;
129		case 'r':
130		rounde = 1;
131		/* fall through */
132		case 'b':
133		bevel = atof(argv[++i]);
134	<	break;
135	<	case 'i':
136	<	reverse = 1;
132	<	break;
134	>	if (bevel > 0.0)
135	>	break;
136	>	/* fall through on error */
137		default:
138		goto userr;
139		}
140		}
141	+	if (rounde & reverse)
142	+	fprintf(stderr, "%s: warning - option -i ignored with -r\n",
143	+	argv[0]);
144
145		fputs("# ", stdout);
146		printargs(argc, argv, stdout);
#	Line 172 | Line 179 | main(int argc, char **argv)
179		corner(037, 067, 057);
180		}
181		if (bevel > 0.0 && rounde) {
182	<	/* rounde edges */
182	>	/* round edges */
183		cylinder(070, 071);
184		cylinder(070, 074);
185		cylinder(070, 072);
#	Line 185 | Line 192 | main(int argc, char **argv)
192		cylinder(076, 072);
193		cylinder(076, 074);
194		cylinder(076, 077);
195	<	/* rounde corners */
195	>	/* round corners */
196		sphere(070);
197		sphere(071);
198		sphere(072);
#	Line 195 | Line 202 | main(int argc, char **argv)
202		sphere(076);
203		sphere(077);
204		}
205	<	if (bevel == 0.0 ) {
205	>	if (bevel == 0.0) {
206		/* only need major faces */
207		side(1, 5, 4, 0);
208		side(4, 6, 2, 0);
#	Line 208 | Line 215 | main(int argc, char **argv)
215		userr:
216		fprintf(stderr, "Usage: %s ", argv[0]);
217		fprintf(stderr, "material name xsize ysize zsize ");
218	<	fprintf(stderr, "[-i] [-b bevel | -r rounde]\n");
218	>	fprintf(stderr, "[-i] [-b bevel | -r round]\n");
219		return(1);
220		}
214	–

Diff Legend

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