10 |
|
#include "platform.h" |
11 |
|
#include "ray.h" |
12 |
|
#include "ambient.h" |
13 |
– |
#include "resolu.h" |
13 |
|
|
14 |
|
|
15 |
|
int dataonly = 0; |
25 |
|
) |
26 |
|
{ |
27 |
|
FVECT norm, uvec; |
28 |
+ |
COLOR avcol; |
29 |
|
|
30 |
|
while (readambval(&av, fp)) { |
31 |
|
decodedir(norm, av.ndir); |
32 |
|
decodedir(uvec, av.udir); |
33 |
+ |
scolor2rgb(avcol, av.val, AMB_CNDX[3], AMB_WLPART); |
34 |
|
if (dataonly) { |
35 |
|
printf("%f\t%f\t%f\t", av.pos[0], av.pos[1], av.pos[2]); |
36 |
|
printf("%f\t%f\t%f\t", norm[0], norm[1], norm[2]); |
37 |
|
printf("%f\t%f\t%f\t", uvec[0], uvec[1], uvec[2]); |
38 |
|
printf("%d\t%f\t%f\t%f\t", av.lvl, av.weight, |
39 |
|
av.rad[0], av.rad[1]); |
40 |
< |
printf("%e\t%e\t%e\t", colval(av.val,RED), |
41 |
< |
colval(av.val,GRN), |
42 |
< |
colval(av.val,BLU)); |
40 |
> |
printf("%e\t%e\t%e\t", colval(avcol,RED), |
41 |
> |
colval(avcol,GRN), |
42 |
> |
colval(avcol,BLU)); |
43 |
|
printf("%f\t%f\t", av.gpos[0], av.gpos[1]); |
44 |
|
printf("%f\t%f\t", av.gdir[0], av.gdir[1]); |
45 |
|
printf("%u\n", av.corral); |
52 |
|
uvec[0], uvec[1], uvec[2]); |
53 |
|
printf("Lvl,Wt,UVrad:\t%d\t\t%f\t%f\t%f\n", av.lvl, |
54 |
|
av.weight, av.rad[0], av.rad[1]); |
55 |
< |
printf("Value:\t\t%e\t%e\t%e\n", colval(av.val,RED), |
56 |
< |
colval(av.val,GRN), colval(av.val,BLU)); |
55 |
> |
printf("Value:\t\t%e\t%e\t%e\n", colval(avcol,RED), |
56 |
> |
colval(avcol,GRN), colval(avcol,BLU)); |
57 |
|
printf("Pos.Grad:\t%f\t%f\n", av.gpos[0], av.gpos[1]); |
58 |
|
printf("Dir.Grad:\t%f\t%f\n", av.gdir[0], av.gdir[1]); |
59 |
|
printf("Corral:\t\t%8X\n\n", av.corral); |
70 |
|
) |
71 |
|
{ |
72 |
|
FVECT norm; |
73 |
+ |
COLOR avcol; |
74 |
|
|
75 |
|
for ( ; ; ) { |
76 |
|
if (!dataonly) |
80 |
|
return; |
81 |
|
if (!dataonly) |
82 |
|
fscanf(fp, "%*s"); |
83 |
< |
if (fscanf(fp, FVFORMAT, &norm[0], &norm[1], &norm[2]) != 3) |
83 |
> |
if (fscanf(fp, FVFORMAT, &norm[0], &norm[1], &norm[2]) != 3 || |
84 |
> |
normalize(norm) == 0) |
85 |
|
return; |
86 |
|
av.ndir = encodedir(norm); |
87 |
|
if (!dataonly) |
88 |
|
fscanf(fp, "%*s"); |
89 |
< |
if (fscanf(fp, FVFORMAT, &norm[0], &norm[1], &norm[2]) != 3) |
89 |
> |
if (fscanf(fp, FVFORMAT, &norm[0], &norm[1], &norm[2]) != 3 || |
90 |
> |
normalize(norm) == 0) |
91 |
|
return; |
92 |
|
av.udir = encodedir(norm); |
93 |
|
if (!dataonly) |
98 |
|
if (!dataonly) |
99 |
|
fscanf(fp, "%*s"); |
100 |
|
if (fscanf(fp, "%f %f %f", |
101 |
< |
&av.val[RED], &av.val[GRN], &av.val[BLU]) != 3) |
101 |
> |
&avcol[RED], &avcol[GRN], &avcol[BLU]) != 3) |
102 |
|
return; |
103 |
+ |
setscolor(av.val, avcol[RED], avcol[GRN], avcol[BLU]); |
104 |
|
if (!dataonly) |
105 |
|
fscanf(fp, "%*s"); |
106 |
|
if (fscanf(fp, "%f %f", &av.gpos[0], &av.gpos[1]) != 2) |
115 |
|
} else if (fscanf(fp, "%*s %X", &av.corral) != 1) |
116 |
|
return; |
117 |
|
av.next = NULL; |
118 |
< |
writambval(&av, stdout); |
114 |
< |
if (ferror(stdout)) |
118 |
> |
if (writambval(&av, stdout) < 0) |
119 |
|
exit(1); |
120 |
|
} |
121 |
|
} |
157 |
|
return(1); |
158 |
|
} |
159 |
|
if (reverse) { |
160 |
+ |
SET_FILE_BINARY(stdout); |
161 |
|
if (header) { |
162 |
|
if (checkheader(fp, "ascii", stdout) < 0) |
163 |
|
goto formaterr; |
165 |
|
newheader("RADIANCE", stdout); |
166 |
|
printargs(argc, argv, stdout); |
167 |
|
} |
168 |
+ |
fputncomp(3, stdout); |
169 |
|
fputformat(AMBFMT, stdout); |
170 |
< |
putchar('\n'); |
165 |
< |
SET_FILE_BINARY(stdout); |
170 |
> |
fputc('\n', stdout); |
171 |
|
putambmagic(stdout); |
172 |
|
writamb(fp); |
173 |
|
} else { |
174 |
|
SET_FILE_BINARY(fp); |
175 |
< |
if (checkheader(fp, AMBFMT, header ? stdout : (FILE *)NULL) < 0) |
175 |
> |
if (getheader(fp, amb_headline, header ? stdout : (FILE *)NULL) < 0) |
176 |
|
goto formaterr; |
177 |
|
if (!hasambmagic(fp)) |
178 |
|
goto formaterr; |
179 |
|
if (header) { |
180 |
|
fputformat("ascii", stdout); |
181 |
< |
putchar('\n'); |
181 |
> |
fputc('\n', stdout); |
182 |
|
} |
183 |
|
lookamb(fp); |
184 |
|
} |