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.9 by greg, Wed Feb 18 06:18:38 2015 UTC vs.
Revision 2.11 by greg, Fri Feb 20 18:07:10 2015 UTC

#	Line 66 | Line 66 | int            nfield_assign = 0;
66		/* data file(s) & spectra */
67		enum { DTtransForward, DTtransBackward, DTreflForward, DTreflBackward };
68
69	<	enum { DSsolar=-1, DSnir=-2, DSxbar31=-3, DSvisible=-4, DSzbar31=-5 };
69	>	enum { DSsolar=-1, DSnir=-2, DSxbar31=-3, DSvisible=-4, DSzbar31=-5,
70	>	DSuprime=-6, DSvprime=-7 };
71
72		#define MAXFILES        20
73
#	Line 294 | Line 295 | mat_assignments(const char *caller, const char *fn, ez
295		if (xml_input == win6_template)
296		for (i = 0; XMLfieldID[i].nickName[0]; i++)
297		if (XMLfieldID[i].win_need &&
298	<	!ezxml_txt(ezxml_child(wtl,XMLfieldID[i].fullName))[0]) {
298	>	!ezxml_txt(ezxml_child(wtl,XMLfieldID[i].fullName))[0])
299		fprintf(stderr,
300	<	"%s: missing required '%s' assignment for WINDOW <%s>\n",
300	>	"%s: warning - missing '%s' assignment for WINDOW <%s>\n",
301		caller, XMLfieldID[i].nickName,
302		XMLfieldID[i].fullName);
303	<	return 0;
303	<	}
304	<	return 1;               /* no errors */
303	>	return 1;
304		}
305
306		/* Complete angle basis specification */
#	Line 452 | Line 451 | writeBSDFblock(const char *caller, struct s_dfile *df)
451		puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
452		puts("\t\t<DetectorSpectrum>ASTM E308 1931 Z.dsp</DetectorSpectrum>");
453		break;
454	+	case DSuprime:
455	+	puts("\t\t<Wavelength unit=\"Integral\">CIE-Z</Wavelength>");
456	+	puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
457	+	puts("\t\t<DetectorSpectrum>ASTM E308 1931 u.dsp</DetectorSpectrum>");
458	+	break;
459	+	case DSvprime:
460	+	puts("\t\t<Wavelength unit=\"Integral\">CIE-Z</Wavelength>");
461	+	puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
462	+	puts("\t\t<DetectorSpectrum>ASTM E308 1931 v.dsp</DetectorSpectrum>");
463	+	break;
464		case DSsolar:
465		puts("\t\t<Wavelength unit=\"Integral\">Solar</Wavelength>");
466		puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp</SourceSpectrum>");
#	Line 707 | Line 716 | UsageExit(const char *pname)
716		{
717		fputs("Usage: ", stderr);
718		fputs(pname, stderr);
719	<	fputs(" [-W][-a {kf|kh|kq|t3|t4}][-u unit][-g geom][-f 'x=string;y=string']", stderr);
719	>	fputs(" [-W][-c][-a {kf|kh|kq|t3|t4}][-u unit][-g geom][-f 'x=string;y=string']", stderr);
720		fputs(" [-s spectr][-tb inp][-tf inp][-rb inp][-rf inp]", stderr);
721		fputs(" [input.xml]\n", stderr);
722		exit(1);
#	Line 833 | Line 842 | main(int argc, char *argv[])
842		cur_spectrum = DSxbar31;
843		else if (!strcasecmp(argv[i], "CIE-Z"))
844		cur_spectrum = DSzbar31;
845	+	else if (!strcasecmp(argv[i], "CIE-u"))
846	+	cur_spectrum = DSuprime;
847	+	else if (!strcasecmp(argv[i], "CIE-v"))
848	+	cur_spectrum = DSvprime;
849		else if (!strcasecmp(argv[i], "NIR"))
850		cur_spectrum = DSnir;
851		else {

Diff Legend

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