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.12 by greg, Wed Apr 23 06:04:18 2014 UTC vs.
Revision 2.16 by greg, Sun Aug 2 01:32:15 2015 UTC

#	Line 19 | Line 19 | int  reverse = 0;
19
20		AMBVAL  av;
21
22	<	#ifdef NEWAMB
22	>	#ifndef OLDAMB
23
24
25		static void
#	Line 42 | Line 42 | lookamb(                       /* load & convert ambient values from a fil
42		colval(av.val,GRN),
43		colval(av.val,BLU));
44		printf("%f\t%f\t", av.gpos[0], av.gpos[1]);
45	<	printf("%f\t%f\n", av.gdir[0], av.gdir[1]);
45	>	printf("%f\t%f\t", av.gdir[0], av.gdir[1]);
46	>	printf("%u\n", av.corral);
47		} else {
48	<	printf("\nPosition:\t%f\t%f\t%f\n", av.pos[0],
48	>	printf("Position:\t%f\t%f\t%f\n", av.pos[0],
49		av.pos[1], av.pos[2]);
50		printf("Normal:\t\t%f\t%f\t%f\n",
51		norm[0], norm[1], norm[2]);
#	Line 56 | Line 57 | lookamb(                       /* load & convert ambient values from a fil
57		colval(av.val,GRN), colval(av.val,BLU));
58		printf("Pos.Grad:\t%f\t%f\n", av.gpos[0], av.gpos[1]);
59		printf("Dir.Grad:\t%f\t%f\n", av.gdir[0], av.gdir[1]);
60	+	printf("Corral:\t\t%8X\n\n", av.corral);
61		}
62		if (ferror(stdout))
63		exit(1);
#	Line 88 | Line 90 | writamb(                       /* write binary ambient values to stdout */
90		av.udir = encodedir(norm);
91		if (!dataonly)
92		fscanf(fp, "%*s");
93	<	if (fscanf(fp, "%d %f %f %f", &av.lvl, &av.weight,
93	>	if (fscanf(fp, "%hd %f %f %f", &av.lvl, &av.weight,
94		&av.rad[0], &av.rad[1]) != 4)
95		return;
96		if (!dataonly)
#	Line 104 | Line 106 | writamb(                       /* write binary ambient values to stdout */
106		fscanf(fp, "%*s");
107		if (fscanf(fp, "%f %f", &av.gdir[0], &av.gdir[1]) != 2)
108		return;
109	+	if (dataonly) {
110	+	if (fscanf(fp, "%u", &av.corral) != 1)
111	+	return;
112	+	} else if (fscanf(fp, "%*s %X", &av.corral) != 1)
113	+	return;
114		av.next = NULL;
115		writambval(&av, stdout);
116		if (ferror(stdout))
#	Line 133 | Line 140 | lookamb(                       /* get ambient values from a file */
140		printf("%f\t%f\t%f\n", av.gdir[0],
141		av.gdir[1], av.gdir[2]);
142		} else {
143	<	printf("\nPosition:\t%f\t%f\t%f\n", av.pos[0],
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]);
#	Line 143 | Line 150 | lookamb(                       /* get ambient values from a file */
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", av.gdir[0],
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))

Diff Legend

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