3 |
|
#endif |
4 |
|
/* |
5 |
|
* Load measured BSDF data in PAB-Opto format. |
6 |
+ |
* Assumes that surface-normal (Z-axis) faces into room unless -t option given. |
7 |
|
* |
8 |
|
* G. Ward |
9 |
|
*/ |
22 |
|
|
23 |
|
typedef struct { |
24 |
|
const char *fname; /* input file path */ |
25 |
< |
double theta, phi; /* input angles */ |
25 |
> |
double theta, phi; /* input angles (degrees) */ |
26 |
> |
double up_phi; /* azimuth for "up" direction */ |
27 |
|
int igp[2]; /* input grid position */ |
28 |
|
int isDSF; /* data is DSF (rather than BSDF)? */ |
29 |
+ |
int nspec; /* number of spectral samples */ |
30 |
|
long dstart; /* data start offset in file */ |
31 |
|
} PGINPUT; |
32 |
|
|
33 |
|
PGINPUT *inpfile; /* input files sorted by incidence */ |
34 |
|
int ninpfiles; /* number of input files */ |
35 |
|
|
36 |
+ |
int rev_orient = 0; /* shall we reverse surface orientation? */ |
37 |
+ |
|
38 |
|
/* Compare incident angles */ |
39 |
|
static int |
40 |
|
cmp_indir(const void *p1, const void *p2) |
65 |
|
} |
66 |
|
inpfile[i].fname = fname; |
67 |
|
inpfile[i].isDSF = -1; |
68 |
+ |
inpfile[i].nspec = 0; |
69 |
+ |
inpfile[i].up_phi = 0; |
70 |
|
inpfile[i].theta = inpfile[i].phi = -10001.; |
71 |
|
/* read header information */ |
72 |
|
while ((c = getc(fp)) == '#' || c == EOF) { |
73 |
< |
char typ[32]; |
73 |
> |
char typ[64]; |
74 |
|
if (fgets(buf, sizeof(buf), fp) == NULL) { |
75 |
|
fputs(fname, stderr); |
76 |
|
fputs(": unexpected EOF\n", stderr); |
79 |
|
} |
80 |
|
if (sscanf(buf, "sample_name \"%[^\"]\"", bsdf_name) == 1) |
81 |
|
continue; |
82 |
+ |
if (sscanf(buf, "colorimetry: %s", typ) == 1) { |
83 |
+ |
if (!strcasecmp(typ, "CIE-XYZ")) |
84 |
+ |
inpfile[i].nspec = 3; |
85 |
+ |
else if (!strcasecmp(typ, "CIE-Y")) |
86 |
+ |
inpfile[i].nspec = 1; |
87 |
+ |
continue; |
88 |
+ |
} |
89 |
|
if (sscanf(buf, "format: theta phi %s", typ) == 1) { |
90 |
< |
if (!strcasecmp(typ, "DSF")) { |
90 |
> |
if (!strcasecmp(typ, "DSF")) |
91 |
|
inpfile[i].isDSF = 1; |
92 |
< |
continue; |
79 |
< |
} |
80 |
< |
if (!strcasecmp(typ, "BSDF") || |
92 |
> |
else if (!strcasecmp(typ, "BSDF") || |
93 |
|
!strcasecmp(typ, "BRDF") || |
94 |
< |
!strcasecmp(typ, "BTDF")) { |
94 |
> |
!strcasecmp(typ, "BTDF")) |
95 |
|
inpfile[i].isDSF = 0; |
96 |
< |
continue; |
85 |
< |
} |
96 |
> |
continue; |
97 |
|
} |
98 |
+ |
if (sscanf(buf, "upphi %lf", &inpfile[i].up_phi) == 1) |
99 |
+ |
continue; |
100 |
|
if (sscanf(buf, "intheta %lf", &inpfile[i].theta) == 1) |
101 |
|
continue; |
102 |
|
if (sscanf(buf, "inphi %lf", &inpfile[i].phi) == 1) |
117 |
|
fputs(": unknown incident angle\n", stderr); |
118 |
|
return(0); |
119 |
|
} |
120 |
+ |
if (rev_orient) { /* reverse Z-axis to face outside */ |
121 |
+ |
inpfile[i].theta = 180. - inpfile[i].theta; |
122 |
+ |
inpfile[i].phi = 360. - inpfile[i].phi; |
123 |
+ |
} |
124 |
+ |
/* convert to Y-up orientation */ |
125 |
+ |
inpfile[i].phi += 90.-inpfile[i].up_phi; |
126 |
|
/* convert angle to grid position */ |
127 |
|
dv[2] = sin(M_PI/180.*inpfile[i].theta); |
128 |
|
dv[0] = cos(M_PI/180.*inpfile[i].phi)*dv[2]; |
129 |
|
dv[1] = sin(M_PI/180.*inpfile[i].phi)*dv[2]; |
130 |
|
dv[2] = sqrt(1. - dv[2]*dv[2]); |
131 |
< |
pos_from_vec(inpfile[i].igp, dv); |
131 |
> |
if (inpfile[i].theta <= FTINY) |
132 |
> |
inpfile[i].igp[0] = inpfile[i].igp[1] = grid_res/2 - 1; |
133 |
> |
else |
134 |
> |
pos_from_vec(inpfile[i].igp, dv); |
135 |
|
return(1); |
136 |
|
} |
137 |
|
|
140 |
|
add_pabopto_inp(const int i) |
141 |
|
{ |
142 |
|
FILE *fp = fopen(inpfile[i].fname, "r"); |
143 |
< |
double theta_out, phi_out, val; |
143 |
> |
double theta_out, phi_out, val[3]; |
144 |
|
int n, c; |
145 |
|
|
146 |
|
if (fp == NULL || fseek(fp, inpfile[i].dstart, 0) == EOF) { |
156 |
|
fprintf(stderr, "New incident (theta,phi)=(%.1f,%.1f)\n", |
157 |
|
inpfile[i].theta, inpfile[i].phi); |
158 |
|
#endif |
159 |
+ |
if (inpfile[i].nspec) |
160 |
+ |
set_spectral_samples(inpfile[i].nspec); |
161 |
|
new_bsdf_data(inpfile[i].theta, inpfile[i].phi); |
162 |
|
} |
163 |
|
#ifdef DEBUG |
164 |
|
fprintf(stderr, "Loading measurements from '%s'...\n", inpfile[i].fname); |
165 |
|
#endif |
166 |
|
/* read scattering data */ |
167 |
< |
while (fscanf(fp, "%lf %lf %lf\n", &theta_out, &phi_out, &val) == 3) |
168 |
< |
add_bsdf_data(theta_out, phi_out, val, inpfile[i].isDSF); |
167 |
> |
while (fscanf(fp, "%lf %lf %lf", &theta_out, &phi_out, val) == 3) { |
168 |
> |
for (n = 1; n < inpfile[i].nspec; n++) |
169 |
> |
if (fscanf(fp, "%lf", val+n) != 1) { |
170 |
> |
fprintf(stderr, "%s: warning: unexpected EOF\n", |
171 |
> |
inpfile[i].fname); |
172 |
> |
fclose(fp); |
173 |
> |
return(1); |
174 |
> |
} |
175 |
> |
if (rev_orient) { /* reverse Z-axis to face outside */ |
176 |
> |
theta_out = 180. - theta_out; |
177 |
> |
phi_out = 360. - phi_out; |
178 |
> |
} |
179 |
> |
add_bsdf_data(theta_out, phi_out+90.-inpfile[i].up_phi, |
180 |
> |
val, inpfile[i].isDSF); |
181 |
> |
} |
182 |
|
n = 0; |
183 |
|
while ((c = getc(fp)) != EOF) |
184 |
|
n += !isspace(c); |
205 |
|
progname = argv[0]; /* get options */ |
206 |
|
while (argc > 2 && argv[1][0] == '-') { |
207 |
|
switch (argv[1][1]) { |
208 |
+ |
case 't': |
209 |
+ |
rev_orient = !rev_orient; |
210 |
+ |
break; |
211 |
|
case 'n': |
212 |
|
nprocs = atoi(argv[2]); |
213 |
+ |
argv++; argc--; |
214 |
|
break; |
215 |
|
default: |
216 |
|
goto userr; |
217 |
|
} |
218 |
< |
argv += 2; argc -= 2; |
218 |
> |
argv++; argc--; |
219 |
|
} |
220 |
|
/* initialize & sort inputs */ |
221 |
|
ninpfiles = argc - 1; |
227 |
|
for (i = 0; i < ninpfiles; i++) |
228 |
|
if (!init_pabopto_inp(i, argv[i+1])) |
229 |
|
return(1); |
230 |
< |
qsort(inpfile, ninpfiles, sizeof(PGINPUT), &cmp_indir); |
230 |
> |
qsort(inpfile, ninpfiles, sizeof(PGINPUT), cmp_indir); |
231 |
|
/* compile measurements */ |
232 |
|
for (i = 0; i < ninpfiles; i++) |
233 |
|
if (!add_pabopto_inp(i)) |
237 |
|
save_bsdf_rep(stdout); /* write it out */ |
238 |
|
return(0); |
239 |
|
userr: |
240 |
< |
fprintf(stderr, "Usage: %s [-n nproc] meas1.dat meas2.dat .. > bsdf.sir\n", |
240 |
> |
fprintf(stderr, "Usage: %s [-t][-n nproc] meas1.dat meas2.dat .. > bsdf.sir\n", |
241 |
|
progname); |
242 |
|
return(1); |
243 |
|
} |
274 |
|
#if 1 /* produce spheres at meas. */ |
275 |
|
puts("void plastic yellow\n0\n0\n5 .6 .4 .01 .04 .08\n"); |
276 |
|
n = 0; |
277 |
< |
for (i = 0; i < GRIDRES; i++) |
278 |
< |
for (j = 0; j < GRIDRES; j++) |
277 |
> |
for (i = 0; i < grid_res; i++) |
278 |
> |
for (j = 0; j < grid_res; j++) |
279 |
|
if (dsf_grid[i][j].sum.n > 0) { |
280 |
|
ovec_from_pos(dir, i, j); |
281 |
|
bsdf = dsf_grid[i][j].sum.v / |
295 |
|
for (n = 0; n < dsf_list->nrbf; n++) { |
296 |
|
RBFVAL *rbf = &dsf_list->rbfa[n]; |
297 |
|
ovec_from_pos(dir, rbf->gx, rbf->gy); |
298 |
< |
bsdf = eval_rbfrep(dsf_list, dir) / (output_orient*dir[2]); |
298 |
> |
bsdf = eval_rbfrep(dsf_list, dir); |
299 |
|
bsdf = log(bsdf + 1e-5) - min_log; |
300 |
|
printf("red sphere p%04d\n0\n0\n", ++n); |
301 |
|
printf("4 %.6g %.6g %.6g %.6g\n\n", |
306 |
|
#if 1 /* output continuous surface */ |
307 |
|
puts("void trans tgreen\n0\n0\n7 .7 1 .7 .04 .04 .9 1\n"); |
308 |
|
fflush(stdout); |
309 |
< |
sprintf(buf, "gensurf tgreen bsdf - - - %d %d", GRIDRES-1, GRIDRES-1); |
309 |
> |
sprintf(buf, "gensurf tgreen bsdf - - - %d %d", grid_res-1, grid_res-1); |
310 |
|
pfp = popen(buf, "w"); |
311 |
|
if (pfp == NULL) { |
312 |
|
fprintf(stderr, "%s: cannot open '| %s'\n", progname, buf); |
313 |
|
return(1); |
314 |
|
} |
315 |
< |
for (i = 0; i < GRIDRES; i++) |
316 |
< |
for (j = 0; j < GRIDRES; j++) { |
315 |
> |
for (i = 0; i < grid_res; i++) |
316 |
> |
for (j = 0; j < grid_res; j++) { |
317 |
|
ovec_from_pos(dir, i, j); |
318 |
< |
bsdf = eval_rbfrep(dsf_list, dir) / (output_orient*dir[2]); |
318 |
> |
bsdf = eval_rbfrep(dsf_list, dir); |
319 |
|
bsdf = log(bsdf + 1e-5) - min_log; |
320 |
|
fprintf(pfp, "%.8e %.8e %.8e\n", |
321 |
|
dir[0]*bsdf, dir[1]*bsdf, dir[2]*bsdf); |