ViewVC Help

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

root/Development/ray/src/util/wrapBSDF.c

Comparing ray/src/util/wrapBSDF.c (file contents):
Revision 2.22 by greg, Tue Feb 14 19:58:37 2017 UTC vs.
Revision 2.24 by greg, Thu Apr 4 00:21:14 2019 UTC

#	Line 69 | Line 69 | const char     *field_assignment[MAXASSIGN];
69		int             nfield_assign = 0;
70		#define FASEP   ';'
71		/* data file(s) & spectra */
72	<	enum { DTtransForward, DTtransBackward, DTreflForward, DTreflBackward };
72	>	enum { DTransFront, DTransBack, DTreflFront, DTreflBack };
73
74	+	static const char       component_name[4][20] = {
75	+	"Transmission Front",
76	+	"Transmission Back",
77	+	"Reflection Front",
78	+	"Reflection Back"
79	+	};
80	+
81		enum { DSsolar=-1, DSnir=-2, DSxbar31=-3, DSvisible=-4, DSzbar31=-5,
82		DSuprime=-6, DSvprime=-7 };
83
#	Line 122 | Line 129 | static char    basis_definition[][256] = {
129		"\t</DataDefinition>\n",
130		};
131
132	+	/* Check that the last-added data file is unique */
133	+	static int
134	+	check_new_data_file()
135	+	{
136	+	int     i = ndataf;
137	+
138	+	while (i-- > 0)
139	+	if ((data_file[i].spectrum == data_file[ndataf].spectrum) &
140	+	(data_file[i].type == data_file[ndataf].type)) {
141	+	fprintf(stderr,
142	+	"%s: warning - ignoring duplicate component %s\n",
143	+	data_file[ndataf].fname,
144	+	component_name[data_file[i].type]);
145	+	return 0;
146	+	}
147	+	return 1;
148	+	}
149	+
150		/* Copy data from file descriptor to stdout and close */
151		static int
152		copy_and_close(int fd)
#	Line 485 | Line 510 | writeBSDFblock(const char *caller, struct s_dfile *df)
510		}
511		puts("\t\t<WavelengthDataBlock>");
512		fputs("\t\t\t<WavelengthDataDirection>", stdout);
513	<	switch (df->type) {
489	<	case DTtransForward:
490	<	fputs("Transmission Front", stdout);
491	<	break;
492	<	case DTtransBackward:
493	<	fputs("Transmission Back", stdout);
494	<	break;
495	<	case DTreflForward:
496	<	fputs("Reflection Front", stdout);
497	<	break;
498	<	case DTreflBackward:
499	<	fputs("Reflection Back", stdout);
500	<	break;
501	<	default:
502	<	fprintf(stderr, "%s: internal - bad BSDF type (%d)\n", caller, df->type);
503	<	return 0;
504	<	}
513	>	fputs(component_name[df->type], stdout);
514		puts("</WavelengthDataDirection>");
515		switch (angle_basis) {
516		case ABklemsFull:
#	Line 824 | Line 833 | main(int argc, char *argv[])
833		return 1;
834		}
835		if (!strcmp(argv[i], "-tf"))
836	<	data_file[ndataf].type = DTtransForward;
836	>	data_file[ndataf].type = DTransFront;
837		else if (!strcmp(argv[i], "-tb"))
838	<	data_file[ndataf].type = DTtransBackward;
838	>	data_file[ndataf].type = DTransBack;
839		else
840		UsageExit(argv[0]);
841		if (!strcmp(argv[++i], "-")) {
#	Line 835 | Line 844 | main(int argc, char *argv[])
844		}
845		data_file[ndataf].fname = argv[i];
846		data_file[ndataf].spectrum = cur_spectrum;
847	<	ndataf++;
847	>	ndataf += check_new_data_file();
848		continue;
849		case 'r':               /* reflection */
850		if (i >= argc-1)
#	Line 846 | Line 855 | main(int argc, char *argv[])
855		return 1;
856		}
857		if (!strcmp(argv[i], "-rf"))
858	<	data_file[ndataf].type = DTreflForward;
858	>	data_file[ndataf].type = DTreflFront;
859		else if (!strcmp(argv[i], "-rb"))
860	<	data_file[ndataf].type = DTreflBackward;
860	>	data_file[ndataf].type = DTreflBack;
861		else
862		UsageExit(argv[0]);
863		if (!strcmp(argv[++i], "-")) {
#	Line 857 | Line 866 | main(int argc, char *argv[])
866		}
867		data_file[ndataf].fname = argv[i];
868		data_file[ndataf].spectrum = cur_spectrum;
869	<	ndataf++;
869	>	ndataf += check_new_data_file();
870		continue;
871		case 's':               /* spectrum name or input file */
872		if (++i >= argc)

Diff Legend

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