ViewVC Help

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

root/Development/ray/src/rt/lookamb.c

Comparing ray/src/rt/lookamb.c (file contents):
Revision 2.15 by greg, Thu Jun 19 16:26:55 2014 UTC vs.
Revision 2.17 by greg, Tue May 14 17:39:10 2019 UTC

#	Line 19 | Line 19 | int  reverse = 0;
19
20		AMBVAL  av;
21
22	–	#ifndef OLDAMB
22
24	–
23		static void
24		lookamb(                        /* load & convert ambient values from a file */
25		FILE  *fp
#	Line 90 | Line 88 | writamb(                       /* write binary ambient values to stdout */
88		av.udir = encodedir(norm);
89		if (!dataonly)
90		fscanf(fp, "%*s");
91	<	if (fscanf(fp, "%d %f %f %f", &av.lvl, &av.weight,
91	>	if (fscanf(fp, "%hd %f %f %f", &av.lvl, &av.weight,
92		&av.rad[0], &av.rad[1]) != 4)
93		return;
94		if (!dataonly)
#	Line 117 | Line 115 | writamb(                       /* write binary ambient values to stdout */
115		exit(1);
116		}
117		}
120	–
121	–
122	–	#else /* ! NEWAMB */
123	–
124	–
125	–	static void
126	–	lookamb(                        /* get ambient values from a file */
127	–	FILE  *fp
128	–	)
129	–	{
130	–	while (readambval(&av, fp)) {
131	–	if (dataonly) {
132	–	printf("%f\t%f\t%f\t", av.pos[0], av.pos[1], av.pos[2]);
133	–	printf("%f\t%f\t%f\t", av.dir[0], av.dir[1], av.dir[2]);
134	–	printf("%d\t%f\t%f\t", av.lvl, av.weight, av.rad);
135	–	printf("%e\t%e\t%e\t", colval(av.val,RED),
136	–	colval(av.val,GRN),
137	–	colval(av.val,BLU));
138	–	printf("%f\t%f\t%f\t", av.gpos[0],
139	–	av.gpos[1], av.gpos[2]);
140	–	printf("%f\t%f\t%f\n", av.gdir[0],
141	–	av.gdir[1], av.gdir[2]);
142	–	} else {
143	–	printf("Position:\t%f\t%f\t%f\n", av.pos[0],
144	–	av.pos[1], av.pos[2]);
145	–	printf("Direction:\t%f\t%f\t%f\n", av.dir[0],
146	–	av.dir[1], av.dir[2]);
147	–	printf("Lvl,Wt,Rad:\t%d\t\t%f\t%f\n", av.lvl,
148	–	av.weight, av.rad);
149	–	printf("Value:\t\t%e\t%e\t%e\n", colval(av.val,RED),
150	–	colval(av.val,GRN), colval(av.val,BLU));
151	–	printf("Pos.Grad:\t%f\t%f\t%f\n", av.gpos[0],
152	–	av.gpos[1], av.gpos[2]);
153	–	printf("Dir.Grad:\t%f\t%f\t%f\n\n", av.gdir[0],
154	–	av.gdir[1], av.gdir[2]);
155	–	}
156	–	if (ferror(stdout))
157	–	exit(1);
158	–	}
159	–	}
160	–
161	–
162	–	static void
163	–	writamb(                        /* write binary ambient values */
164	–	FILE  *fp
165	–	)
166	–	{
167	–	for ( ; ; ) {
168	–	if (!dataonly)
169	–	fscanf(fp, "%*s");
170	–	if (fscanf(fp, "%f %f %f",
171	–	&av.pos[0], &av.pos[1], &av.pos[2]) != 3)
172	–	return;
173	–	if (!dataonly)
174	–	fscanf(fp, "%*s");
175	–	if (fscanf(fp, "%f %f %f",
176	–	&av.dir[0], &av.dir[1], &av.dir[2]) != 3)
177	–	return;
178	–	if (!dataonly)
179	–	fscanf(fp, "%*s");
180	–	if (fscanf(fp, "%d %f %f",
181	–	&av.lvl, &av.weight, &av.rad) != 3)
182	–	return;
183	–	if (!dataonly)
184	–	fscanf(fp, "%*s");
185	–	if (fscanf(fp, "%f %f %f",
186	–	&av.val[RED], &av.val[GRN], &av.val[BLU]) != 3)
187	–	return;
188	–	if (!dataonly)
189	–	fscanf(fp, "%*s");
190	–	if (fscanf(fp, "%f %f %f",
191	–	&av.gpos[0], &av.gpos[1], &av.gpos[2]) != 3)
192	–	return;
193	–	if (!dataonly)
194	–	fscanf(fp, "%*s");
195	–	if (fscanf(fp, "%f %f %f",
196	–	&av.gdir[0], &av.gdir[1], &av.gdir[2]) != 3)
197	–	return;
198	–	av.next = NULL;
199	–	writambval(&av, stdout);
200	–	if (ferror(stdout))
201	–	exit(1);
202	–	}
203	–	}
204	–
205	–
206	–	#endif  /* ! NEWAMB */
118
119
120		int

Diff Legend

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