--- ray/src/rt/lookamb.c 2014/04/11 20:31:37 2.11 +++ ray/src/rt/lookamb.c 2014/05/07 01:16:03 2.13 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: lookamb.c,v 2.11 2014/04/11 20:31:37 greg Exp $"; +static const char RCSid[] = "$Id: lookamb.c,v 2.13 2014/05/07 01:16:03 greg Exp $"; #endif /* * lookamb.c - program to examine ambient components. @@ -42,20 +42,22 @@ lookamb( /* load & convert ambient values from a fil colval(av.val,GRN), colval(av.val,BLU)); printf("%f\t%f\t", av.gpos[0], av.gpos[1]); - printf("%f\t%f\n", av.gdir[0], av.gdir[1]); + printf("%f\t%f\t", av.gdir[0], av.gdir[1]); + printf("%u\n", av.corral); } else { printf("\nPosition:\t%f\t%f\t%f\n", av.pos[0], av.pos[1], av.pos[2]); - printf("Normal:\t%f\t%f\t%f\n", + printf("Normal:\t\t%f\t%f\t%f\n", norm[0], norm[1], norm[2]); printf("Uvector:\t%f\t%f\t%f\n", uvec[0], uvec[1], uvec[2]); - printf("Lvl,Wt,Urad,Vrad:\t%d\t\t%f\t%f\n", av.lvl, + printf("Lvl,Wt,UVrad:\t%d\t\t%f\t%f\t%f\n", av.lvl, av.weight, av.rad[0], av.rad[1]); printf("Value:\t\t%e\t%e\t%e\n", colval(av.val,RED), colval(av.val,GRN), colval(av.val,BLU)); printf("Pos.Grad:\t%f\t%f\n", av.gpos[0], av.gpos[1]); printf("Dir.Grad:\t%f\t%f\n", av.gdir[0], av.gdir[1]); + printf("Corral:\t\t%8X\n", av.corral); } if (ferror(stdout)) exit(1); @@ -103,6 +105,11 @@ writamb( /* write binary ambient values to stdout */ if (!dataonly) fscanf(fp, "%*s"); if (fscanf(fp, "%f %f", &av.gdir[0], &av.gdir[1]) != 2) + return; + if (dataonly) { + if (fscanf(fp, "%u", &av.corral) != 1) + return; + } else if (fscanf(fp, "%*s %X", &av.corral) != 1) return; av.next = NULL; writambval(&av, stdout);