--- ray/src/rt/lookamb.c 1991/06/07 10:04:27 1.4 +++ ray/src/rt/lookamb.c 1992/07/13 16:17:42 2.2 @@ -65,17 +65,17 @@ char *argv[]; lookamb(fp) /* get ambient values from a file */ FILE *fp; { - while (fread((char *)&av, sizeof(AMBVAL), 1, fp) == 1) { + while (readambval(&av, fp)) { if (dataonly) { printf("%f\t%f\t%f\t", av.pos[0], av.pos[1], av.pos[2]); printf("%f\t%f\t%f\t", av.dir[0], av.dir[1], av.dir[2]); printf("%d\t%f\t%f\t", av.lvl, av.weight, av.rad); - printf("%e\t%e\t%e\n", colval(av.val,RED), + printf("%e\t%e\t%e\t", colval(av.val,RED), colval(av.val,GRN), colval(av.val,BLU)); printf("%f\t%f\t%f\t", av.gpos[0], av.gpos[1], av.gpos[2]); - printf("%f\t%f\t%f\t", av.gdir[0], + printf("%f\t%f\t%f\n", av.gdir[0], av.gdir[1], av.gdir[2]); } else { printf("\nPosition:\t%f\t%f\t%f\n", av.pos[0], @@ -132,7 +132,7 @@ FILE *fp; &av.gdir[0], &av.gdir[1], &av.gdir[2]) != 3) return; av.next = NULL; - fwrite((char *)&av, sizeof(AMBVAL), 1, stdout); + writambval(&av, stdout); if (ferror(stdout)) exit(1); }