18 |
|
|
19 |
|
|
20 |
|
int dataonly = 0; |
21 |
< |
|
21 |
> |
int header = 1; |
22 |
|
int reverse = 0; |
23 |
|
|
24 |
|
AMBVAL av; |
39 |
|
case 'r': |
40 |
|
reverse = 1; |
41 |
|
break; |
42 |
+ |
case 'h': |
43 |
+ |
header = 0; |
44 |
+ |
break; |
45 |
|
default: |
46 |
|
fprintf(stderr, "%s: unknown option '%s'\n", |
47 |
|
argv[0], argv[i]); |
56 |
|
fprintf(stderr, "%s: file not found\n", argv[i]); |
57 |
|
return(1); |
58 |
|
} |
59 |
< |
if (reverse) |
59 |
> |
if (reverse) { |
60 |
> |
if (header) { |
61 |
> |
if (checkheader(fp, "ascii", stdout) < 0) |
62 |
> |
goto formaterr; |
63 |
> |
} else |
64 |
> |
printargs(argc, argv, stdout); |
65 |
> |
fputformat(AMBFMT, stdout); |
66 |
> |
putchar('\n'); |
67 |
> |
putambmagic(stdout); |
68 |
|
writamb(fp); |
69 |
< |
else |
69 |
> |
} else { |
70 |
> |
if (checkheader(fp, AMBFMT, header ? stdout : (FILE *)NULL) < 0) |
71 |
> |
goto formaterr; |
72 |
> |
if (!hasambmagic(fp)) |
73 |
> |
goto formaterr; |
74 |
> |
if (header) { |
75 |
> |
fputformat("ascii", stdout); |
76 |
> |
putchar('\n'); |
77 |
> |
} |
78 |
|
lookamb(fp); |
79 |
+ |
} |
80 |
|
fclose(fp); |
81 |
|
return(0); |
82 |
+ |
formaterr: |
83 |
+ |
fprintf(stderr, "%s: format error on input\n", argv[0]); |
84 |
+ |
exit(1); |
85 |
|
} |
86 |
|
|
87 |
|
|
88 |
|
lookamb(fp) /* get ambient values from a file */ |
89 |
|
FILE *fp; |
90 |
|
{ |
91 |
< |
while (fread((char *)&av, sizeof(AMBVAL), 1, fp) == 1) { |
91 |
> |
while (readambval(&av, fp)) { |
92 |
|
if (dataonly) { |
93 |
|
printf("%f\t%f\t%f\t", av.pos[0], av.pos[1], av.pos[2]); |
94 |
|
printf("%f\t%f\t%f\t", av.dir[0], av.dir[1], av.dir[2]); |
95 |
|
printf("%d\t%f\t%f\t", av.lvl, av.weight, av.rad); |
96 |
< |
printf("%e\t%e\t%e\n", colval(av.val,RED), |
96 |
> |
printf("%e\t%e\t%e\t", colval(av.val,RED), |
97 |
|
colval(av.val,GRN), |
98 |
|
colval(av.val,BLU)); |
99 |
|
printf("%f\t%f\t%f\t", av.gpos[0], |
100 |
|
av.gpos[1], av.gpos[2]); |
101 |
< |
printf("%f\t%f\t%f\t", av.gdir[0], |
101 |
> |
printf("%f\t%f\t%f\n", av.gdir[0], |
102 |
|
av.gdir[1], av.gdir[2]); |
103 |
|
} else { |
104 |
|
printf("\nPosition:\t%f\t%f\t%f\n", av.pos[0], |
155 |
|
&av.gdir[0], &av.gdir[1], &av.gdir[2]) != 3) |
156 |
|
return; |
157 |
|
av.next = NULL; |
158 |
< |
fwrite((char *)&av, sizeof(AMBVAL), 1, stdout); |
158 |
> |
writambval(&av, stdout); |
159 |
|
if (ferror(stdout)) |
160 |
|
exit(1); |
161 |
|
} |