--- ray/src/util/wrapBSDF.c 2015/02/20 17:05:40 2.10
+++ ray/src/util/wrapBSDF.c 2015/05/29 07:45:48 2.16
@@ -1,5 +1,5 @@
#ifndef lint
-static const char RCSid[] = "$Id: wrapBSDF.c,v 2.10 2015/02/20 17:05:40 greg Exp $";
+static const char RCSid[] = "$Id: wrapBSDF.c,v 2.16 2015/05/29 07:45:48 greg Exp $";
#endif
/*
* Wrap BSDF data in valid WINDOW XML file
@@ -25,7 +25,10 @@ const char *attr_unit = "meter";
const char legal_units[] = "meter|foot|inch|centimeter|millimeter";
/* system materials & geometry */
const char *mgf_geometry = NULL;
-
+ /* comment list */
+#define MAXCOMM 30
+const char *commlist[MAXCOMM];
+int ncomm = 0;
/* angle bases */
enum { ABdefault=-1, ABklemsFull=0, ABklemsHalf, ABklemsQuarter,
ABtensorTree3, ABtensorTree4, ABend };
@@ -66,7 +69,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 +163,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 +182,7 @@ input2str(const char *inpspec)
close(fd);
return str;
}
+#endif
fp = fdopen(fd, "r"); /* not a regular file */
}
/* reading from stream */
@@ -442,22 +448,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:
@@ -468,7 +482,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;
@@ -574,6 +588,9 @@ writeBSDF(const char *caller, ezxml_t fl)
free(xml);
return 0;
}
+ puts("");
+ for (i = 0; i < ncomm; i++)
+ printf("\n", commlist[i]);
fflush(stdout); /* write previous XML info. */
if (write(fileno(stdout), xml, ei) != ei) {
free(xml);
@@ -705,8 +722,8 @@ 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(" [-s spectr][-tb inp][-tf inp][-rb inp][-rf inp]", 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][-C comm]", stderr);
fputs(" [input.xml]\n", stderr);
exit(1);
}
@@ -775,6 +792,19 @@ main(int argc, char *argv[])
case 'c': /* correct solid angle */
correct_solid_angle = 1;
continue;
+ case 'C': /* comment */
+ if (ncomm >= MAXCOMM) {
+ fprintf(stderr, "%s: too many comments\n",
+ argv[0]);
+ return 1;
+ }
+ if (strchr(argv[++i], '>') != NULL) {
+ fprintf(stderr, "%s: illegal character in comment\n",
+ argv[0]);
+ return 1;
+ }
+ commlist[ncomm++] = argv[i];
+ continue;
case 't': /* transmission */
if (i >= argc-1)
UsageExit(argv[0]);
@@ -831,6 +861,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 {