ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/cv/pabopto2bsdf.c

Comparing ray/src/cv/pabopto2bsdf.c (file contents):
Revision 2.36 by greg, Fri Jul 19 17:37:56 2019 UTC vs.
Revision 2.37 by greg, Mon Feb 15 23:20:22 2021 UTC

#	Line 29 | Line 29 | typedef struct {
29		} PGINPUT;
30
31		PGINPUT         *inpfile;       /* input files sorted by incidence */
32	–	int             ninpfiles;      /* number of input files */
32
33		int             rev_orient = 0; /* shall we reverse surface orientation? */
34
#	Line 47 | Line 46 | cmp_indir(const void *p1, const void *p2)
46		return(inp1->igp[0] - inp2->igp[0]);
47		}
48
49	+	/* Assign grid position from theta and phi */
50	+	static void
51	+	set_grid_pos(PGINPUT *pip)
52	+	{
53	+	FVECT   dv;
54	+
55	+	if (pip->theta <= FTINY) {
56	+	pip->igp[0] = pip->igp[1] = grid_res/2 - 1;
57	+	return;
58	+	}
59	+	dv[2] = sin(M_PI/180.*pip->theta);
60	+	dv[0] = cos(M_PI/180.*pip->phi)*dv[2];
61	+	dv[1] = sin(M_PI/180.*pip->phi)*dv[2];
62	+	dv[2] = sqrt(1. - dv[2]*dv[2]);
63	+	pos_from_vec(pip->igp, dv);
64	+	}
65	+
66		/* Prepare a PAB-Opto input file by reading its header */
67		static int
68		init_pabopto_inp(const int i, const char *fname)
69		{
70		FILE    *fp = fopen(fname, "r");
55	–	FVECT   dv;
71		char    buf[2048];
72		int     c;
73
#	Line 122 | Line 137 | init_pabopto_inp(const int i, const char *fname)
137		/* convert to Y-up orientation */
138		inpfile[i].phi += 90.-inpfile[i].up_phi;
139		/* convert angle to grid position */
140	<	dv[2] = sin(M_PI/180.*inpfile[i].theta);
126	<	dv[0] = cos(M_PI/180.*inpfile[i].phi)*dv[2];
127	<	dv[1] = sin(M_PI/180.*inpfile[i].phi)*dv[2];
128	<	dv[2] = sqrt(1. - dv[2]*dv[2]);
129	<	if (inpfile[i].theta <= FTINY)
130	<	inpfile[i].igp[0] = inpfile[i].igp[1] = grid_res/2 - 1;
131	<	else
132	<	pos_from_vec(inpfile[i].igp, dv);
140	>	set_grid_pos(&inpfile[i]);
141		return(1);
142		}
143
#	Line 174 | Line 182 | add_pabopto_inp(const int i)
182		theta_out = 180. - theta_out;
183		phi_out = 360. - phi_out;
184		}
185	<	add_bsdf_data(theta_out, phi_out+90.-inpfile[i].up_phi,
186	<	val, inpfile[i].isDSF);
185	>	phi_out += 90.-inpfile[i].up_phi;
186	>	add_bsdf_data(theta_out, phi_out, val, inpfile[i].isDSF);
187		}
188		n = 0;
189		while ((c = getc(fp)) != EOF)
#	Line 195 | Line 203 | add_pabopto_inp(const int i)
203		#define SYM_QUAD        'Q'             /* quadrilateral symmetry */
204		#define SYM_BILAT       'B'             /* bilateral symmetry */
205		#define SYM_ANISO       'A'             /* anisotropic */
206	+	#define SYM_UP          'U'             /* "up-down" (180°) symmetry */
207
208		static const char       quadrant_rep[16][16] = {
209		"in-plane","0-90","90-180","0-180",
#	Line 215 | Line 224 | int
224		main(int argc, char *argv[])
225		{
226		extern int      nprocs;
227	<	const char      *symmetry = "U";
228	<	int             i;
227	>	const char      *symmetry = "0";
228	>	int             ninpfiles, totinc;
229	>	int             a, i;
230		/* start header */
231		SET_FILE_BINARY(stdout);
232		newheader("RADIANCE", stdout);
233		printargs(argc, argv, stdout);
234		fputnow(stdout);
235		progname = argv[0];                     /* get options */
236	<	while (argc > 2 && argv[1][0] == '-') {
237	<	switch (argv[1][1]) {
236	>	for (a = 1; a < argc && argv[a][0] == '-'; a++)
237	>	switch (argv[a][1]) {
238		case 't':
239		rev_orient = !rev_orient;
240		break;
241		case 'n':
242	<	nprocs = atoi(argv[2]);
233	<	argv++; argc--;
242	>	nprocs = atoi(argv[++a]);
243		break;
244		case 's':
245	<	symmetry = argv[2];
237	<	argv++; argc--;
245	>	symmetry = argv[++a];
246		break;
247		default:
248		goto userr;
249		}
250	<	argv++; argc--;
243	<	}
244	<	/* initialize & sort inputs */
245	<	ninpfiles = argc - 1;
250	>	totinc = ninpfiles = argc - a;          /* initialize & sort inputs */
251		if (ninpfiles < 2)
252		goto userr;
253	<	inpfile = (PGINPUT *)malloc(sizeof(PGINPUT)*ninpfiles);
253	>	if (toupper(symmetry[0]) == SYM_UP)     /* special case for "up" symmetry */
254	>	totinc += ninpfiles;
255	>	inpfile = (PGINPUT *)malloc(sizeof(PGINPUT)*totinc);
256		if (inpfile == NULL)
257		return(1);
258		for (i = 0; i < ninpfiles; i++)
259	<	if (!init_pabopto_inp(i, argv[i+1]))
259	>	if (!init_pabopto_inp(i, argv[a+i]))
260		return(1);
261	+
262	+	for (i = ninpfiles; i < totinc; i++) {  /* copy for "up" symmetry */
263	+	inpfile[i] = inpfile[i-ninpfiles];
264	+	inpfile[i].phi += 180.;         /* invert duplicate data */
265	+	inpfile[i].up_phi -= 180.;
266	+	set_grid_pos(&inpfile[i]);      /* grid location for sorting */
267	+	}
268		qsort(inpfile, ninpfiles, sizeof(PGINPUT), cmp_indir);
269		/* compile measurements */
270	<	for (i = 0; i < ninpfiles; i++)
270	>	for (i = 0; i < totinc; i++)
271		if (!add_pabopto_inp(i))
272		return(1);
273		make_rbfrep();                          /* process last data set */
274		/* check input symmetry */
275		switch (toupper(symmetry[0])) {
276	<	case 'U':                               /* unspecified symmetry */
276	>	case '0':                               /* unspecified symmetry */
277		if (quadrant_sym[inp_coverage] != SYM_ILL)
278		break;                  /* anything legal goes */
279		fprintf(stderr, "%s: unsupported phi coverage (%s)\n",
280		progname, quadrant_rep[inp_coverage]);
281		return(1);
282	<	case SYM_ISO:                           /* legal symmetry types */
282	>	case SYM_UP:                            /* faux "up" symmetry */
283	>	if (quadrant_sym[inp_coverage] == SYM_ANISO)
284	>	break;
285	>	/* fall through */
286	>	case SYM_ISO:                           /* usual symmetry types */
287		case SYM_QUAD:
288		case SYM_BILAT:
289		case SYM_ANISO:
#	Line 277 | Line 295 | main(int argc, char *argv[])
295		return(1);
296		default:
297		fprintf(stderr,
298	<	"%s: -s option must be Isotropic, Quadrilateral, Bilateral, or Anisotropic\n",
298	>	"%s: -s option must be Isotropic, Quadrilateral, Bilateral, Up, or Anisotropic\n",
299		progname);
300		return(1);
301		}
#	Line 313 | Line 331 | main(int argc, char *argv[])
331		fprintf(stderr, "Usage: %s input.dat > output.rad\n", progname);
332		return(1);
333		}
316	–	ninpfiles = 1;
334		inpfile = &pginp;
335		if (!init_pabopto_inp(0, argv[1]) || !add_pabopto_inp(0))
336		return(1);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)