--- ray/src/util/wrapBSDF.c 2015/02/18 06:18:38 2.9
+++ ray/src/util/wrapBSDF.c 2015/05/29 07:16:49 2.15
@@ -1,5 +1,5 @@
#ifndef lint
-static const char RCSid[] = "$Id: wrapBSDF.c,v 2.9 2015/02/18 06:18:38 greg Exp $";
+static const char RCSid[] = "$Id: wrapBSDF.c,v 2.15 2015/05/29 07:16:49 greg Exp $";
#endif
/*
* Wrap BSDF data in valid WINDOW XML file
@@ -66,7 +66,8 @@ int nfield_assign = 0;
/* data file(s) & spectra */
enum { DTtransForward, DTtransBackward, DTreflForward, DTreflBackward };
-enum { DSsolar=-1, DSnir=-2, DSxbar31=-3, DSvisible=-4, DSzbar31=-5 };
+enum { DSsolar=-1, DSnir=-2, DSxbar31=-3, DSvisible=-4, DSzbar31=-5,
+ DSuprime=-6, DSvprime=-7 };
#define MAXFILES 20
@@ -159,6 +160,7 @@ input2str(const char *inpspec)
fprintf(stderr, "%s: cannot open\n", inpspec);
return "";
}
+#ifndef _WIN32 /* XXX somehow broken on Windows */
len = lseek(fd, 0L, SEEK_END);
if (len > 0) {
lseek(fd, 0L, SEEK_SET);
@@ -177,6 +179,7 @@ input2str(const char *inpspec)
close(fd);
return str;
}
+#endif
fp = fdopen(fd, "r"); /* not a regular file */
}
/* reading from stream */
@@ -294,14 +297,12 @@ mat_assignments(const char *caller, const char *fn, ez
if (xml_input == win6_template)
for (i = 0; XMLfieldID[i].nickName[0]; i++)
if (XMLfieldID[i].win_need &&
- !ezxml_txt(ezxml_child(wtl,XMLfieldID[i].fullName))[0]) {
+ !ezxml_txt(ezxml_child(wtl,XMLfieldID[i].fullName))[0])
fprintf(stderr,
- "%s: missing required '%s' assignment for WINDOW <%s>\n",
+ "%s: warning - missing '%s' assignment for WINDOW <%s>\n",
caller, XMLfieldID[i].nickName,
XMLfieldID[i].fullName);
- return 0;
- }
- return 1; /* no errors */
+ return 1;
}
/* Complete angle basis specification */
@@ -444,22 +445,30 @@ writeBSDFblock(const char *caller, struct s_dfile *df)
break;
case DSxbar31:
puts("\t\tCIE-X");
- puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp");
+ puts("\t\tCIE Illuminant D65 1nm.ssp");
puts("\t\tASTM E308 1931 X.dsp");
break;
case DSzbar31:
puts("\t\tCIE-Z");
- puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp");
+ puts("\t\tCIE Illuminant D65 1nm.ssp");
puts("\t\tASTM E308 1931 Z.dsp");
break;
+ case DSuprime:
+ puts("\t\tCIE-u");
+ puts("\t\tCIE Illuminant D65 1nm.ssp");
+ break;
+ case DSvprime:
+ puts("\t\tCIE-v");
+ puts("\t\tCIE Illuminant D65 1nm.ssp");
+ break;
case DSsolar:
puts("\t\tSolar");
- puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp");
+ puts("\t\tCIE Illuminant D65 1nm.ssp");
puts("\t\tNone");
break;
case DSnir:
puts("\t\tNIR");
- puts("\t\tSourceSpectrum>PLACE_HOLDER");
+ puts("\t\tPLACE_HOLDER");
puts("\t\tPLACE_HOLDER");
break;
default:
@@ -470,7 +479,7 @@ writeBSDFblock(const char *caller, struct s_dfile *df)
spectr_file[df->spectrum]);
if (cp != NULL)
*cp = '.';
- puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp");
+ puts("\t\tCIE Illuminant D65 1nm.ssp");
printf("\t\t%s\n",
spectr_file[df->spectrum]);
break;
@@ -576,6 +585,7 @@ writeBSDF(const char *caller, ezxml_t fl)
free(xml);
return 0;
}
+ puts("");
fflush(stdout); /* write previous XML info. */
if (write(fileno(stdout), xml, ei) != ei) {
free(xml);
@@ -707,7 +717,7 @@ UsageExit(const char *pname)
{
fputs("Usage: ", stderr);
fputs(pname, stderr);
- fputs(" [-W][-a {kf|kh|kq|t3|t4}][-u unit][-g geom][-f 'x=string;y=string']", stderr);
+ fputs(" [-W][-c][-a {kf|kh|kq|t3|t4}][-u unit][-g geom][-f 'x=string;y=string']", stderr);
fputs(" [-s spectr][-tb inp][-tf inp][-rb inp][-rf inp]", stderr);
fputs(" [input.xml]\n", stderr);
exit(1);
@@ -833,6 +843,10 @@ main(int argc, char *argv[])
cur_spectrum = DSxbar31;
else if (!strcasecmp(argv[i], "CIE-Z"))
cur_spectrum = DSzbar31;
+ else if (!strcasecmp(argv[i], "CIE-u"))
+ cur_spectrum = DSuprime;
+ else if (!strcasecmp(argv[i], "CIE-v"))
+ cur_spectrum = DSvprime;
else if (!strcasecmp(argv[i], "NIR"))
cur_spectrum = DSnir;
else {