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.11 by greg, Fri Apr 11 20:31:37 2014 UTC vs.
Revision 2.13 by greg, Wed May 7 01:16:03 2014 UTC

#	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],
49		av.pos[1], av.pos[2]);
50	<	printf("Normal:\t%f\t%f\t%f\n",
50	>	printf("Normal:\t\t%f\t%f\t%f\n",
51		norm[0], norm[1], norm[2]);
52		printf("Uvector:\t%f\t%f\t%f\n",
53		uvec[0], uvec[1], uvec[2]);
54	<	printf("Lvl,Wt,Urad,Vrad:\t%d\t\t%f\t%f\n", av.lvl,
54	>	printf("Lvl,Wt,UVrad:\t%d\t\t%f\t%f\t%f\n", av.lvl,
55		av.weight, av.rad[0], av.rad[1]);
56		printf("Value:\t\t%e\t%e\t%e\n", colval(av.val,RED),
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", av.corral);
61		}
62		if (ferror(stdout))
63		exit(1);
#	Line 103 | Line 105 | writamb(                       /* write binary ambient values to stdout */
105		if (!dataonly)
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);

Diff Legend

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